net: dsa: Support for pdata in dsa2
Subsystems (7)
v5 cover net: dsa: Support for pdata in dsa2
Hi all,
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
- rebased against latest net-next/master
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
Florian Fainelli (4):
net: dsa: Rename and export dev_to_net_device()
net: dsa: Add support for platform data
net: phy: Allow pre-declaration of MDIO devices
ARM: orion: Register DSA switch as a MDIO device
arch/arm/mach-orion5x/common.c | 2 +- arch/arm/mach-orion5x/common.h | 4 +- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +- arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +- arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 7 +- arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 7 +- arch/arm/plat-orion/common.c | 25 +++++-- arch/arm/plat-orion/include/plat/common.h | 4 +- drivers/net/phy/Makefile | 3 +- drivers/net/phy/mdio-boardinfo.c | 86 ++++++++++++++++++++++ drivers/net/phy/mdio-boardinfo.h | 19 +++++ drivers/net/phy/mdio_bus.c | 4 ++ drivers/net/phy/mdio_device.c | 11 +++ include/linux/mdio.h | 3 + include/linux/mod_devicetable.h | 1 + include/linux/phy.h | 19 +++++ include/net/dsa.h | 7 ++ net/dsa/dsa.c | 5 +- net/dsa/dsa2.c | 102 ++++++++++++++++++++++----- 20 files changed, 268 insertions(+), 57 deletions(-) create mode 100644 drivers/net/phy/mdio-boardinfo.c create mode 100644 drivers/net/phy/mdio-boardinfo.h
Signature · 1 line
2.9.3
PATCH v5 1/4 net: dsa: Rename and export dev_to_net_device()
In preparation for using this function in net/dsa/dsa2.c, rename the function to make its scope DSA specific, and export it.
--- include/net/dsa.h | 1 + net/dsa/dsa.c | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-)
include/net/dsa.h +1 -0
@@ -428,6 +428,7 @@ struct dsa_switch_driver {void register_switch_driver (struct dsa_switch_driver *type);void unregister_switch_driver (struct dsa_switch_driver *type);struct mii_bus *dsa_host_dev_to_mii_bus (struct device *dev); +struct net_device *dsa_dev_to_net_device (struct device *dev);static inline bool dsa_uses_tagged_protocol (struct dsa_switch_tree *dst) {
net/dsa/dsa.c +3 -2
@@ -486,7 +486,7 @@ struct mii_bus *dsa_host_dev_to_mii_bus(struct device *dev) }EXPORT_SYMBOL_GPL (dsa_host_dev_to_mii_bus); -static struct net_device *dev_to_net_device (struct device *dev) +struct net_device *dsa_dev_to_net_device (struct device *dev) {struct device *d;
@@ -503,6 +503,7 @@ static struct net_device *dev_to_net_device(struct device *dev)return NULL ; } +EXPORT_SYMBOL_GPL (dsa_dev_to_net_device);#ifdef CONFIG_OF static int dsa_of_setup_routing_table(struct dsa_platform_data *pd,
@@ -811,7 +812,7 @@ static int dsa_probe(struct platform_device *pdev) dev = pd->of_netdev;dev_hold (dev); }else { - dev =dev_to_net_device (pd->netdev); + dev =dsa_dev_to_net_device (pd->netdev); }if (dev ==NULL ) { ret = -EPROBE_DEFER ;
Signature · 1 line
2.9.3
PATCH v5 2/4 net: dsa: Add support for platform data
In reply to Florian FainelliAllow drivers to use the new DSA API with platform data. Most of the code in net/dsa/dsa2.c does not rely so much on device_nodes and can get the same information from platform_data instead.
We purposely do not support distributed configurations with platform data, so drivers should be providing a pointer to a 'struct dsa_chip_data' structure if they wish to communicate per-port layout.
Multiple CPUs port could potentially be supported and dsa_chip_data is extended to receive up to one reference to an upstream network device per port described by a dsa_chip_data structure.
dsa_dev_to_net_device() increments the network device's reference count, so we intentionally call dev_put() to be consistent with the DT-enabled path, until we have a generic notifier based solution.
--- include/net/dsa.h | 6 ++++ net/dsa/dsa2.c | 102 ++++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 90 insertions(+), 18 deletions(-)
include/net/dsa.h +6 -0
@@ -44,6 +44,11 @@ struct dsa_chip_data {struct device *host_dev;int sw_addr; +/* +* Reference to network devices +*/ +struct device *netdev[DSA_MAX_PORTS ]; +/* set to size of eeprom if supported by the switch */ int eeprom_len;
@@ -166,6 +171,7 @@ struct dsa_mall_tc_entry {struct dsa_port {struct dsa_switch *ds;unsigned int index; +const char *name;struct net_device *netdev;struct device_node *dn;unsigned int ageing_time;
net/dsa/dsa2.c +84 -18
165 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v5 3/4 net: phy: Allow pre-declaration of MDIO devices
In reply to Florian FainelliAllow board support code to collect pre-declarations for MDIO devices by registering them with mdiobus_register_board_info(). SPI and I2C buses have a similar feature, we were missing this for MDIO devices, but this is particularly useful for e.g: MDIO-connected switches which need to provide their port layout (often board-specific) to a MDIO Ethernet switch driver.
--- drivers/net/phy/Makefile | 3 +- drivers/net/phy/mdio-boardinfo.c | 86 ++++++++++++++++++++++++++++++++++++++++ drivers/net/phy/mdio-boardinfo.h | 19 +++++++++ drivers/net/phy/mdio_bus.c | 4 ++ drivers/net/phy/mdio_device.c | 11 +++++ include/linux/mdio.h | 3 ++ include/linux/mod_devicetable.h | 1 + include/linux/phy.h | 19 +++++++++ 8 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 drivers/net/phy/mdio-boardinfo.c create mode 100644 drivers/net/phy/mdio-boardinfo.h
drivers/net/phy/Makefile +2 -1
@@ -1,6 +1,7 @@ # Makefile for Linux PHY drivers and MDIO bus drivers -libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o +libphy-y := phy.o phy_device.o mdio_bus.o mdio_device.o \ + mdio-boardinfo.o libphy-$(CONFIG_SWPHY) += swphy.o libphy-$(CONFIG_LED_TRIGGER_PHY) += phy_led_triggers.o
drivers/net/phy/mdio-boardinfo.c new file +86 -0
86 lines not on this page · raw message
drivers/net/phy/mdio-boardinfo.h new file +19 -0
@@ -0,0 +1,19 @@ +/* +* mdio-boardinfo.h - board info interface internal to the mdio_bus +* component +*/ + +#ifndef __MDIO_BOARD_INFO_H +#define __MDIO_BOARD_INFO_H + +#include <linux/phy.h> +#include <linux/mutex.h> + +struct mdio_board_entry { +struct list_head list; +struct mdio_board_info board_info; +}; + +void mdiobus_setup_mdiodev_from_board_info (struct mii_bus *bus); + +#endif /* __MDIO_BOARD_INFO_H */
drivers/net/phy/mdio_bus.c +4 -0
@@ -41,6 +41,8 @@#define CREATE_TRACE_POINTS #include <trace/events/mdio.h> +#include "mdio-boardinfo.h" +int mdiobus_register_device (struct mdio_device *mdiodev) {if (mdiodev->bus->mdio_map[mdiodev->addr])
@@ -343,6 +345,8 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner) } } +mdiobus_setup_mdiodev_from_board_info (bus); + bus->state =MDIOBUS_REGISTERED ;pr_info ("%s: probed\n" , bus->name);return 0 ;
drivers/net/phy/mdio_device.c +11 -0
@@ -34,6 +34,17 @@ static void mdio_device_release(struct device *dev)kfree (to_mdio_device (dev)); } +int mdio_device_bus_match (struct device *dev,struct device_driver *drv) +{ +struct mdio_device *mdiodev =to_mdio_device (dev); +struct mdio_driver *mdiodrv =to_mdio_driver (drv); + +if (mdiodrv->mdiodrv.flags &MDIO_DEVICE_IS_PHY ) +return 0 ; + +return strcmp (mdiodev->modalias, drv->name) ==0 ; +} +struct mdio_device *mdio_device_create (struct mii_bus *bus,int addr) {struct mdio_device *mdiodev;
include/linux/mdio.h +3 -0
@@ -10,6 +10,7 @@#define __LINUX_MDIO_H__#include <uapi/linux/mdio.h> +#include <linux/mod_devicetable.h> struct mii_bus ;
@@ -29,6 +30,7 @@ struct mdio_device {const struct dev_pm_ops *pm_ops;struct mii_bus *bus; +char modalias[MDIO_NAME_SIZE ];int (*bus_match)(struct device *dev,struct device_driver *drv);void (*device_free)(struct mdio_device *mdiodev);
@@ -71,6 +73,7 @@ int mdio_device_register(struct mdio_device *mdiodev);void mdio_device_remove (struct mdio_device *mdiodev);int mdio_driver_register (struct mdio_driver *drv);void mdio_driver_unregister (struct mdio_driver *drv); +int mdio_device_bus_match (struct device *dev,struct device_driver *drv);static inline bool mdio_phy_id_is_c45 (int phy_id) {
include/linux/mod_devicetable.h +1 -0
@@ -501,6 +501,7 @@ struct platform_device_id {kernel_ulong_t driver_data; }; +#define MDIO_NAME_SIZE 32#define MDIO_MODULE_PREFIX "mdio:"#define MDIO_ID_FMT "%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d%d"
include/linux/phy.h +19 -0
@@ -877,6 +877,25 @@ void mdio_bus_exit(void);extern struct bus_type mdio_bus_type; +struct mdio_board_info { +const char *bus_id; +char modalias[MDIO_NAME_SIZE ]; +int mdio_addr; +const void *platform_data; +}; + +#if IS_ENABLED (CONFIG_PHYLIB ) +int mdiobus_register_board_info (const struct mdio_board_info *info, +unsigned int n); +#else +static inline int mdiobus_register_board_info (const struct mdio_board_info *i, +unsigned int n) +{ +return 0 ; +} +#endif + +/** * module_phy_driver() - Helper macro for registering PHY drivers * @__phy_drivers: array of PHY drivers to register
Signature · 1 line
2.9.3
Andrew Lunn
maintainerRe: [PATCH net-next v5 3/4] net: phy: Allow pre-declaration of MDIO devices
Quoted 9 lines
include/linux/mod_devicetable.h +1
-0@@ -501,6 +501,7 @@ struct platform_device_id {kernel_ulong_t driver_data; }; +#define MDIO_NAME_SIZE 32
...
include/linux/mod_devicetable.h
Quoted 4 lines
include/linux/mod_devicetable.h +4
-0+struct mdio_board_info { +const char *bus_id; +char modalias[MDIO_NAME_SIZE ]; +
I think it might be better to use MII_BUS_ID_SIZE. These are all related, so using one define should avoid surprise buffer overruns, truncation's.
Andrew
Re: [PATCH net-next v5 3/4] net: phy: Allow pre-declaration of MDIO devices
Quoted 12 lines · Andrew Lunn
Quoted 9 lines
include/linux/mod_devicetable.h +1
-0@@ -501,6 +501,7 @@ struct platform_device_id {kernel_ulong_t driver_data; }; +#define MDIO_NAME_SIZE 32...
Quoted 8 lines
include/linux/mod_devicetable.h
Quoted 4 lines
include/linux/mod_devicetable.h +4
-0+struct mdio_board_info { +const char *bus_id; +char modalias[MDIO_NAME_SIZE ]; +I think it might be better to use
MII_BUS_ID_SIZE. These are all related, so using one define should avoid surprise buffer overruns, truncation's.
I considered doing that, but left it that way because I valued the "const" qualifier more than running out of buffer space. What I could do though, is change the strcmp() in drivers/net/phy/mdio-boardinfo.c to be bound by MII_BUS_ID_SIZE.
Signature · 1 line
Florian
Andrew Lunn
maintainerRe: [PATCH net-next v5 3/4] net: phy: Allow pre-declaration of MDIO devices
In reply to Florian FainelliQuoted 17 lines
drivers/net/phy/mdio-boardinfo.c new file +17
-0+/** +* mdio_register_board_info - register MDIO devices for a given board +* @info: array of devices descriptors +* @n: number of descriptors provided +* Context: can sleep +* +* The board info passed can be marked with __initdata but be pointers +* such as platform_data etc. are copied as-is +*/ +int mdiobus_register_board_info (const struct mdio_board_info *info, +unsigned int n) +{ +struct mdio_board_entry *be; +unsigned int i; + + be =kcalloc (n,sizeof (*be),GFP_KERNEL ); +if (!be)
drivers/net/phy/mdio-boardinfo.c line 85
Quoted 10 lines
drivers/net/phy/mdio-boardinfo.c new file +10
-0+return -ENOMEM ; + +for (i =0 ; i < n; i++, be++, info++) { +memcpy (&be->board_info, info,sizeof (*info)); +mutex_lock (&mdio_board_lock); +list_add_tail (&be->list, &mdio_board_list); +mutex_unlock (&mdio_board_lock); + } + +return 0 ;
Hi Florian
I've recently been playing with a hot-pluggable SPI bus controller. It is a USB device, hence can come and go. On the SPI bus i have an SRAM. On order to instantiate the MTD device, i need SPI board info. I cannot add the board info until after the SPI bus master appears, since i need to know its ID to fill in the board info. At the moment, i have udev script which when the SPI bus master appears loads a little kernel module which registers the board info.
Such a scheme will not work here. You need to iterate the list of MDIO devices at the end of mdiobus_register_board_info() to see if the just registered board info applies to any existing MDIO bus.
I don't think we yet have any hardware which would do this. But there have been patches to one of the USB-Ethernet dongles to allow it run without a PHY. My guess is, to allow an SFP module. But it is not too big a step for somebody to make a USB attached Ethernet switch.
Maybe consider adding this functionality? Also an unregister call?
Andrew
Re: [PATCH net-next v5 3/4] net: phy: Allow pre-declaration of MDIO devices
Quoted 38 lines · Andrew Lunn
Quoted 17 lines
drivers/net/phy/mdio-boardinfo.c new file +17
-0+/** +* mdio_register_board_info - register MDIO devices for a given board +* @info: array of devices descriptors +* @n: number of descriptors provided +* Context: can sleep +* +* The board info passed can be marked with __initdata but be pointers +* such as platform_data etc. are copied as-is +*/ +int mdiobus_register_board_info (const struct mdio_board_info *info, +unsigned int n) +{ +struct mdio_board_entry *be; +unsigned int i; + + be =kcalloc (n,sizeof (*be),GFP_KERNEL ); +if (!be)drivers/net/phy/mdio-boardinfo.c line 85
Quoted 10 lines
drivers/net/phy/mdio-boardinfo.c new file +10
-0+return -ENOMEM ; + +for (i =0 ; i < n; i++, be++, info++) { +memcpy (&be->board_info, info,sizeof (*info)); +mutex_lock (&mdio_board_lock); +list_add_tail (&be->list, &mdio_board_list); +mutex_unlock (&mdio_board_lock); + } + +return 0 ;Hi Florian
I've recently been playing with a hot-pluggable SPI bus controller. It is a USB device, hence can come and go. On the SPI bus i have an SRAM. On order to instantiate the MTD device, i need SPI board info. I cannot add the board info until after the SPI bus master appears, since i need to know its ID to fill in the board info. At the moment, i have udev script which when the SPI bus master appears loads a little kernel module which registers the board info.
Quoted 3 lines
Such a scheme will not work here. You need to iterate the list of MDIO devices at the end of
mdiobus_register_board_info()to see if the just registered board info applies to any existing MDIO bus.
I was thinking when mdio_device_register() is called, see if there is a matching board info for it, and if so, assign its platform_data accordingly. In the case where mdiobus_register_with_board
Quoted 7 lines
I don't think we yet have any hardware which would do this. But there have been patches to one of the USB-Ethernet dongles to allow it run without a PHY. My guess is, to allow an SFP module. But it is not too big a step for somebody to make a USB attached Ethernet switch.
Maybe consider adding this functionality? Also an unregister call?
Sure, makes sense.
Signature · 1 line
Florian
PATCH v5 4/4 ARM: orion: Register DSA switch as a MDIO device
In reply to Florian FainelliUtilize 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().
--- arch/arm/mach-orion5x/common.c | 2 +- arch/arm/mach-orion5x/common.h | 4 ++-- arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 7 +------ arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 7 +------ arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 7 +------ arch/arm/mach-orion5x/wnr854t-setup.c | 2 +- arch/arm/mach-orion5x/wrt350n-v2-setup.c | 7 +------ arch/arm/plat-orion/common.c | 25 +++++++++++++++++++------ arch/arm/plat-orion/include/plat/common.h | 4 ++-- 9 files changed, 29 insertions(+), 36 deletions(-)
arch/arm/mach-orion5x/common.c +1 -1
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 ();
arch/arm/mach-orion5x/wnr854t-setup.c +1 -1
@@ -124,7 +124,7 @@ static void __init wnr854t_init(void)* Configure peripherals. */ orion5x_eth_init (&wnr854t_eth_data); -orion5x_eth_switch_init (&wnr854t_switch_plat_data); +orion5x_eth_switch_init (&wnr854t_switch_chip_data);orion5x_uart0_init (); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
arch/arm/mach-orion5x/wrt350n-v2-setup.c +1 -6
@@ -191,11 +191,6 @@ static struct dsa_chip_data wrt350n_v2_switch_chip_data = { .port_names[7] = "lan4", }; -static struct dsa_platform_data __initdata wrt350n_v2_switch_plat_data = { - .nr_chips =1 , - .chip = &wrt350n_v2_switch_chip_data, -}; -static void __init wrt350n_v2_init (void ) {/*
@@ -210,7 +205,7 @@ static void __init wrt350n_v2_init(void)*/ orion5x_ehci0_init ();orion5x_eth_init (&wrt350n_v2_eth_data); -orion5x_eth_switch_init (&wrt350n_v2_switch_plat_data); +orion5x_eth_switch_init (&wrt350n_v2_switch_chip_data);orion5x_uart0_init (); mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
arch/arm/plat-orion/common.c +19 -6
@@ -22,6 +22,7 @@#include <linux/platform_data/dma-mv_xor.h> #include <linux/platform_data/usb-ehci-orion.h> #include <plat/common.h> +#include <linux/phy.h> /* Create a clkdev entry for a given device/clk */ void __init orion_clkdev_add(const char *con_id, const char *dev_id,
@@ -470,15 +471,27 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,/***************************************************************************** * Ethernet switch ****************************************************************************/ -void __init orion_ge00_switch_init (struct dsa_platform_data *d) +static __initconst const char *orion_ge00_mvmdio_bus_name ="orion-mii" ; +static __initdata struct mdio_board_info + orion_ge00_switch_board_info; + +void __init orion_ge00_switch_init (struct dsa_chip_data *d) { -int i; +struct mdio_board_info *bd; +unsigned int i; + +for (i =0 ; i <ARRAY_SIZE (d->port_names); i++) +if (!strcmp (d->port_names[i],"cpu" )) +break ; - d->netdev = &orion_ge00.dev; -for (i =0 ; i < d->nr_chips; i++) - d->chip[i].host_dev = &orion_ge_mvmdio.dev; + bd = &orion_ge00_switch_board_info; + bd->bus_id = orion_ge00_mvmdio_bus_name; + bd->mdio_addr = d->sw_addr; + d->netdev[i] = &orion_ge00.dev; +strcpy (bd->modalias,"mv88e6085" ); + bd->platform_data = d; -platform_device_register_data (NULL ,"dsa" ,0 , d,sizeof (d)); +mdiobus_register_board_info (&orion_ge00_switch_board_info,1 ); }/*****************************************************************************
arch/arm/plat-orion/include/plat/common.h +2 -2
@@ -12,7 +12,7 @@#include <linux/mv643xx_eth.h> #include <linux/platform_data/usb-ehci-orion.h> -struct dsa_platform_data ; +struct dsa_chip_data ;struct mv_sata_platform_data ; void __init orion_uart0_init(void __iomem *membase,
@@ -57,7 +57,7 @@ void __init orion_ge11_init(struct mv643xx_eth_platform_data *eth_data,unsigned long mapbase, unsigned long irq); -void __init orion_ge00_switch_init (struct dsa_platform_data *d); +void __init orion_ge00_switch_init (struct dsa_chip_data *d); void __init orion_i2c_init(unsigned long mapbase, unsigned long irq,
Signature · 1 line
2.9.3