Skip to content

Commit 9060073

Browse files
David Daneydavem330
authored andcommitted
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>
1 parent 27d916d commit 9060073

File tree

2 files changed

+41
-0
lines changed

2 files changed

+41
-0
lines changed

drivers/net/phy/marvell.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -433,6 +433,32 @@ static int m88e1118_config_init(struct phy_device *phydev)
433433
return 0;
434434
}
435435

436+
static int m88e1149_config_init(struct phy_device *phydev)
437+
{
438+
int err;
439+
440+
/* Change address */
441+
err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0002);
442+
if (err < 0)
443+
return err;
444+
445+
/* Enable 1000 Mbit */
446+
err = phy_write(phydev, 0x15, 0x1048);
447+
if (err < 0)
448+
return err;
449+
450+
/* Reset address */
451+
err = phy_write(phydev, MII_MARVELL_PHY_PAGE, 0x0);
452+
if (err < 0)
453+
return err;
454+
455+
err = phy_write(phydev, MII_BMCR, BMCR_RESET);
456+
if (err < 0)
457+
return err;
458+
459+
return 0;
460+
}
461+
436462
static int m88e1145_config_init(struct phy_device *phydev)
437463
{
438464
int err;
@@ -685,6 +711,19 @@ static struct phy_driver marvell_drivers[] = {
685711
.config_intr = &marvell_config_intr,
686712
.driver = { .owner = THIS_MODULE },
687713
},
714+
{
715+
.phy_id = MARVELL_PHY_ID_88E1149R,
716+
.phy_id_mask = MARVELL_PHY_ID_MASK,
717+
.name = "Marvell 88E1149R",
718+
.features = PHY_GBIT_FEATURES,
719+
.flags = PHY_HAS_INTERRUPT,
720+
.config_init = &m88e1149_config_init,
721+
.config_aneg = &m88e1118_config_aneg,
722+
.read_status = &genphy_read_status,
723+
.ack_interrupt = &marvell_ack_interrupt,
724+
.config_intr = &marvell_config_intr,
725+
.driver = { .owner = THIS_MODULE },
726+
},
688727
{
689728
.phy_id = MARVELL_PHY_ID_88E1240,
690729
.phy_id_mask = MARVELL_PHY_ID_MASK,
@@ -736,6 +775,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = {
736775
{ 0x01410e10, 0xfffffff0 },
737776
{ 0x01410cb0, 0xfffffff0 },
738777
{ 0x01410cd0, 0xfffffff0 },
778+
{ 0x01410e50, 0xfffffff0 },
739779
{ 0x01410e30, 0xfffffff0 },
740780
{ 0x01410e90, 0xfffffff0 },
741781
{ }

include/linux/marvell_phy.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#define MARVELL_PHY_ID_88E1118 0x01410e10
1212
#define MARVELL_PHY_ID_88E1121R 0x01410cb0
1313
#define MARVELL_PHY_ID_88E1145 0x01410cd0
14+
#define MARVELL_PHY_ID_88E1149R 0x01410e50
1415
#define MARVELL_PHY_ID_88E1240 0x01410e30
1516
#define MARVELL_PHY_ID_88E1318S 0x01410e90
1617

0 commit comments

Comments
 (0)