]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge branch 'next/soc' into for-next
authorKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 19:21:05 +0000 (11:21 -0800)
committerKevin Hilman <khilman@linaro.org>
Fri, 20 Dec 2013 19:21:37 +0000 (11:21 -0800)
commitdc21a5c2434688fb93e7c533450c2e5e3a16d19e
treeb27dda6a99a1cdf2d73087824c68f5cd232cfc23
parent4429e94d35dee4d20fc2052823034f27c2c701a4
parent345bc449e78664060a2863dafc680a4d1910ecb6
Merge branch 'next/soc' into for-next

* next/soc: (33 commits)
  ARM: shmobile: r8a7779: add HSPI clock support for DT
  ARM: shmobile: r8a7740: add FSI clock support for DT
  ARM: shmobile: r8a7790: add SSI MSTP clocks
  ARM: shmobile: r8a7778: add HPBIFx DMAEngine support
  ARM: shmobile: Select AUTO_ZRELADDR for EMEV2
  ARM: shmobile: r8a7790: tidyup clock table order
  ARM: shmobile: r8a7790: fixup I2C clock source
  ARM: shmobile: r8a7790: care EXTAL divider settings
  ARM: shmobile: Add r8a7791 clocks for thermal devices
  ARM: shmobile: Add r8a7791 thermal platform device
  ARM: shmobile: Add r8a7790 clocks for thermal devices
  ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
  ARM: shmobile: r8a7791: Add DU and LVDS clocks
  ARM: shmobile: Select USE_OF on EMEV2
  ARM: shmobile: r8a7778: add HSPI clock support for DT
  ARM: shmobile: Remove legacy platform devices from EMEV2 SoC code
  ARM: shmobile: Remove legacy KZM9D board code
  ARM: shmobile: Use ->init_late() in shared EMEV2 case
  ARM: shmobile: Add shared EMEV2 code for ->init_machine()
  ARM: shmobile: Enable MTU2 on r7s72100
  ...

Signed-off-by: Kevin Hilman <khilman@linaro.org>
arch/arm/Kconfig
arch/arm/arm-soc-for-next-contents.txt
arch/arm/boot/dts/Makefile
arch/arm/configs/bockw_defconfig
arch/arm/configs/kzm9d_defconfig
arch/arm/configs/marzen_defconfig
arch/arm/mach-shmobile/clock-r7s72100.c
arch/arm/mach-shmobile/clock-r8a7790.c