Patchwork [GIT,PULL,6/6] s3c24xx driver

login
register
mail settings
Submitter Kukjin Kim
Date June 11, 2013, 9:09 p.m.
Message ID <51B791F6.4000004@samsung.com>
Download mbox
Permalink /patch/250638/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git

Comments

Kukjin Kim - June 11, 2013, 9:09 p.m.
The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:

   Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)

are available in the git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git 
tags/s3c24xx-driver-1

for you to fetch changes up to ae7b6dccf6711e8d5815688f1572ab55bf5b3069:

   Merge branch 'v3.11-next/driver-cpufreq' into 
v3.11-next/s3c24xx-driver (2013-06-12 05:24:22 +0900)

----------------------------------------------------------------

update driver for s3c24xx
- move cpufreq driver into drivers/
- add pinctrl-s3c24xx driver
- cleanup OF in gpio driver

----------------------------------------------------------------
Heiko Stuebner (1):
       pinctrl: Add pinctrl-s3c24xx driver

Kukjin Kim (3):
       Merge branch 'v3.11-next/driver-gpio' into v3.11-next/s3c24xx-driver
       Merge branch 'v3.11-next/driver-pinctrl' into 
v3.11-next/s3c24xx-driver
       Merge branch 'v3.11-next/driver-cpufreq' into 
v3.11-next/s3c24xx-driver

Sylwester Nawrocki (1):
       gpio: samsung: Remove OF support for s3c24xx

Viresh Kumar (1):
       cpufreq: s3c24xx: move cpufreq driver to drivers/cpufreq

  .../devicetree/bindings/gpio/gpio-samsung.txt      |  43 --
  .../bindings/pinctrl/samsung-pinctrl.txt           |   8 +
  arch/arm/Kconfig                                   |  47 --
  arch/arm/mach-s3c24xx/Kconfig                      |  66 +--
  arch/arm/mach-s3c24xx/Makefile                     |   6 -
  arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h |   0
  arch/arm/mach-s3c24xx/iotiming-s3c2412.c           |   2 +-
  arch/arm/plat-samsung/include/plat/cpu-freq-core.h |  10 +-
  arch/arm/plat-samsung/include/plat/cpu-freq.h      |   6 +-
  drivers/cpufreq/Kconfig.arm                        |  58 ++
  drivers/cpufreq/Makefile                           |   5 +
  .../cpufreq/s3c2410-cpufreq.c                      |   0
  .../cpufreq/s3c2412-cpufreq.c                      |   3 +-
  .../cpufreq/s3c2440-cpufreq.c                      |   0
  .../cpufreq/s3c24xx-cpufreq-debugfs.c              |   0
  .../cpufreq.c => drivers/cpufreq/s3c24xx-cpufreq.c |   0
  drivers/gpio/gpio-samsung.c                        |  67 +--
  drivers/pinctrl/Kconfig                            |   5 +
  drivers/pinctrl/Makefile                           |   1 +
  drivers/pinctrl/pinctrl-s3c24xx.c                  | 652 
+++++++++++++++++++++
  drivers/pinctrl/pinctrl-samsung.c                  |  10 +
  drivers/pinctrl/pinctrl-samsung.h                  |   4 +
  22 files changed, 784 insertions(+), 209 deletions(-)
  rename arch/arm/mach-s3c24xx/{ => include/mach}/s3c2412.h (100%)
  rename arch/arm/mach-s3c24xx/cpufreq-s3c2410.c => 
drivers/cpufreq/s3c2410-cpufreq.c (100%)
  rename arch/arm/mach-s3c24xx/cpufreq-s3c2412.c => 
drivers/cpufreq/s3c2412-cpufreq.c (99%)
  rename arch/arm/mach-s3c24xx/cpufreq-s3c2440.c => 
drivers/cpufreq/s3c2440-cpufreq.c (100%)
  rename arch/arm/mach-s3c24xx/cpufreq-debugfs.c => 
drivers/cpufreq/s3c24xx-cpufreq-debugfs.c (100%)
  rename arch/arm/mach-s3c24xx/cpufreq.c => 
drivers/cpufreq/s3c24xx-cpufreq.c (100%)
  create mode 100644 drivers/pinctrl/pinctrl-s3c24xx.c
Olof Johansson - June 12, 2013, 11:51 p.m.
On Wed, Jun 12, 2013 at 06:09:10AM +0900, Kukjin Kim wrote:
> The following changes since commit 317ddd256b9c24b0d78fa8018f80f1e495481a10:
> 
>   Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
> 
> are available in the git repository at:
> 

> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> tags/s3c24xx-driver-1
> 
> for you to fetch changes up to ae7b6dccf6711e8d5815688f1572ab55bf5b3069:
> 
>   Merge branch 'v3.11-next/driver-cpufreq' into
> v3.11-next/s3c24xx-driver (2013-06-12 05:24:22 +0900)
> 
> ----------------------------------------------------------------
> 
> update driver for s3c24xx
> - move cpufreq driver into drivers/
> - add pinctrl-s3c24xx driver
> - cleanup OF in gpio driver
> 
> ----------------------------------------------------------------
> Heiko Stuebner (1):
>       pinctrl: Add pinctrl-s3c24xx driver
> 
> Kukjin Kim (3):
>       Merge branch 'v3.11-next/driver-gpio' into v3.11-next/s3c24xx-driver
>       Merge branch 'v3.11-next/driver-pinctrl' into
> v3.11-next/s3c24xx-driver
>       Merge branch 'v3.11-next/driver-cpufreq' into
> v3.11-next/s3c24xx-driver

Hi,

No need to do a merge commit per patch, just do them on a single branch in the
future, please.

Pulled.


-Olof
Kukjin Kim - June 13, 2013, 12:26 a.m.
Olof Johansson wrote:
> 
> On Wed, Jun 12, 2013 at 06:09:10AM +0900, Kukjin Kim wrote:
> > The following changes since commit
> 317ddd256b9c24b0d78fa8018f80f1e495481a10:
> >
> >   Linux 3.10-rc5 (2013-06-08 17:41:04 -0700)
> >
> > are available in the git repository at:
> >
> 
> > git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git
> > tags/s3c24xx-driver-1
> >
> > for you to fetch changes up to ae7b6dccf6711e8d5815688f1572ab55bf5b3069:
> >
> >   Merge branch 'v3.11-next/driver-cpufreq' into
> > v3.11-next/s3c24xx-driver (2013-06-12 05:24:22 +0900)
> >
> > ----------------------------------------------------------------
> >
> > update driver for s3c24xx
> > - move cpufreq driver into drivers/
> > - add pinctrl-s3c24xx driver
> > - cleanup OF in gpio driver
> >
> > ----------------------------------------------------------------
> > Heiko Stuebner (1):
> >       pinctrl: Add pinctrl-s3c24xx driver
> >
> > Kukjin Kim (3):
> >       Merge branch 'v3.11-next/driver-gpio' into v3.11-next/s3c24xx-
> driver
> >       Merge branch 'v3.11-next/driver-pinctrl' into
> > v3.11-next/s3c24xx-driver
> >       Merge branch 'v3.11-next/driver-cpufreq' into
> > v3.11-next/s3c24xx-driver
> 
> Hi,
> 
Hi,

> No need to do a merge commit per patch, just do them on a single branch in
> the
> future, please.
> 
OK.

> Pulled.
> 
Thanks.

- Kukjin