Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32ff4971 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

ARM: orion5x: make dns323 independent of PHY support 



The D-Link DNS-323 machine tries to unconditionally select CONFIG_PHYLIB,
but that has other dependencies that might not necessarily be enabled,
causing random build errors.

To work around this, this patch removes the 'select' statement and
instead uses a compile-time check to skip the phy_register_fixup_for_uid()
call if PHYLIB is not available in the kernel.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Gregory Clement <gregory.clement@free-electrons.com>
Cc: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
parent 9e128041

arch/arm/mach-orion5x/Kconfig

+0 −1
Original line number Original line Diff line number Diff line
@@ -33,7 +33,6 @@ config MACH_KUROBOX_PRO 
config MACH_DNS323

config MACH_DNS323

	bool "D-Link DNS-323"

	bool "D-Link DNS-323"

	select I2C_BOARDINFO

	select I2C_BOARDINFO

	select PHYLIB

	help

	help

	  Say 'Y' here if you want your kernel to support the

	  Say 'Y' here if you want your kernel to support the

	  D-Link DNS-323 platform.

	  D-Link DNS-323 platform.

arch/arm/mach-orion5x/dns323-setup.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -642,6 +642,8 @@ static void __init dns323_init(void) 
		platform_device_register_simple("dns323c-fan", 0, NULL, 0);

		platform_device_register_simple("dns323c-fan", 0, NULL, 0);





		/* Register fixup for the PHY LEDs */

		/* Register fixup for the PHY LEDs */

		if (!IS_BUILTIN(CONFIG_PHYLIB))

			break;

		phy_register_fixup_for_uid(MARVELL_PHY_ID_88E1118,

		phy_register_fixup_for_uid(MARVELL_PHY_ID_88E1118,

					   MARVELL_PHY_ID_MASK,

					   MARVELL_PHY_ID_MASK,

					   dns323c_phy_fixup);

					   dns323c_phy_fixup);