Commit e4cf8a38 authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: Marvell: Add mv88e6390 internal PHY 



The mv88e6390 Ethernet switch has internal PHYs. These PHYs don't have
an model ID in the ID2 register. So the MDIO driver in the switch
intercepts reads to this register, and returns the switch family ID.
Extend the Marvell PHY driver by including this ID, and treat the PHY
as a 88E1540.

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da9f3301

drivers/net/phy/marvell.c

+20 −0
Original line number Diff line number Diff line
@@ -2142,6 +2142,25 @@ static struct phy_driver marvell_drivers[] = { 
		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

	},

	{

		.phy_id = MARVELL_PHY_ID_88E6390,

		.phy_id_mask = MARVELL_PHY_ID_MASK,

		.name = "Marvell 88E6390",

		.features = PHY_GBIT_FEATURES,

		.flags = PHY_HAS_INTERRUPT,

		.probe = m88e1510_probe,

		.config_init = &marvell_config_init,

		.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,

		.resume = &genphy_resume,

		.suspend = &genphy_suspend,

		.get_sset_count = marvell_get_sset_count,

		.get_strings = marvell_get_strings,

		.get_stats = marvell_get_stats,

	},

};



module_phy_driver(marvell_drivers);
@@ -2160,6 +2179,7 @@ static struct mdio_device_id __maybe_unused marvell_tbl[] = { 
	{ MARVELL_PHY_ID_88E1510, MARVELL_PHY_ID_MASK },

	{ MARVELL_PHY_ID_88E1540, MARVELL_PHY_ID_MASK },

	{ MARVELL_PHY_ID_88E3016, MARVELL_PHY_ID_MASK },

	{ MARVELL_PHY_ID_88E6390, MARVELL_PHY_ID_MASK },

	{ }

};

include/linux/marvell_phy.h

+6 −0
Original line number Diff line number Diff line
@@ -19,6 +19,12 @@ 
#define MARVELL_PHY_ID_88E1540		0x01410eb0

#define MARVELL_PHY_ID_88E3016		0x01410e60



/* The MV88e6390 Ethernet switch contains embedded PHYs. These PHYs do

 * not have a model ID. So the switch driver traps reads to the ID2

 * register and returns the switch family ID

 */

#define MARVELL_PHY_ID_88E6390		0x01410f90



/* struct phy_device dev_flags definitions */

#define MARVELL_PHY_M1145_FLAGS_RESISTANCE	0x00000001

#define MARVELL_PHY_M1118_DNS323_LEDS		0x00000002

CRA Git | Maintained and supported by SUSTech CRA and CCSE