net: phy: micrel: use generic config_init for KSZ8021/KSZ8031
Use generic config_init callback also for KSZ8021 and KSZ8031.
This has been avoided this far due to commit b838b4aced
("phy/micrel:
KSZ8031RNL RMII clock reconfiguration bug"), which claims that the PHY
becomes unresponsive if the broadcast-disable flag is set before
configuring the clock mode.
Turns out that the problem seemingly worked-around by the above
mentioned commit was really due to a hardware-configuration issue, where
the PHY was in fact strapped to address 3 rather than 0.
Tested-by: Bruno Thomsen <bth@kamstrup.dk>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Родитель
2c26d34bbc
Коммит
d0e1df9cf4
|
@ -88,6 +88,7 @@ struct kszphy_priv {
|
|||
|
||||
static const struct kszphy_type ksz8021_type = {
|
||||
.led_mode_reg = MII_KSZPHY_CTRL_2,
|
||||
.has_broadcast_disable = true,
|
||||
.has_rmii_ref_clk_sel = true,
|
||||
};
|
||||
|
||||
|
@ -258,19 +259,6 @@ static int kszphy_config_init(struct phy_device *phydev)
|
|||
return 0;
|
||||
}
|
||||
|
||||
static int ksz8021_config_init(struct phy_device *phydev)
|
||||
{
|
||||
int rc;
|
||||
|
||||
rc = kszphy_config_init(phydev);
|
||||
if (rc)
|
||||
return rc;
|
||||
|
||||
rc = kszphy_broadcast_disable(phydev);
|
||||
|
||||
return rc < 0 ? rc : 0;
|
||||
}
|
||||
|
||||
static int ksz9021_load_values_from_of(struct phy_device *phydev,
|
||||
struct device_node *of_node, u16 reg,
|
||||
char *field1, char *field2,
|
||||
|
@ -584,7 +572,7 @@ static struct phy_driver ksphy_driver[] = {
|
|||
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
|
||||
.driver_data = &ksz8021_type,
|
||||
.probe = kszphy_probe,
|
||||
.config_init = ksz8021_config_init,
|
||||
.config_init = kszphy_config_init,
|
||||
.config_aneg = genphy_config_aneg,
|
||||
.read_status = genphy_read_status,
|
||||
.ack_interrupt = kszphy_ack_interrupt,
|
||||
|
@ -601,7 +589,7 @@ static struct phy_driver ksphy_driver[] = {
|
|||
.flags = PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
|
||||
.driver_data = &ksz8021_type,
|
||||
.probe = kszphy_probe,
|
||||
.config_init = ksz8021_config_init,
|
||||
.config_init = kszphy_config_init,
|
||||
.config_aneg = genphy_config_aneg,
|
||||
.read_status = genphy_read_status,
|
||||
.ack_interrupt = kszphy_ack_interrupt,
|
||||
|
|
Загрузка…
Ссылка в новой задаче