diff options
| author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 12:42:36 -0500 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 12:43:42 -0500 |
| commit | 345bc449e78664060a2863dafc680a4d1910ecb6 (patch) | |
| tree | c02ffdedb4e0dcc244b8b8de9e58f590eb14c7b2 /arch/arm/Makefile | |
| parent | 02ee25c3a9bd1c4398234f1ce5b8e6e432a71c3e (diff) | |
| parent | fee05eb3d2ce4813b5e9a70ab888d2bc0047f4e1 (diff) | |
Merge tag 'renesas-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
From Simon Horman:
Renesas ARM based SoC updates for v3.14
* Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY
* r8a7791 SoC (R-Car M2)
- Add thermal platform device
- Add DU and LVDS clocks
- GPIO platform device support
- PFC platform device support
- Select IRQC
* r8a7790 SoC (R-Car H2)
- Tidyup clock table order
- Fixup I2C clock source
- Correct EXTAL divider settings
- Add clocks for thermal devices and SSI
* r8a7779 SoC (R-Car H1)
- Add I2C clock for DT
* r8a7778 SoC (R-Car M1)
- Add HSPI clocks for DT
- Add I2C clock for DT
- Add HPBIFx DMAEngine support
* r8a7740 SoC (R-Mobile A1)
- Add FSI clocks for DT
* emev2 SoC (Emma Mobile)
- Move to Multi-platform
- Remove legacy board code
* r7s72100 SoC (RZ/A1H)
- Select GPIO
* r8a73a4 SoC (R-Mobile APE6)
- Don't used named IRC for DMAEngine
* tag 'renesas-soc-for-v3.14' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (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>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index b2f8222bb6c4..28b4585b20dd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -192,7 +192,6 @@ machine-$(CONFIG_ARCH_S5PC100) += s5pc100 | |||
| 192 | machine-$(CONFIG_ARCH_S5PV210) += s5pv210 | 192 | machine-$(CONFIG_ARCH_S5PV210) += s5pv210 |
| 193 | machine-$(CONFIG_ARCH_SA1100) += sa1100 | 193 | machine-$(CONFIG_ARCH_SA1100) += sa1100 |
| 194 | machine-$(CONFIG_ARCH_SHMOBILE) += shmobile | 194 | machine-$(CONFIG_ARCH_SHMOBILE) += shmobile |
| 195 | machine-$(CONFIG_ARCH_SHMOBILE_MULTI) += shmobile | ||
| 196 | machine-$(CONFIG_ARCH_SIRF) += prima2 | 195 | machine-$(CONFIG_ARCH_SIRF) += prima2 |
| 197 | machine-$(CONFIG_ARCH_SOCFPGA) += socfpga | 196 | machine-$(CONFIG_ARCH_SOCFPGA) += socfpga |
| 198 | machine-$(CONFIG_ARCH_STI) += sti | 197 | machine-$(CONFIG_ARCH_STI) += sti |