summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2017-01-11 16:59:15 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2017-01-13 07:54:10 +0100
commitdb4b34e77128d30965a29873c4e3f81ceb55825e (patch)
treec5bae1a0babfd3905eea19b310e0f1bf70b59a9d
parent4878ad35123a4a56872ce0fb8cf9ba90282aeeb9 (diff)
downloadbarebox-db4b34e77128d30965a29873c4e3f81ceb55825e.tar.gz
net/phy: marvell: 88E1540 LED registers already exist on 88E1121
So rename accordingly to match the definition used by Linux Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r--drivers/net/phy/marvell.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4bf8bae..c4d9c7f 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -19,6 +19,9 @@
#define MII_M1011_PHY_SCR 0x10
#define MII_M1011_PHY_SCR_AUTO_CROSS 0x0060
+#define MII_88E1121_PHY_LED_CTRL 16
+#define MII_88E1121_PHY_LED_PAGE 3
+
#define MII_M1011_PHY_STATUS 0x11
#define MII_M1011_PHY_STATUS_1000 BIT(15)
#define MII_M1011_PHY_STATUS_100 BIT(14)
@@ -38,9 +41,6 @@
#define MII_88E1318S_PHY_MSCR1_REG 16
#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6)
-#define MII_88E1540_LED_PAGE 0x3
-#define MII_88E1540_LED_CONTROL 0x10
-
#define MII_88E1540_QSGMII_PAGE 0x4
#define MII_88E1540_QSGMII_CONTROL 0x0
#define MII_88E1540_QSGMII_AUTONEG_EN BIT(12)
@@ -157,8 +157,8 @@ static int m88e1540_config_init(struct phy_device *phydev)
* Link: On
* No Link: Off
*/
- phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1540_LED_PAGE);
- phy_write(phydev, MII_88E1540_LED_CONTROL, 0x1111);
+ phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1121_PHY_LED_PAGE);
+ phy_write(phydev, MII_88E1121_PHY_LED_CTRL, 0x1111);
/* Power-up the PHY. When going from power down to normal operation,
* software reset and auto-negotiation restart are also performed.