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

Commit 5fa22a6e authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-fixes-4.11-1' of git://git.infradead.org/linux-mvebu into fixes 

mvebu fixes for 4.11 (part 1)

Fix build of the board code for orion5x when some parts are configured
as module.

* tag 'mvebu-fixes-4.11-1' of git://git.infradead.org/linux-mvebu

:
  ARM: orion5x: only call into phylib when available

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 12d28f94 d43e85b7

arch/arm/mach-orion5x/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ menuconfig ARCH_ORION5X 
	select GPIOLIB

	select GPIOLIB

	select MVEBU_MBUS

	select MVEBU_MBUS

	select PCI

	select PCI

	select PHYLIB if NETDEVICES

	select PLAT_ORION_LEGACY

	select PLAT_ORION_LEGACY

	help

	help

	  Support for the following Marvell Orion 5x series SoCs:

	  Support for the following Marvell Orion 5x series SoCs:

arch/arm/plat-orion/common.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -468,6 +468,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data, 
		    eth_data, &orion_ge11);

		    eth_data, &orion_ge11);

}

}





#ifdef CONFIG_ARCH_ORION5X

/*****************************************************************************

/*****************************************************************************

 * Ethernet switch

 * Ethernet switch

 ****************************************************************************/

 ****************************************************************************/
@@ -480,6 +481,9 @@ void __init orion_ge00_switch_init(struct dsa_chip_data *d) 
	struct mdio_board_info *bd;

	struct mdio_board_info *bd;

	unsigned int i;

	unsigned int i;





	if (!IS_BUILTIN(CONFIG_PHYLIB))

		return;



	for (i = 0; i < ARRAY_SIZE(d->port_names); i++)

	for (i = 0; i < ARRAY_SIZE(d->port_names); i++)

		if (!strcmp(d->port_names[i], "cpu"))

		if (!strcmp(d->port_names[i], "cpu"))

			break;

			break;
@@ -493,6 +497,7 @@ void __init orion_ge00_switch_init(struct dsa_chip_data *d) 




	mdiobus_register_board_info(&orion_ge00_switch_board_info, 1);

	mdiobus_register_board_info(&orion_ge00_switch_board_info, 1);

}

}

#endif





/*****************************************************************************

/*****************************************************************************

 * I2C

 * I2C