diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2015-04-20 22:11:13 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-04-27 08:09:34 +0200 |
| commit | a553a4dc731e3f4ce0936361ca508939e76a9dce (patch) | |
| tree | c9c1586aaa3987ca3b11df4af84fb495ce7c7362 /drivers/net | |
| parent | 5106fcfaf98e1675f2c0d5a3e2e9f08e8758be3d (diff) | |
| download | barebox-a553a4dc731e3f4ce0936361ca508939e76a9dce.tar.gz barebox-a553a4dc731e3f4ce0936361ca508939e76a9dce.tar.xz | |
net: phy: Support Marvell 88E1318S PHY
This adds support for the Marvell 88E1318S Gigabit Ethernet PHY.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/phy/marvell.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index aaf9f53451..6409f14ae2 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -35,6 +35,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_REG 16 +#define MII_88E1318S_PHY_MSCR1_PAD_ODD BIT(6) + #define MII_88E1540_LED_PAGE 0x3 #define MII_88E1540_LED_CONTROL 0x10 @@ -214,6 +217,25 @@ 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); + reg |= MII_88E1318S_PHY_MSCR1_PAD_ODD; + ret = phy_write(phydev, MII_88E1318S_PHY_MSCR1_REG, reg); + if (ret < 0) + return ret; + + return m88e1121_config_init(phydev); +} + static struct phy_driver marvell_phys[] = { { .phy_id = MARVELL_PHY_ID_88E1121R, @@ -225,6 +247,15 @@ 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_88E1543, .phy_id_mask = MARVELL_PHY_ID_MASK, .drv.name = "Marvell 88E1543", |