diff options
| author | Olof Johansson <olof@lixom.net> | 2014-03-17 00:00:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-03-17 00:00:03 -0700 |
| commit | d89893272a0e2193be8532177c1850f356f4d5db (patch) | |
| tree | 096fffa775f09f64af20daba2f07db17ed43addd /arch/arm/mach-shmobile/Kconfig | |
| parent | 79c37662b46e2b183bf6648b733968273fc9947c (diff) | |
| parent | 6197c08ab81cf1430cbe7346fd6ca0b5a18580bf (diff) | |
| download | op-kernel-dev-d89893272a0e2193be8532177c1850f356f4d5db.zip op-kernel-dev-d89893272a0e2193be8532177c1850f356f4d5db.tar.gz | |
Merge tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Third Round of Renesas ARM Based SoC Boards Updates for v3.15" from
Simon Horman:
* r7s72100 SoC (RZ/A1H) based Genmai board
- Set proper DMA masks for Ether device
* r8a7791 (R-Car M2) based Koelsch board
- Remove Koelsch DT reference legacy clock bits
- Set proper DMA masks for Ether device
- Add DU device to koelsch-reference
- Refactor clock lookup hack in koelsch-reference
- Add SDHI devices
* r8a7790 (R-Car H2) based Lager board
- Remove Lager DT reference legacy clock bits
- Set proper DMA masks for Ether device
- Add internal USB PCI support
- Add QSPI pinmux
- Sdd SDHI0/2 support
* emev2 (Emma Mobile EV2) based kzm9d board
- Remove KZM9D board code
* r8a7778 (R-Car M1) based bock-w board
- Set proper DMA masks for Ether device
* r8a7740 (R-Mobile A1) based Armadillo 800 EVA board
- Set proper DMA masks for Ether device
* tag 'renesas-boards3-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: Remove Lager DT reference legacy clock bits
ARM: shmobile: Remove Koelsch DT reference legacy clock bits
ARM: shmobile: Remove KZM9D board code
ARM: shmobile: Genmai: set proper DMA masks for Ether device
ARM: shmobile: Koelsch: set proper DMA masks for Ether device
ARM: shmobile: Lager: set proper DMA masks for Ether device
ARM: shmobile: BOCK-W: set proper DMA masks for Ether device
ARM: shmobile: Armadillo 800 EVA: set proper DMA masks for Ether device
ARM: shmobile: koelsch-reference: Add DU device
ARM: shmobile: koelsch-reference: Refactor clock lookup hack
ARM: shmobile: lager-reference: Add DU device
ARM: shmobile: lager-reference: Refactor clock lookup hack
ARM: shmobile: lager: Add internal USB PCI support
ARM: shmobile: lager legacy: Add QSPI pinmux
ARM: shmobile: lager: add SDHI0/2 support
ARM: shmobile: Add SDHI devices for legacy Koelsch
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index deb6dc8..2f5c6f3 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -47,12 +47,6 @@ config MACH_KOELSCH depends on ARCH_R8A7791 select MICREL_PHY if SH_ETH -config MACH_KZM9D - bool "KZM9D board" - depends on ARCH_EMEV2 - select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X - config MACH_LAGER bool "Lager board" depends on ARCH_R8A7790 |
