Commit 2a7b6216 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mv88e6390-missing-phy-ID' 



Andrew Lunn says:

====================
Work around missing PHY prodcut ID in mv88e6390

The internal PHYs of the MV88E6390 have a Marvell OUI, but the product
ID is zero. Work around this by trapping reads to the ID, and if it is
zero, return the MV88E6390 family ID.

v2: Move the workaround into the central mdio read function.
    Enable the temperature sensor, even though it does not work on the 6390,
    but it does on the 6341, which has the same ID problem.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 1f3d6209 e4cf8a38

drivers/net/dsa/mv88e6xxx/chip.c

+8 −0
Original line number Diff line number Diff line
@@ -2930,6 +2930,14 @@ static int mv88e6xxx_mdio_read(struct mii_bus *bus, int phy, int reg) 
	err = chip->info->ops->phy_read(chip, bus, phy, reg, &val);

	mutex_unlock(&chip->reg_lock);



	if (reg == MII_PHYSID2) {

		/* Some internal PHYS don't have a model number.  Use

		 * the mv88e6390 family model number instead.

		 */

		if (!(val & 0x3f0))

			val |= PORT_SWITCH_ID_PROD_NUM_6390;

	}



	return err ? err : val;

}

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