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

Pull ARM SoC non-critical bug fixes from Arnd Bergmann:
 "Lots of isolated bug fixes that were not found to be important enough
  to be submitted before the merge window or backported into stable
  kernels.

  The vast majority of these came out of Arnd's randconfig testing and
  just prevents running into build-time bugs in configurations that we
  do not care about in practice"

* tag 'fixes-non-critical-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (75 commits)
  ARM: at91: fix a typo
  ARM: moxart: fix CPU selection
  ARM: tegra: fix board DT pinmux setup
  ARM: nspire: Fix compiler warning
  IXP4xx: Fix DMA masks.
  Revert "ARM: ixp4xx: Make dma_set_coherent_mask common, correct implementation"
  IXP4xx: Fix Goramo Multilink GPIO conversion.
  Revert "ARM: ixp4xx: fix gpio rework"
  ARM: tegra: make debug_ll code build for ARMv6
  ARM: sunxi: fix build for THUMB2_KERNEL
  ARM: exynos: add missing include of linux/module.h
  ARM: exynos: fix l2x0 saved regs handling
  ARM: samsung: select CRC32 for SAMSUNG_PM_CHECK
  ARM: samsung: select ATAGS where necessary
  ARM: samsung: fix SAMSUNG_PM_DEBUG Kconfig logic
  ARM: samsung: allow serial driver to be disabled
  ARM: s5pv210: enable IDE support in MACH_TORBRECK
  ARM: s5p64x0: fix building with only one soc type
  ARM: s3c64xx: select power domains only when used
  ARM: s3c64xx: MACH_SMDK6400 needs HSMMC1
  ...

2 files changed, 6 insertions, 10 deletions

diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index a075b3e0c5c7..626d2b82d0f3 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -214,11 +214,6 @@ config DA850_WL12XX
           Say Y if you want to use a wl1271 expansion card connected to the
           AM18x EVM.
 
-config GPIO_PCA953X
-        default MACH_DAVINCI_DA850_EVM
-
-config KEYBOARD_GPIO_POLLED
-        default MACH_DAVINCI_DA850_EVM
 
 config MACH_TNETV107X
         bool "TI TNETV107X Reference Platform"
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index 987605b78556..3de4dc9a1698 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -799,11 +799,12 @@ static __init void davinci_evm_init(void)
         /* irlml6401 switches over 1A, in under 8 msec */
         davinci_setup_usb(1000, 8);
 
-        soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
-        /* Register the fixup for PHY on DaVinci */
-        phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
-                                        davinci_phy_fixup);
-
+        if (IS_BUILTIN(CONFIG_PHYLIB)) {
+                soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
+                /* Register the fixup for PHY on DaVinci */
+                phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
+                                                davinci_phy_fixup);
+        }
 }
 
 MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")