From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v1 5/7] net/phy: marvell: align definition of MII_88E1121_PHY_MSCR to Linux driver
Date: Wed, 11 Jan 2017 16:59:18 +0100 [thread overview]
Message-ID: <20170111155920.13179-6-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20170111155920.13179-1-u.kleine-koenig@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/net/phy/marvell.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index e01538067622..d504cf85a1da 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;
--
2.11.0
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2017-01-11 15:59 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-11 15:59 [PATCH v1 0/7] net/phy: marvell: add support for 88e1510 Uwe Kleine-König
2017-01-11 15:59 ` [PATCH v1 1/7] net/phy: marvell: rename 88E1545 to 88E1540 Uwe Kleine-König
2017-01-11 15:59 ` [PATCH v1 2/7] net/phy: marvell: 88E1540 LED registers already exist on 88E1121 Uwe Kleine-König
2017-01-11 15:59 ` [PATCH v1 3/7] net/phy: marvell: rename phy_driver array to match Linux driver Uwe Kleine-König
2017-01-11 15:59 ` [PATCH v1 4/7] net/phy: marvell: change spacing to be more similar to the " Uwe Kleine-König
2017-01-11 15:59 ` Uwe Kleine-König [this message]
2017-01-11 15:59 ` [PATCH v1 6/7] net/phy: marvell: improve config_aneg for 88E1121R and 88E1318S Uwe Kleine-König
2017-01-11 15:59 ` [PATCH v1 7/7] net/phy: marvell: add support for 88e1510 to marvell phy driver Uwe Kleine-König
2017-01-13 6:54 ` [PATCH v1 0/7] net/phy: marvell: add support for 88e1510 Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170111155920.13179-6-u.kleine-koenig@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox