aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-13 12:50:35 -0400
committerArnd Bergmann <arnd@arndb.de>2014-03-21 13:19:32 -0400
commit4bbef1da789cbd89f57734975e6a211a42b382f5 (patch)
treefec2ab81d9d9ef691202589c59767d25175239e2 /arch/arm/mach-davinci
parenta1628604fd03850c41163b802d8b7f8d6a110e4c (diff)
ARM: davinci: make dm644x-evm phy fixup conditional
We cannot call phy_register_fixup_for_uid() if CONFIG_PHYLIB is not built into the kernel, and we should not enforce that to be built into vmlinux either, because one might want to disable the entire network stack. This change uses a compile-time condition on CONFIG_PHYLIB to remove the call in the cases where it cannot work. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Acked-by: Sekhar Nori <nsekhar@ti.com> Cc: Kevin Hilman <khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/board-dm644x-evm.c11
1 files changed, 6 insertions, 5 deletions
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)
799 /* irlml6401 switches over 1A, in under 8 msec */ 799 /* irlml6401 switches over 1A, in under 8 msec */
800 davinci_setup_usb(1000, 8); 800 davinci_setup_usb(1000, 8);
801 801
802 soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID; 802 if (IS_BUILTIN(CONFIG_PHYLIB)) {
803 /* Register the fixup for PHY on DaVinci */ 803 soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
804 phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK, 804 /* Register the fixup for PHY on DaVinci */
805 davinci_phy_fixup); 805 phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
806 806 davinci_phy_fixup);
807 }
807} 808}
808 809
809MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM") 810MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")