summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-01-11 16:59:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-13 07:54:10 +0100
commit3fd488a7203ed1113ece794c87f63e8048f2d7c4 (patch)
treed759140ee1d6b51d66746126ffacaa4e1fa688ab /drivers
parenta1bfa62c2088671115b0c9e472676c56d346e086 (diff)
downloadbarebox-3fd488a7203ed1113ece794c87f63e8048f2d7c4.tar.gz
barebox-3fd488a7203ed1113ece794c87f63e8048f2d7c4.tar.xz
net/phy: marvell: align definition of MII_88E1121_PHY_MSCR to Linux driver
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/phy/marvell.c6
1 files changed, 3 insertions, 3 deletions
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;