phylib: Add support for Marvell 88E1149R devices.
The 88E1149R is 10/100/1000 quad-gigabit Ethernet PHY. The .config_aneg function can be shared with 88E1118, but it needs its own .config_init. Signed-off-by: David Daney <ddaney@caviumnetworks.com> Cc: Cyril Chemparathy <cyril@ti.com> Cc: Arnaud Patard <arnaud.patard@rtp-net.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
27d916d680
commit
90600732d8
|
@ -433,6 +433,32 @@ static int m88e1118_config_init(struct phy_device *phydev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static int m88e1149_config_init(struct phy_device *phydev)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
/* Change address */
|
||||||
|
err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0002);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
/* Enable 1000 Mbit */
|
||||||
|
err = phy_write(phydev, 0x15, 0x1048);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
/* Reset address */
|
||||||
|
err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
err = phy_write(phydev, MII_BMCR, BMCR_RESET);
|
||||||
|
if (err < 0)
|
||||||
|
return err;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
static int m88e1145_config_init(struct phy_device *phydev)
|
static int m88e1145_config_init(struct phy_device *phydev)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
|
@ -685,6 +711,19 @@ static struct phy_driver marvell_drivers[] = {
|
||||||
.config_intr = &marvell_config_intr,
|
.config_intr = &marvell_config_intr,
|
||||||
.driver = { .owner = THIS_MODULE },
|
.driver = { .owner = THIS_MODULE },
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
.phy_id = MARVELL_PHY_ID_88E1149R,
|
||||||
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
||||||
|
.name = "Marvell 88E1149R",
|
||||||
|
.features = PHY_GBIT_FEATURES,
|
||||||
|
.flags = PHY_HAS_INTERRUPT,
|
||||||
|
.config_init = &m88e1149_config_init,
|
||||||
|
.config_aneg = &m88e1118_config_aneg,
|
||||||
|
.read_status = &genphy_read_status,
|
||||||
|
.ack_interrupt = &marvell_ack_interrupt,
|
||||||
|
.config_intr = &marvell_config_intr,
|
||||||
|
.driver = { .owner = THIS_MODULE },
|
||||||
|
},
|
||||||
{
|
{
|
||||||
.phy_id = MARVELL_PHY_ID_88E1240,
|
.phy_id = MARVELL_PHY_ID_88E1240,
|
||||||
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
.phy_id_mask = MARVELL_PHY_ID_MASK,
|
||||||
|
@ -736,6 +775,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = {
|
||||||
{ 0x01410e10, 0xfffffff0 },
|
{ 0x01410e10, 0xfffffff0 },
|
||||||
{ 0x01410cb0, 0xfffffff0 },
|
{ 0x01410cb0, 0xfffffff0 },
|
||||||
{ 0x01410cd0, 0xfffffff0 },
|
{ 0x01410cd0, 0xfffffff0 },
|
||||||
|
{ 0x01410e50, 0xfffffff0 },
|
||||||
{ 0x01410e30, 0xfffffff0 },
|
{ 0x01410e30, 0xfffffff0 },
|
||||||
{ 0x01410e90, 0xfffffff0 },
|
{ 0x01410e90, 0xfffffff0 },
|
||||||
{ }
|
{ }
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
#define MARVELL_PHY_ID_88E1118 0x01410e10
|
#define MARVELL_PHY_ID_88E1118 0x01410e10
|
||||||
#define MARVELL_PHY_ID_88E1121R 0x01410cb0
|
#define MARVELL_PHY_ID_88E1121R 0x01410cb0
|
||||||
#define MARVELL_PHY_ID_88E1145 0x01410cd0
|
#define MARVELL_PHY_ID_88E1145 0x01410cd0
|
||||||
|
#define MARVELL_PHY_ID_88E1149R 0x01410e50
|
||||||
#define MARVELL_PHY_ID_88E1240 0x01410e30
|
#define MARVELL_PHY_ID_88E1240 0x01410e30
|
||||||
#define MARVELL_PHY_ID_88E1318S 0x01410e90
|
#define MARVELL_PHY_ID_88E1318S 0x01410e90
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue