diff options
Diffstat (limited to 'drivers/net/phy/micrel.c')
-rw-r--r-- | drivers/net/phy/micrel.c | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index c530de1e63f5..3ad8ca76196d 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c | |||
@@ -88,6 +88,7 @@ struct kszphy_priv { | |||
88 | 88 | ||
89 | static const struct kszphy_type ksz8021_type = { | 89 | static const struct kszphy_type ksz8021_type = { |
90 | .led_mode_reg = MII_KSZPHY_CTRL_2, | 90 | .led_mode_reg = MII_KSZPHY_CTRL_2, |
91 | .has_broadcast_disable = true, | ||
91 | .has_rmii_ref_clk_sel = true, | 92 | .has_rmii_ref_clk_sel = true, |
92 | }; | 93 | }; |
93 | 94 | ||
@@ -258,19 +259,6 @@ static int kszphy_config_init(struct phy_device *phydev) | |||
258 | return 0; | 259 | return 0; |
259 | } | 260 | } |
260 | 261 | ||
261 | static int ksz8021_config_init(struct phy_device *phydev) | ||
262 | { | ||
263 | int rc; | ||
264 | |||
265 | rc = kszphy_config_init(phydev); | ||
266 | if (rc) | ||
267 | return rc; | ||
268 | |||
269 | rc = kszphy_broadcast_disable(phydev); | ||
270 | |||
271 | return rc < 0 ? rc : 0; | ||
272 | } | ||
273 | |||
274 | static int ksz9021_load_values_from_of(struct phy_device *phydev, | 262 | static int ksz9021_load_values_from_of(struct phy_device *phydev, |
275 | struct device_node *of_node, u16 reg, | 263 | struct device_node *of_node, u16 reg, |
276 | char *field1, char *field2, | 264 | char *field1, char *field2, |
@@ -584,7 +572,7 @@ static struct phy_driver ksphy_driver[] = { | |||
584 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, | 572 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, |
585 | .driver_data = &ksz8021_type, | 573 | .driver_data = &ksz8021_type, |
586 | .probe = kszphy_probe, | 574 | .probe = kszphy_probe, |
587 | .config_init = ksz8021_config_init, | 575 | .config_init = kszphy_config_init, |
588 | .config_aneg = genphy_config_aneg, | 576 | .config_aneg = genphy_config_aneg, |
589 | .read_status = genphy_read_status, | 577 | .read_status = genphy_read_status, |
590 | .ack_interrupt = kszphy_ack_interrupt, | 578 | .ack_interrupt = kszphy_ack_interrupt, |
@@ -601,7 +589,7 @@ static struct phy_driver ksphy_driver[] = { | |||
601 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, | 589 | .flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT, |
602 | .driver_data = &ksz8021_type, | 590 | .driver_data = &ksz8021_type, |
603 | .probe = kszphy_probe, | 591 | .probe = kszphy_probe, |
604 | .config_init = ksz8021_config_init, | 592 | .config_init = kszphy_config_init, |
605 | .config_aneg = genphy_config_aneg, | 593 | .config_aneg = genphy_config_aneg, |
606 | .read_status = genphy_read_status, | 594 | .read_status = genphy_read_status, |
607 | .ack_interrupt = kszphy_ack_interrupt, | 595 | .ack_interrupt = kszphy_ack_interrupt, |