hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: dsa: mv88e6xxx: Add support for EEPROM via platform data 

Add the size of the EEPROM to the platform data, so it can also be
instantiated by a platform device.

Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andrew Lunn 2018-05-19 22:31:35 +02:00 committed by David S. Miller
parent 877b7cb0b6
commit 00baabe528
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/net/dsa/mv88e6xxx/chip.c
View File

@ -4386,7 +4386,6 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
struct device_node *np = dev->of_node; struct device_node *np = dev->of_node;
const struct mv88e6xxx_info *compat_info; const struct mv88e6xxx_info *compat_info;
struct mv88e6xxx_chip *chip; struct mv88e6xxx_chip *chip;
u32 eeprom_len;
int port; int port;
int err; int err;
@ -4436,9 +4435,13 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev)
mv88e6xxx_phy_init(chip); mv88e6xxx_phy_init(chip);
if (chip->info->ops->get_eeprom && if (chip->info->ops->get_eeprom) {
!of_property_read_u32(np, "eeprom-length", &eeprom_len)) if (np)
chip->eeprom_len = eeprom_len; of_property_read_u32(np, "eeprom-length",
&chip->eeprom_len);
else
chip->eeprom_len = pdata->eeprom_len;
}
mutex_lock(&chip->reg_lock); mutex_lock(&chip->reg_lock);
err = mv88e6xxx_switch_reset(chip); err = mv88e6xxx_switch_reset(chip);

2
drivers/net/dsa/mv88e6xxx/chip.h
View File

@ -238,7 +238,7 @@ struct mv88e6xxx_chip {
struct gpio_desc *reset; struct gpio_desc *reset;
/* set to size of eeprom if supported by the switch */ /* set to size of eeprom if supported by the switch */
int eeprom_len; u32 eeprom_len;
/* List of mdio busses */ /* List of mdio busses */
struct list_head mdios; struct list_head mdios;

1
include/linux/platform_data/mv88e6xxx.h
View File

@ -12,6 +12,7 @@ struct dsa_mv88e6xxx_pdata {
const char *compatible; const char *compatible;
unsigned int enabled_ports; unsigned int enabled_ports;
struct net_device *netdev; struct net_device *netdev;
u32 eeprom_len;
}; };
#endif #endif