[PATCH] net: phy: Support Marvell 88E1318S and 88E1510 PHYs

[Sebastian Hesselbarth]

This adds support for Marvell 88E1318S and 88E1510 PHYs.

Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
---
Cc: barebox at lists.infradead.org
Cc: Sascha Hauer <s.hauer at pengutronix.de>
Cc: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
Cc: Gregory Clement <gregory.clement at free-electrons.com>
Cc: Ezequiel Garcia <ezequiel.garcia at free-electrons.com>

Sascha, this patch is based on next plus Ezequiel's
 ("net: phy: Support Marvell 88EE1545 PHY")
 ("net: phy: Support Marvell 88EE1543 PHY")
patches and should be applied after them.
---
 drivers/net/phy/marvell.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c
index 63530771955d..74c48bc2a85d 100644
--- a/drivers/net/phy/marvell.c
+++ b/drivers/net/phy/marvell.c
@@ -52,6 +52,9 @@
 #define MII_88E1121_PHY_MSCR_DELAY_MASK	\
 	(MII_88E1121_PHY_MSCR_RX_DELAY | MII_88E1121_PHY_MSCR_TX_DELAY)
 
+#define MII_88E1318S_PHY_MSCR1		0x10
+#define MII_88E1318S_PHY_MSCR1_PAD_ODD	BIT(6)
+
 #define MII_88E1540_LED_PAGE		0x3
 #define MII_88E1540_LED_CONTROL		0x10
 
@@ -231,6 +234,30 @@ static int m88e1121_config_init(struct phy_device *phydev)
 	return 0;
 }
 
+static int m88e1318s_config_init(struct phy_device *phydev)
+{
+	u16 reg;
+	int ret;
+
+	ret = phy_write(phydev, MII_MARVELL_PHY_PAGE,
+			MII_88E1121_PHY_MSCR_PAGE);
+	if (ret < 0)
+		return ret;
+
+	reg = phy_read(phydev, MII_88E1318S_PHY_MSCR1);
+	reg |= MII_88E1318S_PHY_MSCR1_PAD_ODD;
+
+	ret = phy_write(phydev, MII_88E1318S_PHY_MSCR1, reg);
+	if (ret < 0)
+		return ret;
+
+	phy_write(phydev, MII_MARVELL_PHY_PAGE, MII_MARVELL_PHY_DEFAULT_PAGE);
+	if (ret < 0)
+		return ret;
+
+	return m88e1121_config_init(phydev);
+}
+
 static struct phy_driver marvell_phys[] = {
 {
 	.phy_id		= MARVELL_PHY_ID_88E1121R,
@@ -242,6 +269,24 @@ static struct phy_driver marvell_phys[] = {
 	.read_status	= marvell_read_status,
 },
 {
+	.phy_id		= MARVELL_PHY_ID_88E1318S,
+	.phy_id_mask	= MARVELL_PHY_ID_MASK,
+	.drv.name	= "Marvell 88E1318S",
+	.features	= PHY_GBIT_FEATURES,
+	.config_init	= m88e1318s_config_init,
+	.config_aneg	= genphy_config_aneg,
+	.read_status	= marvell_read_status,
+},
+{
+	.phy_id		= MARVELL_PHY_ID_88E1510,
+	.phy_id_mask	= MARVELL_PHY_ID_MASK,
+	.drv.name	= "Marvell 88E1510",
+	.features	= PHY_GBIT_FEATURES,
+	.config_init	= m88e1318s_config_init,
+	.config_aneg	= genphy_config_aneg,
+	.read_status	= marvell_read_status,
+},
+{
 	.phy_id		= MARVELL_PHY_ID_88E1545,
 	.phy_id_mask	= MARVELL_PHY_ID_MASK,
 	.drv.name	= "Marvell 88E1545",
-- 
2.0.0