redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

net: phy: mscc: read 'vsc8531, led-%d-mode' as an u32 

In the DT binding, it is specified nowhere that 'vsc8531,led-%d-mode' is
an u8, even though it's read as an u8 in the driver.

Let's update the driver to take into consideration that the
'vsc8531,led-%d-mode' property is of the default type u32.

Signed-off-by: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
hifive-unleashed-5.1
Quentin Schulz 2018-09-03 10:48:51 +02:00 committed by David S. Miller
parent 36c53cf0f4
commit 5ff8e1f3cd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/mscc.c
View File

@ -122,7 +122,7 @@ enum rgmii_rx_clock_delay {
struct vsc8531_private { struct vsc8531_private {
int rate_magic; int rate_magic;
u16 supp_led_modes; u16 supp_led_modes;
u8 leds_mode[MAX_LEDS]; u32 leds_mode[MAX_LEDS];
u8 nleds; u8 nleds;
}; };
@ -414,19 +414,19 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
static int vsc85xx_dt_led_mode_get(struct phy_device *phydev, static int vsc85xx_dt_led_mode_get(struct phy_device *phydev,
char *led, char *led,
u8 default_mode) u32 default_mode)
{ {
struct vsc8531_private *priv = phydev->priv; struct vsc8531_private *priv = phydev->priv;
struct device *dev = &phydev->mdio.dev; struct device *dev = &phydev->mdio.dev;
struct device_node *of_node = dev->of_node; struct device_node *of_node = dev->of_node;
u8 led_mode; u32 led_mode;
int err; int err;
if (!of_node) if (!of_node)
return -ENODEV; return -ENODEV;
led_mode = default_mode; led_mode = default_mode;
err = of_property_read_u8(of_node, led, &led_mode); err = of_property_read_u32(of_node, led, &led_mode);
if (!err && !(BIT(led_mode) & priv->supp_led_modes)) { if (!err && !(BIT(led_mode) & priv->supp_led_modes)) {
phydev_err(phydev, "DT %s invalid\n", led); phydev_err(phydev, "DT %s invalid\n", led);
return -EINVAL; return -EINVAL;
@ -449,7 +449,8 @@ static int vsc85xx_dt_led_mode_get(struct phy_device *phydev,
} }
#endif /* CONFIG_OF_MDIO */ #endif /* CONFIG_OF_MDIO */
static int vsc85xx_dt_led_modes_get(struct phy_device *phydev, u8 *default_mode) static int vsc85xx_dt_led_modes_get(struct phy_device *phydev,
u32 *default_mode)
{ {
struct vsc8531_private *priv = phydev->priv; struct vsc8531_private *priv = phydev->priv;
char led_dt_prop[19]; char led_dt_prop[19];
@ -656,7 +657,7 @@ static int vsc85xx_probe(struct phy_device *phydev)
{ {
struct vsc8531_private *vsc8531; struct vsc8531_private *vsc8531;
int rate_magic; int rate_magic;
u8 default_mode[2] = {VSC8531_LINK_1000_ACTIVITY, u32 default_mode[2] = {VSC8531_LINK_1000_ACTIVITY,
VSC8531_LINK_100_ACTIVITY}; VSC8531_LINK_100_ACTIVITY};
rate_magic = vsc85xx_edge_rate_magic_get(phydev); rate_magic = vsc85xx_edge_rate_magic_get(phydev);