From 54ef0b3262c0657c2efaeb4d0f0cbb4d3b9efdd0 Mon Sep 17 00:00:00 2001 From: Rick Hoover Date: Fri, 4 Jan 2013 13:56:54 -0800 Subject: [PATCH] Digilent: Marvell PHY: Added a new entry for 88E1510 PHYs Added a new entry for 88E1510. Added PHY initialization routine for 88E1510. Signed-off-by: Tinghui WANG (Steven) --- drivers/net/phy/marvell.c | 26 ++++++++++++++++++++++++++ include/linux/marvell_phy.h | 1 + 2 files changed, 27 insertions(+), 0 deletions(-) diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e91397e..7acc633 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -350,6 +350,17 @@ static int m88e1318_config_aneg(struct phy_device *phydev) return m88e1121_config_aneg(phydev); } +static int m88e1510_config_aneg(struct phy_device *phydev) +{ + int err; + + err = m88e1318_config_aneg(phydev); + if (err < 0) + return err; + + return marvell_of_reg_init(phydev); +} + static int m88e1116r_config_init(struct phy_device *phydev) { int temp; @@ -887,6 +898,20 @@ static struct phy_driver marvell_drivers[] = { .config_intr = &marvell_config_intr, .driver = { .owner = THIS_MODULE }, }, + { + .phy_id = MARVELL_PHY_ID_88E1510, + .phy_id_mask = MARVELL_PHY_ID_MASK, + .name = "Marvell 88E1510", + .features = PHY_GBIT_FEATURES, + .flags = PHY_HAS_INTERRUPT, + .config_aneg = &m88e1510_config_aneg, + .read_status = &marvell_read_status, + .ack_interrupt = &marvell_ack_interrupt, + .config_intr = &marvell_config_intr, + .did_interrupt = &m88e1121_did_interrupt, + .driver = { .owner = THIS_MODULE }, + }, + }; static int __init marvell_init(void) @@ -915,6 +940,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = { { 0x01410e30, 0xfffffff0 }, { 0x01410e90, 0xfffffff0 }, { 0x01410e40, 0xfffffff0 }, + { 0x01410dd0, 0xfffffff0 }, { } }; diff --git a/include/linux/marvell_phy.h b/include/linux/marvell_phy.h index ec41025..8e9a029 100644 --- a/include/linux/marvell_phy.h +++ b/include/linux/marvell_phy.h @@ -15,6 +15,7 @@ #define MARVELL_PHY_ID_88E1240 0x01410e30 #define MARVELL_PHY_ID_88E1318S 0x01410e90 #define MARVELL_PHY_ID_88E1116R 0x01410e40 +#define MARVELL_PHY_ID_88E1510 0x01410dd0 /* struct phy_device dev_flags definitions */ #define MARVELL_PHY_M1145_FLAGS_RESISTANCE 0x00000001 -- 1.7.1