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

Commit 00baabe5 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

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: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 877b7cb0

drivers/net/dsa/mv88e6xxx/chip.c

+7 −4
Original line number Diff line number Diff line
@@ -4386,7 +4386,6 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 
	struct device_node *np = dev->of_node;

	const struct mv88e6xxx_info *compat_info;

	struct mv88e6xxx_chip *chip;

	u32 eeprom_len;

	int port;

	int err;
@@ -4436,9 +4435,13 @@ static int mv88e6xxx_probe(struct mdio_device *mdiodev) 


	mv88e6xxx_phy_init(chip);



	if (chip->info->ops->get_eeprom &&

	    !of_property_read_u32(np, "eeprom-length", &eeprom_len))

		chip->eeprom_len = eeprom_len;

	if (chip->info->ops->get_eeprom) {

		if (np)

			of_property_read_u32(np, "eeprom-length",

					     &chip->eeprom_len);

		else

			chip->eeprom_len = pdata->eeprom_len;

	}



	mutex_lock(&chip->reg_lock);

	err = mv88e6xxx_switch_reset(chip);

drivers/net/dsa/mv88e6xxx/chip.h

+1 −1
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ struct mv88e6xxx_chip { 
	struct gpio_desc *reset;



	/* set to size of eeprom if supported by the switch */

	int		eeprom_len;

	u32 eeprom_len;



	/* List of mdio busses */

	struct list_head mdios;

include/linux/platform_data/mv88e6xxx.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ struct dsa_mv88e6xxx_pdata { 
	const char *compatible;

	unsigned int enabled_ports;

	struct net_device *netdev;

	u32 eeprom_len;

};



#endif