Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48d7d0ad authored by Jason Wang's avatar Jason Wang Committed by David S. Miller
Browse files

phy/micrel: change phy_id_mask for KSZ9021 and KS8001 



On a freescale imx6q platform, a hardware phy chip KSZ9021 is
recognized as a KS8001 chip by the current driver like this:
eth0: Freescale FEC PHY driver [Micrel KS8001 or KS8721]

KSZ9021 has phy_id 0x00221610, while KSZ8001 has phy_id
0x0022161a, the current phy_id_mask (0x00fffff0/0x00ffff10) can't
distinguish them. So change phy_id_mask to resolve this problem.

Although the micrel datasheet says that the 4 LSB of phyid2 register
contains the chip revision number and the current driver is designed
to follow this rule, in reality the chip implementation doesn't follow
it.

Cc: David J. Choi <david.choi@micrel.com>
Cc: David S. Miller <davem@davemloft.net>
Cc: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: default avatarHui Wang <jason77.wang@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39d84a58

drivers/net/phy/micrel.c

+4 −4
Original line number Diff line number Diff line
@@ -161,7 +161,7 @@ static struct phy_driver ks8051_driver = { 
static struct phy_driver ks8001_driver = {

	.phy_id		= PHY_ID_KS8001,

	.name		= "Micrel KS8001 or KS8721",

	.phy_id_mask	= 0x00fffff0,

	.phy_id_mask	= 0x00ffffff,

	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause),

	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,

	.config_init	= kszphy_config_init,
@@ -174,7 +174,7 @@ static struct phy_driver ks8001_driver = { 


static struct phy_driver ksz9021_driver = {

	.phy_id		= PHY_ID_KSZ9021,

	.phy_id_mask	= 0x000fff10,

	.phy_id_mask	= 0x000ffffe,

	.name		= "Micrel KSZ9021 Gigabit PHY",

	.features	= (PHY_GBIT_FEATURES | SUPPORTED_Pause

				| SUPPORTED_Asym_Pause),
@@ -240,8 +240,8 @@ MODULE_AUTHOR("David J. Choi"); 
MODULE_LICENSE("GPL");



static struct mdio_device_id __maybe_unused micrel_tbl[] = {

	{ PHY_ID_KSZ9021, 0x000fff10 },

	{ PHY_ID_KS8001, 0x00fffff0 },

	{ PHY_ID_KSZ9021, 0x000ffffe },

	{ PHY_ID_KS8001, 0x00ffffff },

	{ PHY_ID_KS8737, 0x00fffff0 },

	{ PHY_ID_KS8041, 0x00fffff0 },

	{ PHY_ID_KS8051, 0x00fffff0 },