diff options
author | Olof Johansson <olof@lixom.net> | 2014-02-20 09:16:28 (GMT) |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-02-20 09:16:28 (GMT) |
commit | ff280bceb554633429e28a80b70ba83d79c96071 (patch) | |
tree | 744a6602ed6f8f6b4aaccfe677eafb6bdf393b9c /arch/arm/mach-shmobile/Kconfig | |
parent | 22a74909b1ad9db2c05e1aa3441ec5607be4bc0c (diff) | |
parent | 03fec7dee502d43114f384a1588ce84a3c9bf38d (diff) | |
download | linux-ff280bceb554633429e28a80b70ba83d79c96071.tar.xz |
Merge tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/boards
Merge "Second Round of Renesas ARM Based SoC Board Updates for v3.15" from
Simon Horman:
* r7s72100 (RZ/A1H) based Genmai board
- Enable SH ethernet
- Add RSPI support
* r8a7791 (R-Car M2) based Koelsch board
- Add QSPI support
- Add I2C support
- Pass SH ethernet PHY IRQ
* r8a7790 (R-Car H2) based Lager board
- Switch QSPI to named IRQs
- Add sound support
- Add USB0 cable detection workaround
- Pass SH ethernet PHY IRQ
* r8a7779 (R-Car H1) based Marzen board
- Revert conditional selection of SMSC_PHY
* r8a7778 (R-Car M1) based Bock-W board
- Use wp-gpios instead of WP pin
* tag 'renesas-boards2-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: genmai: Enable r7s72100-ether
ARM: shmobile: lager legacy: Switch QSPI to named IRQs
ARM: shmobile: koelsch legacy: Add QSPI support
ARM: shmobile: genmai legacy: Add RSPI support
Revert "ARM: shmobile: marzen: Conditionally select SMSC_PHY"
ARM: shmobile: lager: add sound support
ARM: shmobile: Lager USB0 cable detection workaround
ARM: shmobile: bockw: use wp-gpios instead of WP pin
ARM: shmobile: koelsch: Add I2C support
ARM: shmobile: Koelsch: pass Ether PHY IRQ
ARM: shmobile: Lager: pass Ether PHY IRQ
Diffstat (limited to 'arch/arm/mach-shmobile/Kconfig')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index d67f4b9..deb6dc8 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -250,7 +250,6 @@ config MACH_MARZEN depends on ARCH_R8A7779 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X select USE_OF config MACH_MARZEN_REFERENCE @@ -258,7 +257,6 @@ config MACH_MARZEN_REFERENCE depends on ARCH_R8A7779 select ARCH_REQUIRE_GPIOLIB select REGULATOR_FIXED_VOLTAGE if REGULATOR - select SMSC_PHY if SMSC911X select USE_OF ---help--- Use reference implementation of Marzen board support @@ -272,6 +270,7 @@ config MACH_LAGER depends on ARCH_R8A7790 select USE_OF select MICREL_PHY if SH_ETH + select SND_SOC_AK4642 if SND_SIMPLE_CARD config MACH_KOELSCH bool "Koelsch board" |