aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/phy
diff options
context:
space:
mode:
authorHector Palacios <hector.palacios@digi.com>2013-03-10 18:50:02 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-12 06:50:58 -0400
commitb818d1a7f72575eef17e00dc4085512c9cc8897d (patch)
tree4372297b8f38a89859c8a657bc69b08ef59d6cf2 /drivers/net/phy
parente5f2ef7ab4690d2e8faaf5fd203c5ecd70c3abaf (diff)
phy/micrel: Add support for KSZ8031
Micrel PHY KSZ8031 is similar to KSZ8021 and also requires the special initialization of "Operation Mode Strap Override" in reg 0x16 introduced in 212ea99 (phy/micrel: Implement support for KSZ8021). Signed-off-by: Hector Palacios <hector.palacios@digi.com> Reviewed-by: Marek Vasut <marex@denx.de> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/phy')
-rw-r--r--drivers/net/phy/micrel.c14
1 files changed, 14 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 },