Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull ARM SoC board changes from Arnd Bergmann:
 "As we continue to replace board files with device tree descriptions,
  this part of the ARM support is getting smaller.  We have basically
  just defconfig changes here this time, and a significant number of
  Renesas shmobile changes, as Renesas is still in the process of
  deprecating board file support"

* tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (92 commits)
  ARM: enable fhandle in multi_v7_defconfig
  ARM: tegra: enable fhandle in tegra_defconfig
  ARM: update multi_v7_defconfig for Tegra
  ARM: add Marvell Dove and some drivers to multi_v7 defconfig
  ARM: fix duplicate symbols in multi_v5_defconfig
  ARM: pxa: add gpio keys information
  ARM: tegra: defconfig updates
  ARM: config: keystone: enable AEMIF/NAND support
  ARM: qcom: Enable basic support for Qualcomm platforms in multi_v7_defconfig
  ARM: kirkwood: Add HP T5325 devices to {multi|mvebu}_v5_defconfig
  ARM: config: Add mvebu_v5_defconfig
  ARM: config: Add a multi_v5_defconfig
  ARM: shmobile: r7s72100: update defconfig for I2C usage
  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: mvebu: update defconfigs for Armada 375 and 38x
  ARM: dove: Enable watchdog support in the defconfig
  ARM: mvebu: Enable watchdog support in defconfig
  ARM: config: keystone: enable led support
  ...

1 files changed, 11 insertions, 7 deletions

diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index c0b650b1c846..a182008e3aeb 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -45,15 +45,12 @@ config MACH_GENMAI
 config MACH_KOELSCH
         bool "Koelsch board"
         depends on ARCH_R8A7791
-
-config MACH_KZM9D
-        bool "KZM9D board"
-        depends on ARCH_EMEV2
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select MICREL_PHY if SH_ETH
 
 config MACH_LAGER
         bool "Lager board"
         depends on ARCH_R8A7790
+        select MICREL_PHY if SH_ETH
 
 comment "Renesas ARM SoCs System Configuration"
 endif
@@ -166,11 +163,13 @@ comment "Renesas ARM SoCs Board Type"
 config MACH_APE6EVM
         bool "APE6EVM board"
         depends on ARCH_R8A73A4
+        select SMSC_PHY if SMSC911X
         select USE_OF
 
 config MACH_APE6EVM_REFERENCE
         bool "APE6EVM board - Reference Device Tree Implementation"
         depends on ARCH_R8A73A4
+        select SMSC_PHY if SMSC911X
         select USE_OF
         ---help---
            Use reference implementation of APE6EVM board support
@@ -184,6 +183,7 @@ config MACH_MACKEREL
         depends on ARCH_SH7372
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SMSC_PHY if SMSC911X
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select USE_OF
 
@@ -192,6 +192,7 @@ config MACH_ARMADILLO800EVA
         depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SMSC_PHY if SH_ETH
         select SND_SOC_WM8978 if SND_SIMPLE_CARD
         select USE_OF
 
@@ -200,6 +201,7 @@ config MACH_ARMADILLO800EVA_REFERENCE
         depends on ARCH_R8A7740
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select SMSC_PHY if SH_ETH
         select SND_SOC_WM8978 if SND_SIMPLE_CARD
         select USE_OF
         ---help---
@@ -213,11 +215,11 @@ config MACH_BOCKW
         bool "BOCK-W platform"
         depends on ARCH_R8A7778
         select ARCH_REQUIRE_GPIOLIB
-        select RENESAS_INTC_IRQPIN
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        select USE_OF
+        select RENESAS_INTC_IRQPIN
         select SND_SOC_AK4554 if SND_SIMPLE_CARD
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
+        select USE_OF
 
 config MACH_BOCKW_REFERENCE
         bool "BOCK-W  - Reference Device Tree Implementation"
@@ -273,6 +275,8 @@ config MACH_LAGER
         bool "Lager board"
         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"