Commit 4bbef1da authored Mar 13, 2014 by Arnd Bergmann

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

parent a1628604

arch/arm/mach-davinci/board-dm644x-evm.c

+6 −5

Original line number	Diff line number	Diff line
		@@ -799,11 +799,12 @@ static __init void davinci_evm_init(void)
		/* irlml6401 switches over 1A, in under 8 msec */
		davinci_setup_usb(1000, 8);

		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")