From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
To: barebox@lists.infradead.org
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
Jason Cooper <jason@lakedaemon.net>, Willy Tarreau <w@1wt.eu>
Subject: [PATCH 4/6] net: phy: Support Marvell 88EE1545 PHY
Date: Tue, 29 Jul 2014 17:44:59 -0300 [thread overview]
Message-ID: <1406666701-15356-5-git-send-email-ezequiel.garcia@free-electrons.com> (raw)
In-Reply-To: <1406666701-15356-1-git-send-email-ezequiel.garcia@free-electrons.com>
This commit adds support for Marvell's 88E1545 PHY chip. In particular, this
allows to support QSGMII interfaces.
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
drivers/net/phy/marvell.c | 59 +++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 59 insertions(+)
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 34f852e..ad8854d 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -23,6 +23,7 @@
#define MARVELL_PHY_ID_88E1318S 0x01410e90
#define MARVELL_PHY_ID_88E1116R 0x01410e40
#define MARVELL_PHY_ID_88E1510 0x01410dd0
+#define MARVELL_PHY_ID_88E154x 0x01410eb1
/* Mask used for ID comparisons */
#define MARVELL_PHY_ID_MASK 0xfffffff0
@@ -50,6 +51,13 @@
#define MII_88E1121_PHY_MSCR_DELAY_MASK \
(MII_88E1121_PHY_MSCR_RX_DELAY | MII_88E1121_PHY_MSCR_TX_DELAY)
+#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)
+
/*
* marvell_read_status
*
@@ -138,6 +146,48 @@ static int marvell_read_status(struct phy_device *phydev)
return 0;
}
+static int m88e1540_config_init(struct phy_device *phydev)
+{
+ u16 reg;
+ int ret;
+
+ /* Configure QSGMII auto-negotiation */
+ if (phydev->interface == PHY_INTERFACE_MODE_QSGMII) {
+ ret = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+ MII_88E1540_QSGMII_PAGE);
+ if (ret < 0)
+ return ret;
+
+ reg = phy_read(phydev, MII_88E1540_QSGMII_CONTROL);
+ ret = phy_write(phydev, MII_88E1540_QSGMII_CONTROL,
+ reg | MII_88E1540_QSGMII_AUTONEG_EN);
+ if (ret < 0)
+ return ret;
+ }
+
+ /* Configure LED as:
+ * Activity: Blink
+ * Link: On
+ * No Link: Off
+ */
+ phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_88E1540_LED_PAGE);
+ phy_write(phydev, MII_88E1540_LED_CONTROL, 0x1111);
+
+ /* Power-up the PHY. When going from power down to normal operation,
+ * software reset and auto-negotiation restart are also performed.
+ */
+ ret = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+ MII_MARVELL_PHY_DEFAULT_PAGE);
+ if (ret < 0)
+ return ret;
+ ret = phy_write(phydev, MII_BMCR,
+ phy_read(phydev, MII_BMCR) & ~BMCR_PDOWN);
+ if (ret < 0)
+ return ret;
+
+ return 0;
+}
+
static int m88e1121_config_init(struct phy_device *phydev)
{
u16 reg;
@@ -190,6 +240,15 @@ static struct phy_driver marvell_phys[] = {
.config_aneg = genphy_config_aneg,
.read_status = marvell_read_status,
},
+{
+ .phy_id = MARVELL_PHY_ID_88E154x,
+ .phy_id_mask = MARVELL_PHY_ID_MASK,
+ .drv.name = "Marvell 88E1545",
+ .features = PHY_GBIT_FEATURES,
+ .config_init = m88e1540_config_init,
+ .config_aneg = genphy_config_aneg,
+ .read_status = marvell_read_status,
+},
};
static int __init marvell_phy_init(void)
--
2.0.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2014-07-29 20:46 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-29 20:44 [PATCH 0/6] Add network support for Armada 370/XP Ezequiel Garcia
2014-07-29 20:44 ` [PATCH 1/6] net: phy: Add fallbacks for the obsoletes phy DT properties Ezequiel Garcia
2014-07-29 20:44 ` [PATCH 2/6] net: phy: mdio-mvebu: Make the clock property required Ezequiel Garcia
2014-07-29 20:44 ` [PATCH 3/6] net: phy: Add minimal support for QSGMII PHY Ezequiel Garcia
2014-07-29 20:44 ` Ezequiel Garcia [this message]
2014-07-29 21:37 ` [PATCH 4/6] net: phy: Support Marvell 88EE1545 PHY Ezequiel Garcia
2014-07-31 17:25 ` Sebastian Hesselbarth
2014-08-02 17:40 ` Ezequiel Garcia
2014-08-02 17:48 ` Sebastian Hesselbarth
2014-08-02 20:33 ` Ezequiel Garcia
2014-07-29 20:45 ` [PATCH 5/6] net: Add driver for Armada 370/XP 10/100/1000 Mbps network controller Ezequiel Garcia
2014-07-31 5:42 ` Sascha Hauer
2014-07-31 13:43 ` Ezequiel Garcia
2014-07-29 20:45 ` [PATCH 6/6] configs: Add network options to Armada 370/XP boards Ezequiel Garcia
2014-07-31 5:49 ` [PATCH 0/6] Add network support for Armada 370/XP Sascha Hauer
2014-08-02 17:41 ` Ezequiel Garcia
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=1406666701-15356-5-git-send-email-ezequiel.garcia@free-electrons.com \
--to=ezequiel.garcia@free-electrons.com \
--cc=barebox@lists.infradead.org \
--cc=jason@lakedaemon.net \
--cc=thomas.petazzoni@free-electrons.com \
--cc=w@1wt.eu \
/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