Patchwork [GIT,PULL,1/2] ARM: arm-soc soc updates, take 2

login
register
mail settings
Submitter Olof Johansson
Date July 29, 2012, 11:25 p.m.
Message ID <CAOesGMgVUuVxh8Ppp0ce=6-Ze8Qht5t15jWu57DzLrOrt0q9xw@mail.gmail.com>
Download mbox
Permalink /patch/173940/
State New
Headers show

Pull-request

git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc2

Comments

Olof Johansson - July 29, 2012, 11:25 p.m.
This is the second batch of SoC updates for the 3.6 merge window,
containing parts that arrived close to the merge window opening and
thus needed to sit in linux-next for a while.

Most contents is updates of Renesas shmobile, with a couple of
Samsung Exynos patches in the mix.

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

The following changes since commit 6ee127b7dd63afe4d6d0a58293786bf4bf336850:

  Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc.git tags/soc2

for you to fetch changes up to 537cd80cea370c530d455bc8e00ef0673ba165cb:

  Merge branch 'samsung/devel-2' into late/soc

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

Arnd Bergmann (3):
      Merge branch 'soc' of git://git.kernel.org/.../rafael/renesas
into late/soc
      Merge tag 'v3.5-rc7' into late/soc
      Merge branch 'samsung/devel-2' into late/soc

Jaecheol Lee (1):
      [CPUFREQ] EXYNOS5250: Add support max 1.7GHz for EXYNOS5250

Kuninori Morimoto (28):
      ARM: shmobile: r8a7740: add HDMI interrupt support
      ARM: shmobile: r8a7740: add HDMI clock support
      ARM: shmobile: r8a7740: add HDMI GPIO support
      ARM: shmobile: r8a7740: add MERAM work-around
      ARM: shmobile: r8a7740: add CEU clock support
      ARM: shmobile: r8a7740: add FSI parent clock support
      ARM: shmobile: r8a7740: add FSI-B (for HDMI) GPIO support
      ARM: shmobile: sh73a0: add FSI clock
      ARM: shmobile: sh7372: remove unused sh7372_a3sp_init() on !CONFIG_PM
      ARM: shmobile: add common extra gpio functions
      ARM: shmobile: add common DMAEngine definitions
      ARM: shmobile: r8a7740: add DMAEngine support for FSI
      ARM: shmobile: r8a7740: add DMAEngine support for SDHI
      ARM: shmobile: r8a7740: add DMAEngine support for USB
      ARM: shmobile: use common DMAEngine definitions on r8a7740
      ARM: shmobile: sh73a0: add USB clock support
      ARM: shmobile: sh73a0: add DMAEngine support for MPDMAC
      ARM: shmobile: use common DMAEngine definitions on sh73a0
      ARM: shmobile: use common DMAEngine definitions on sh7372
      ARM: shmobile: soc-core: add R-mobile PM domain common APIs
      ARM: shmobile: r8a7740: fixup: MSEL1CR 7bit control
      ARM: shmobile: r8a7740: add A4S pm domain support
      ARM: shmobile: r8a7740: add A3SP pm domain support
      ARM: shmobile: r8a7740: add A4LC pm domain support
      ARM: shmobile: sh7372: add pm-rmobile domain support
      ARM: shmobile: mackerel: switch to using pm-rmobile API
      ARM: shmobile: ap4evb: switch to using pm-rmobile API
      ARM: shmobile: sh7372: completely switch over to using pm-rmobile API

Magnus Damm (5):
      ARM: shmobile: Use INTCA with sh7372 A3SM power domain
      ARM: shmobile: sh7372 A3SM CPUIdle support
      ARM: mach-shmobile: r8a7740 generic board support via DT
      ARM: mach-shmobile: sh7377 generic board support via DT
      ARM: shmobile: Take cpuidle dependencies into account correctly

Nobuhiro Iwamatsu (1):
      ARM: mach-shmobile: Convert sh_clk_mstp32_register to sh_clk_mstp_register

Rafael J. Wysocki (13):
      Merge branch 'renesas-sh73a0' into renesas-soc
      Merge branch 'renesas-soc-core' into renesas-r8a7740
      Merge branch 'renesas-soc-core' into renesas-sh73a0
      Merge branch 'renesas-soc-core' into renesas-sh7372
      Merge branch 'renesas-soc-core' into renesas-r8a7740
      Merge branch 'renesas-soc-core' into renesas-sh7372
      ARM: shmobile: Fix build problem in pm-sh7372.c for unusual .config
      Merge branch 'renesas-fixes' into renesas-soc
      Merge branch 'renesas-soc-core' into renesas-soc
      Merge branch 'renesas-r8a7740' into renesas-soc
      Merge branch 'renesas-sh73a0' into renesas-soc
      Merge branch 'renesas-sh7372' into renesas-soc
      Merge branch 'renesas-sh7377' into renesas-soc

Sachin Kamat (3):
      ARM: EXYNOS: Move G2D clock entries to clock-exynos4210.c file
      ARM: EXYNOS: Add G2D related clock entries for SMDK4X12
      ARM: S3C64XX: Add header file protection macros in pm-core.h


 arch/arm/boot/dts/r8a7740.dtsi                  |  21 ++
 arch/arm/boot/dts/sh7377.dtsi                   |  21 ++
 arch/arm/mach-exynos/clock-exynos4.c            |  41 +--
 arch/arm/mach-exynos/clock-exynos4.h            |   3 +
 arch/arm/mach-exynos/clock-exynos4210.c         |  37 ++
 arch/arm/mach-exynos/clock-exynos4212.c         |  41 ++-
 arch/arm/mach-s3c64xx/include/mach/pm-core.h    |   4 +
 arch/arm/mach-shmobile/Kconfig                  |   1 +
 arch/arm/mach-shmobile/Makefile                 |   2 +
 arch/arm/mach-shmobile/board-ap4evb.c           |  16 +-
 arch/arm/mach-shmobile/board-armadillo800eva.c  |   1 +
 arch/arm/mach-shmobile/board-mackerel.c         |  24 +-
 arch/arm/mach-shmobile/clock-r8a7740.c          | 150 +++++++-
 arch/arm/mach-shmobile/clock-r8a7779.c          |   2 +-
 arch/arm/mach-shmobile/clock-sh7367.c           |   2 +-
 arch/arm/mach-shmobile/clock-sh7372.c           |   2 +-
 arch/arm/mach-shmobile/clock-sh7377.c           |   2 +-
 arch/arm/mach-shmobile/clock-sh73a0.c           |  12 +-
 arch/arm/mach-shmobile/include/mach/common.h    |   1 +
 .../mach-shmobile/include/mach/dma-register.h   |  84 +++++
 arch/arm/mach-shmobile/include/mach/gpio.h      |  32 ++
 .../arm/mach-shmobile/include/mach/pm-rmobile.h |  44 +++
 arch/arm/mach-shmobile/include/mach/r8a7740.h   |  33 +-
 arch/arm/mach-shmobile/include/mach/sh7372.h    |  45 +--
 arch/arm/mach-shmobile/include/mach/sh73a0.h    |   7 +
 arch/arm/mach-shmobile/intc-r8a7740.c           |  13 +-
 arch/arm/mach-shmobile/pfc-r8a7740.c            |  24 +-
 arch/arm/mach-shmobile/pm-r8a7740.c             |  54 +++
 arch/arm/mach-shmobile/pm-rmobile.c             | 167 +++++++++
 arch/arm/mach-shmobile/pm-sh7372.c              | 297 +++++----------
 arch/arm/mach-shmobile/setup-r8a7740.c          | 360 +++++++++++++++++++
 arch/arm/mach-shmobile/setup-sh7372.c           | 209 +++++------
 arch/arm/mach-shmobile/setup-sh7377.c           |  47 +++
 arch/arm/mach-shmobile/setup-sh73a0.c           | 152 ++++++--
 drivers/cpufreq/exynos5250-cpufreq.c            |  55 ++-
 35 files changed, 1492 insertions(+), 514 deletions(-)
 create mode 100644 arch/arm/boot/dts/r8a7740.dtsi
 create mode 100644 arch/arm/boot/dts/sh7377.dtsi
 create mode 100644 arch/arm/mach-shmobile/include/mach/dma-register.h
 create mode 100644 arch/arm/mach-shmobile/include/mach/pm-rmobile.h
 create mode 100644 arch/arm/mach-shmobile/pm-r8a7740.c
 create mode 100644 arch/arm/mach-shmobile/pm-rmobile.c