lkml.org 
[lkml]   [2019]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 076/205] net: phy: mscc: read 'vsc8531,vddmac' as an u32
    Date
    From: Quentin Schulz <quentin.schulz@bootlin.com>

    [ Upstream commit a993e0f583c7925adaa7721226ccd7a41e7e63d1 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/net/phy/mscc.c | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    diff --git a/drivers/net/phy/mscc.c b/drivers/net/phy/mscc.c
    index 84ca9ff40ae0b..53d63a71a03e2 100644
    --- a/drivers/net/phy/mscc.c
    +++ b/drivers/net/phy/mscc.c
    @@ -111,7 +111,7 @@ struct vsc8531_private {

    #ifdef CONFIG_OF_MDIO
    struct vsc8531_edge_rate_table {
    - u16 vddmac;
    + u32 vddmac;
    u8 slowdown[8];
    };

    @@ -376,7 +376,7 @@ out_unlock:
    static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
    {
    u8 sd;
    - u16 vdd;
    + u32 vdd;
    int rc, i, j;
    struct device *dev = &phydev->mdio.dev;
    struct device_node *of_node = dev->of_node;
    @@ -385,7 +385,7 @@ static int vsc85xx_edge_rate_magic_get(struct phy_device *phydev)
    if (!of_node)
    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)
    vdd = MSCC_VDDMAC_3300;

    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-08 13:11    [W:7.070 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site