openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: phy: mscc: read 'vsc8531,vddmac' as an u32 

In the DT binding, it is specified nowhere that 'vsc8531,vddmac' is an
u16, even though it's read as an u16 in the driver.

Let's update the driver to take into consideration that the
'vsc8531,vddmac' 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>
This commit is contained in:
Quentin Schulz 2018-09-03 10:48:49 +02:00 committed by David S. Miller
parent 0969abaa50
commit a993e0f583
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ struct vsc8531_private {
#ifdef CONFIG_OF_MDIO #ifdef CONFIG_OF_MDIO
struct vsc8531_edge_rate_table { struct vsc8531_edge_rate_table {
u16 vddmac; u32 vddmac;
u8 slowdown[8]; u8 slowdown[8];
}; };
@ -387,7 +387,7 @@ static void vsc85xx_wol_get(struct phy_device *phydev,
static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev) static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
{ {
u8 sd; u8 sd;
u16 vdd; u32 vdd;
int rc, i, j; int rc, i, j;
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;
@ -396,7 +396,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
if (!of_node) if (!of_node)
return -ENODEV; return -ENODEV;
rc = of_property_read_u16(of_node, "vsc8531,vddmac", &vdd); rc = of_property_read_u32(of_node, "vsc8531,vddmac", &vdd);
if (rc != 0) if (rc != 0)
vdd = MSCC_VDDMAC_3300; vdd = MSCC_VDDMAC_3300;