mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH v1 2/7] net/phy: marvell: 88E1540 LED registers already exist on 88E1121
Date: Wed, 11 Jan 2017 16:59:15 +0100	[thread overview]
Message-ID: <20170111155920.13179-3-u.kleine-koenig@pengutronix.de> (raw)
In-Reply-To: <20170111155920.13179-1-u.kleine-koenig@pengutronix.de>

So rename accordingly to match the definition used by Linux

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/net/phy/marvell.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 4bf8bae59a95..c4d9c7fe493a 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.
-- 
2.11.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2017-01-11 16:00 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 ` Uwe Kleine-König [this message]
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 ` [PATCH v1 5/7] net/phy: marvell: align definition of MII_88E1121_PHY_MSCR to " Uwe Kleine-König
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-3-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