aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/net/phy/micrel.c14
-rw-r--r--include/linux/micrel_phy.h1
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index abf7b6153d00..018af1852fe1 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -192,6 +192,19 @@ static struct phy_driver ksphy_driver[] = {
192 .config_intr = kszphy_config_intr, 192 .config_intr = kszphy_config_intr,
193 .driver = { .owner = THIS_MODULE,}, 193 .driver = { .owner = THIS_MODULE,},
194}, { 194}, {
195 .phy_id = PHY_ID_KSZ8031,
196 .phy_id_mask = 0x00ffffff,
197 .name = "Micrel KSZ8031",
198 .features = (PHY_BASIC_FEATURES | SUPPORTED_Pause |
199 SUPPORTED_Asym_Pause),
200 .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
201 .config_init = ksz8021_config_init,
202 .config_aneg = genphy_config_aneg,
203 .read_status = genphy_read_status,
204 .ack_interrupt = kszphy_ack_interrupt,
205 .config_intr = kszphy_config_intr,
206 .driver = { .owner = THIS_MODULE,},
207}, {
195 .phy_id = PHY_ID_KSZ8041, 208 .phy_id = PHY_ID_KSZ8041,
196 .phy_id_mask = 0x00fffff0, 209 .phy_id_mask = 0x00fffff0,
197 .name = "Micrel KSZ8041", 210 .name = "Micrel KSZ8041",
@@ -325,6 +338,7 @@ static struct mdio_device_id __maybe_unused micrel_tbl[] = {
325 { PHY_ID_KSZ8001, 0x00ffffff }, 338 { PHY_ID_KSZ8001, 0x00ffffff },
326 { PHY_ID_KS8737, 0x00fffff0 }, 339 { PHY_ID_KS8737, 0x00fffff0 },
327 { PHY_ID_KSZ8021, 0x00ffffff }, 340 { PHY_ID_KSZ8021, 0x00ffffff },
341 { PHY_ID_KSZ8031, 0x00ffffff },
328 { PHY_ID_KSZ8041, 0x00fffff0 }, 342 { PHY_ID_KSZ8041, 0x00fffff0 },
329 { PHY_ID_KSZ8051, 0x00fffff0 }, 343 { PHY_ID_KSZ8051, 0x00fffff0 },
330 { PHY_ID_KSZ8061, 0x00fffff0 }, 344 { PHY_ID_KSZ8061, 0x00fffff0 },
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index 9dbb41a4e250..8752dbbc6135 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -19,6 +19,7 @@
19#define PHY_ID_KSZ9021 0x00221610 19#define PHY_ID_KSZ9021 0x00221610
20#define PHY_ID_KS8737 0x00221720 20#define PHY_ID_KS8737 0x00221720
21#define PHY_ID_KSZ8021 0x00221555 21#define PHY_ID_KSZ8021 0x00221555
22#define PHY_ID_KSZ8031 0x00221556
22#define PHY_ID_KSZ8041 0x00221510 23#define PHY_ID_KSZ8041 0x00221510
23#define PHY_ID_KSZ8051 0x00221550 24#define PHY_ID_KSZ8051 0x00221550
24/* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */ 25/* same id: ks8001 Rev. A/B, and ks8721 Rev 3. */