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

Commit 521613c5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dsa2-pdata' 



Florian Fainelli says:

====================
net: dsa: Support for pdata in dsa2

This is not exactly new, and was sent before, although back then, I did not
have an user of the pre-declared MDIO board information, but now we do. Note
that I have additional changes queued up to have b53 register platform data for
MIPS bcm47xx and bcm63xx.

Yes I know that we should have the Orion platforms eventually be converted to
Device Tree, but until that happens, I don't want any remaining users of the
old "dsa" platform device (hence the previous DTS submissions for ARM/mvebu)
and, there will be platforms out there that most likely won't never see DT
coming their way (BCM47xx is almost 100% sure, BCM63xx maybe not in a distant
future).

We would probably want the whole series to be merged via David Miller's tree
to simplify things.

Thanks!

Changes in v5:

- dropped changes to drivers/base/ because after more than a month, we cannot
  get any answer from Greg KH

Changes in v4:

- Changed device_find_class() to device_find_in_class_name()
- Added kerneldoc above device_find_in_class_name() to explain what it does
  and the calling convention regarding device reference counts
- Changed dev_to_net_device to device_to_net_device() added comments
  about what it does and the caller conventions regarding reference counts

Changes in v3:

- Tested EPROBE_DEFER from a mockup MDIO/DSA switch driver and everything
  is fine, once the driver finally probes we have access to platform data
  as expected

- added comment above dsa_port_is_valid() that port->name is mandatory
  for platform data cases

- added an extra check in dsa_parse_member() for a NULL pdata pointer

- fixed a bunch of checkpatch errors and warnings

Changes in v2:

- Rebased against latest net-next/master

- Moved dev_find_class() to device_find_class() into drivers/base/core.c

- Moved dev_to_net_device into net/core/dev.c

- Utilize dsa_chip_data directly instead of dsa_platform_data

- Augmented dsa_chip_data to be multi-CPU port ready

Changes from last submission (few months back):

- rebased against latest net-next

- do not introduce dsa2_platform_data which was overkill and was meant to
  allow us to do exaclty the same things with platform data and Device Tree
  we use the existing dsa_platform_data instead

- properly register MDIO devices when the MDIO bus is registered and associate
  platform_data with them

- add a change to the Orion platform code to demonstrate how this can be used

Thank you
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a23b2961 575e93f7

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();