Commit 27708eb5 authored by Trent Piepho's avatar Trent Piepho Committed by David S. Miller

net: phy: dp83867: IO impedance is not dependent on RGMII delay

The driver would only set the IO impedance value when RGMII internal
delays were enabled.  There is no reason for this.  Move the IO
impedance block out of the RGMII delay block.

Cc: Andrew Lunn <andrew@lunn.ch>
Cc: Florian Fainelli <f.fainelli@gmail.com>
Cc: Heiner Kallweit <hkallweit1@gmail.com>
Signed-off-by: default avatarTrent Piepho <tpiepho@impinj.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1b9b2954
...@@ -75,8 +75,7 @@ ...@@ -75,8 +75,7 @@
#define DP83867_RGMII_RX_CLK_DELAY_SHIFT 0 #define DP83867_RGMII_RX_CLK_DELAY_SHIFT 0
/* IO_MUX_CFG bits */ /* IO_MUX_CFG bits */
#define DP83867_IO_MUX_CFG_IO_IMPEDANCE_CTRL 0x1f #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MASK 0x1f
#define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX 0x0 #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX 0x0
#define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN 0x1f #define DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN 0x1f
#define DP83867_IO_MUX_CFG_CLK_O_DISABLE BIT(6) #define DP83867_IO_MUX_CFG_CLK_O_DISABLE BIT(6)
...@@ -162,8 +161,6 @@ static int dp83867_of_init(struct phy_device *phydev) ...@@ -162,8 +161,6 @@ static int dp83867_of_init(struct phy_device *phydev)
if (!of_node) if (!of_node)
return -ENODEV; return -ENODEV;
dp83867->io_impedance = -EINVAL;
/* Optional configuration */ /* Optional configuration */
ret = of_property_read_u32(of_node, "ti,clk-output-sel", ret = of_property_read_u32(of_node, "ti,clk-output-sel",
&dp83867->clk_output_sel); &dp83867->clk_output_sel);
...@@ -185,6 +182,8 @@ static int dp83867_of_init(struct phy_device *phydev) ...@@ -185,6 +182,8 @@ static int dp83867_of_init(struct phy_device *phydev)
dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX; dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MAX;
else if (of_property_read_bool(of_node, "ti,min-output-impedance")) else if (of_property_read_bool(of_node, "ti,min-output-impedance"))
dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN; dp83867->io_impedance = DP83867_IO_MUX_CFG_IO_IMPEDANCE_MIN;
else
dp83867->io_impedance = -1; /* leave at default */
dp83867->rxctrl_strap_quirk = of_property_read_bool(of_node, dp83867->rxctrl_strap_quirk = of_property_read_bool(of_node,
"ti,dp83867-rxctrl-strap-quirk"); "ti,dp83867-rxctrl-strap-quirk");
...@@ -333,14 +332,14 @@ static int dp83867_config_init(struct phy_device *phydev) ...@@ -333,14 +332,14 @@ static int dp83867_config_init(struct phy_device *phydev)
phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RGMIIDCTL, phy_write_mmd(phydev, DP83867_DEVADDR, DP83867_RGMIIDCTL,
delay); delay);
if (dp83867->io_impedance >= 0)
phy_modify_mmd(phydev, DP83867_DEVADDR, DP83867_IO_MUX_CFG,
DP83867_IO_MUX_CFG_IO_IMPEDANCE_CTRL,
dp83867->io_impedance &
DP83867_IO_MUX_CFG_IO_IMPEDANCE_CTRL);
} }
/* If specified, set io impedance */
if (dp83867->io_impedance >= 0)
phy_modify_mmd(phydev, DP83867_DEVADDR, DP83867_IO_MUX_CFG,
DP83867_IO_MUX_CFG_IO_IMPEDANCE_MASK,
dp83867->io_impedance);
/* Enable Interrupt output INT_OE in CFG3 register */ /* Enable Interrupt output INT_OE in CFG3 register */
if (phy_interrupt_is_valid(phydev)) { if (phy_interrupt_is_valid(phydev)) {
val = phy_read(phydev, DP83867_CFG3); val = phy_read(phydev, DP83867_CFG3);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment