From 3fd488a7203ed1113ece794c87f63e8048f2d7c4 Mon Sep 17 00:00:00 2001 From: Uwe Kleine-König Date: Wed, 11 Jan 2017 16:59:18 +0100 Subject: net/phy: marvell: align definition of MII_88E1121_PHY_MSCR to Linux driver MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Uwe Kleine-König Signed-off-by: Sascha Hauer --- drivers/net/phy/marvell.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e015380676..d504cf85a1 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -32,7 +32,7 @@ #define MII_M1011_PHY_STATUS_LINK BIT(10) #define MII_88E1121_PHY_MSCR_PAGE 2 -#define MII_88E1121_PHY_MSCR 0x15 +#define MII_88E1121_PHY_MSCR_REG 21 #define MII_88E1121_PHY_MSCR_TX_DELAY BIT(4) #define MII_88E1121_PHY_MSCR_RX_DELAY BIT(5) #define MII_88E1121_PHY_MSCR_DELAY_MASK \ @@ -186,7 +186,7 @@ static int m88e1121_config_init(struct phy_device *phydev) return ret; /* Setup RGMII TX/RX delay */ - reg = phy_read(phydev, MII_88E1121_PHY_MSCR) & + reg = phy_read(phydev, MII_88E1121_PHY_MSCR_REG) & ~MII_88E1121_PHY_MSCR_DELAY_MASK; if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_RXID) @@ -194,7 +194,7 @@ static int m88e1121_config_init(struct phy_device *phydev) if (phydev->interface == PHY_INTERFACE_MODE_RGMII_ID || phydev->interface == PHY_INTERFACE_MODE_RGMII_TXID) reg |= MII_88E1121_PHY_MSCR_TX_DELAY; - ret = phy_write(phydev, MII_88E1121_PHY_MSCR, reg); + ret = phy_write(phydev, MII_88E1121_PHY_MSCR_REG, reg); if (ret < 0) return ret; -- cgit v1.2.3