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

Commit 575e93f7 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

ARM: orion: Register DSA switch as a MDIO device 



Utilize the ability to pass board specific MDIO bus information towards a
particular MDIO device thus allowing us to provide the per-port switch layout
to the Marvell 88E6XXX switch driver.

Since we would end-up with conflicting registration paths, do not register the
"dsa" platform device anymore.

Note that the MDIO devices registered by code in net/dsa/dsa2.c does not
parse a dsa_platform_data, but directly take a dsa_chip_data (specific
to a single switch chip), so we update the different call sites to pass
this structure down to orion_ge00_switch_init().

Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 648ea013

arch/arm/mach-orion5x/common.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) 
/*****************************************************************************

 * Ethernet switch

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

void __init orion5x_eth_switch_init(struct dsa_platform_data *d)

void __init orion5x_eth_switch_init(struct dsa_chip_data *d)

{

	orion_ge00_switch_init(d);

}

arch/arm/mach-orion5x/common.h

+2 −2
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ 


#include <linux/reboot.h>



struct dsa_platform_data;

struct dsa_chip_data;

struct mv643xx_eth_platform_data;

struct mv_sata_platform_data;
@@ -41,7 +41,7 @@ void orion5x_setup_wins(void); 
void orion5x_ehci0_init(void);

void orion5x_ehci1_init(void);

void orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data);

void orion5x_eth_switch_init(struct dsa_platform_data *d);

void orion5x_eth_switch_init(struct dsa_chip_data *d);

void orion5x_i2c_init(void);

void orion5x_sata_init(struct mv_sata_platform_data *sata_data);

void orion5x_spi_init(void);

arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c

+1 −6
Original line number Diff line number Diff line
@@ -101,11 +101,6 @@ static struct dsa_chip_data rd88f5181l_fxo_switch_chip_data = { 
	.port_names[7]	= "lan3",

};



static struct dsa_platform_data __initdata rd88f5181l_fxo_switch_plat_data = {

	.nr_chips	= 1,

	.chip		= &rd88f5181l_fxo_switch_chip_data,

};



static void __init rd88f5181l_fxo_init(void)

{

	/*
@@ -120,7 +115,7 @@ static void __init rd88f5181l_fxo_init(void) 
	 */

	orion5x_ehci0_init();

	orion5x_eth_init(&rd88f5181l_fxo_eth_data);

	orion5x_eth_switch_init(&rd88f5181l_fxo_switch_plat_data);

	orion5x_eth_switch_init(&rd88f5181l_fxo_switch_chip_data);

	orion5x_uart0_init();



	mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,

arch/arm/mach-orion5x/rd88f5181l-ge-setup.c

+1 −6
Original line number Diff line number Diff line
@@ -102,11 +102,6 @@ static struct dsa_chip_data rd88f5181l_ge_switch_chip_data = { 
	.port_names[7]	= "lan3",

};



static struct dsa_platform_data __initdata rd88f5181l_ge_switch_plat_data = {

	.nr_chips	= 1,

	.chip		= &rd88f5181l_ge_switch_chip_data,

};



static struct i2c_board_info __initdata rd88f5181l_ge_i2c_rtc = {

	I2C_BOARD_INFO("ds1338", 0x68),

};
@@ -125,7 +120,7 @@ static void __init rd88f5181l_ge_init(void) 
	 */

	orion5x_ehci0_init();

	orion5x_eth_init(&rd88f5181l_ge_eth_data);

	orion5x_eth_switch_init(&rd88f5181l_ge_switch_plat_data);

	orion5x_eth_switch_init(&rd88f5181l_ge_switch_chip_data);

	orion5x_i2c_init();

	orion5x_uart0_init();

arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c

+1 −6
Original line number Diff line number Diff line
@@ -40,11 +40,6 @@ static struct dsa_chip_data rd88f6183ap_ge_switch_chip_data = { 
	.port_names[5]	= "cpu",

};



static struct dsa_platform_data __initdata rd88f6183ap_ge_switch_plat_data = {

	.nr_chips	= 1,

	.chip		= &rd88f6183ap_ge_switch_chip_data,

};



static struct mtd_partition rd88f6183ap_ge_partitions[] = {

	{

		.name	= "kernel",
@@ -89,7 +84,7 @@ static void __init rd88f6183ap_ge_init(void) 
	 */

	orion5x_ehci0_init();

	orion5x_eth_init(&rd88f6183ap_ge_eth_data);

	orion5x_eth_switch_init(&rd88f6183ap_ge_switch_plat_data);

	orion5x_eth_switch_init(&rd88f6183ap_ge_switch_chip_data);

	spi_register_board_info(rd88f6183ap_ge_spi_slave_info,

				ARRAY_SIZE(rd88f6183ap_ge_spi_slave_info));

	orion5x_spi_init();