diff options
| author | Philippe Schenker <philippe.schenker@toradex.com> | 2020-03-30 10:02:36 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2020-03-30 10:37:36 +0000 |
| commit | 0f003d0869ace8392a804379f94ca83f252ff542 (patch) | |
| tree | 2fd7f5a88289824a5ad5e8a2b7c42e494e188b28 /drivers | |
| parent | fdcb9ec95d414998942c0b938fb4c046eeecf44d (diff) | |
Revert "net: phy: micrel: Add KSZ9131 rxdll txdll bypass dt properties"
This reverts commit f49da0d7dbf67030f7e12a94fd18a7f1a0b845e0.
There is now a mainline solution for that. Drop this solution in favor
of the upstream one. We will use "rgmii-id" tag now to declare that
delays.
Related-to: ELB-2581
Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/phy/micrel.c | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c index 4ab203e2c4ce..9c21508332dc 100644 --- a/drivers/net/phy/micrel.c +++ b/drivers/net/phy/micrel.c @@ -646,42 +646,6 @@ static int ksz9131_of_load_skew_values(struct phy_device *phydev, return ksz9031_extended_write(phydev, OP_DATA, 2, reg, newval); } -#define KSZ9131_RX_DLL_CTRL 0x4c -#define KSZ9131_TX_DLL_CTRL 0x4d -#define KSZ9131_DLL_CTRL_BYPASS BIT(12) - -static int ksz9131_of_load_dll_skew(struct phy_device *phydev, - struct device_node *of_node) -{ - int ret; - u16 tmp; - u32 val; - - if (!of_property_read_u32(of_node, "rxc-dll-2ns", &val)) { - tmp = phy_read_mmd(phydev, 2, KSZ9131_RX_DLL_CTRL); - if (val == 0) - tmp |= KSZ9131_DLL_CTRL_BYPASS; - if (val == 1) - tmp &= ~KSZ9131_DLL_CTRL_BYPASS; - ret = phy_write_mmd(phydev, 2, KSZ9131_RX_DLL_CTRL, tmp); - if (ret < 0) - return ret; - } - - if (!of_property_read_u32(of_node, "txc-dll-2ns", &val)) { - tmp = phy_read_mmd(phydev, 2, KSZ9131_TX_DLL_CTRL); - if (val == 0) - tmp |= KSZ9131_DLL_CTRL_BYPASS; - if (val == 1) - tmp &= ~KSZ9131_DLL_CTRL_BYPASS; - ret = phy_write_mmd(phydev, 2, KSZ9131_TX_DLL_CTRL, tmp); - if (ret < 0) - return ret; - } - - return 0; -} - static int ksz9131_config_init(struct phy_device *phydev) { const struct device *dev = &phydev->mdio.dev; @@ -708,8 +672,6 @@ static int ksz9131_config_init(struct phy_device *phydev) if (!of_node) return 0; - ksz9131_of_load_dll_skew(phydev, of_node); - ret = ksz9131_of_load_skew_values(phydev, of_node, MII_KSZ9031RN_CLK_PAD_SKEW, 5, clk_skews, 2); |