diff options
| author | David S. Miller <davem@davemloft.net> | 2019-03-02 23:54:35 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2019-03-02 23:54:35 +0300 |
| commit | 9eb359140cd307f8a14f61c19b155ffca5291057 (patch) | |
| tree | 22d5143608ef1744ca4b7025414777defe8bcca5 /drivers/net/phy/micrel.c | |
| parent | cf29576fee6016fa7004262cb98f57a2269178f1 (diff) | |
| parent | 07f12b26e21ab359261bf75cfcb424fdc7daeb6d (diff) | |
| download | linux-9eb359140cd307f8a14f61c19b155ffca5291057.tar.xz | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Diffstat (limited to 'drivers/net/phy/micrel.c')
| -rw-r--r-- | drivers/net/phy/micrel.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 38d5bd877346..352da24f1f33 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -340,6 +340,17 @@ static int ksz8041_config_aneg(struct phy_device *phydev) return genphy_config_aneg(phydev); } +static int ksz8061_config_init(struct phy_device *phydev) +{ + int ret; + + ret = phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_DEVID1, 0xB61A); + if (ret) + return ret; + + return kszphy_config_init(phydev); +} + static int ksz9021_load_values_from_of(struct phy_device *phydev, const struct device_node *of_node, u16 reg, @@ -1015,7 +1026,7 @@ static struct phy_driver ksphy_driver[] = { .name = "Micrel KSZ8061", .phy_id_mask = MICREL_PHY_ID_MASK, .features = PHY_BASIC_FEATURES, - .config_init = kszphy_config_init, + .config_init = ksz8061_config_init, .ack_interrupt = kszphy_ack_interrupt, .config_intr = kszphy_config_intr, .suspend = genphy_suspend, |