leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: davinci: make dm644x-evm phy fixup conditional

Browse Source 
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
This commit is contained in:
Arnd Bergmann 2014-03-13 17:50:35 +01:00
parent a1628604fd
commit 4bbef1da78
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-davinci/board-dm644x-evm.c
View File

@ -799,11 +799,12 @@ static __init void davinci_evm_init(void)
/* irlml6401 switches over 1A, in under 8 msec */ /* irlml6401 switches over 1A, in under 8 msec */
davinci_setup_usb(1000, 8); davinci_setup_usb(1000, 8);
soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID; if (IS_BUILTIN(CONFIG_PHYLIB)) {
/* Register the fixup for PHY on DaVinci */ soc_info->emac_pdata->phy_id = DM644X_EVM_PHY_ID;
phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK, /* Register the fixup for PHY on DaVinci */
davinci_phy_fixup); phy_register_fixup_for_uid(LXT971_PHY_ID, LXT971_PHY_MASK,
davinci_phy_fixup);
}
} }
MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM") MACHINE_START(DAVINCI_EVM, "DaVinci DM644x EVM")