net: dsa: qca8k: Enable delay for RGMII_ID mode
Subsystems (4)
PATCH v2 1/1 net: dsa: qca8k: Enable delay for RGMII_ID mode
RGMII_ID specifies that we should have internal delay, so resurrect the delay addition routine but under the RGMII_ID mode.
Fixes 40269aa9f40a ("net: dsa: qca8k: disable delay for RGMII mode")
Tested-by Michal Vokáč <[email protected]>
Signed-off-by Vinod Koul <[email protected]>
--- drivers/net/dsa/qca8k.c | 12 ++++++++++++ drivers/net/dsa/qca8k.h | 1 + 2 files changed, 13 insertions(+)
drivers/net/dsa/qca8k.c +12 -0
@@ -443,6 +443,18 @@ qca8k_set_pad_ctrl(struct qca8k_priv *priv, int port, int mode) val =QCA8K_PORT_PAD_RGMII_EN ;qca8k_write (priv, reg, val);break ; +case PHY_INTERFACE_MODE_RGMII_ID : +/* RGMII_ID needs internal delay. This is enabled through +* PORT5_PAD_CTRL for all ports, rather than individual port +* registers +*/ +qca8k_write (priv, reg, +QCA8K_PORT_PAD_RGMII_EN | +QCA8K_PORT_PAD_RGMII_TX_DELAY (QCA8K_MAX_DELAY ) | +QCA8K_PORT_PAD_RGMII_RX_DELAY (QCA8K_MAX_DELAY )); +qca8k_write (priv,QCA8K_REG_PORT5_PAD_CTRL , +QCA8K_PORT_PAD_RGMII_RX_DELAY_EN ); +break ;case PHY_INTERFACE_MODE_SGMII :qca8k_write (priv, reg,QCA8K_PORT_PAD_SGMII_EN );break ;
drivers/net/dsa/qca8k.h +1 -0
@@ -40,6 +40,7 @@ ((0x8 + (x & 0x3)) << 22)#define QCA8K_PORT_PAD_RGMII_RX_DELAY (x) \ ((0x10 + (x & 0x3)) << 20) +#define QCA8K_MAX_DELAY 3#define QCA8K_PORT_PAD_RGMII_RX_DELAY_EN BIT(24)#define QCA8K_PORT_PAD_SGMII_EN BIT(7)#define QCA8K_REG_MODULE_EN 0x030
Signature · 1 line
2.20.1
Quoted 6 lines · Vinod Koul
RGMII_IDspecifies that we should have internal delay, so resurrect the delay addition routine but under theRGMII_IDmode.Fixes 40269aa9f40a ("net: dsa: qca8k: disable delay for RGMII mode")Tested-by Michal Vokáč <[email protected]>Signed-off-by Vinod Koul <[email protected]>
Reviewed-by Andrew Lunn <[email protected]>
Andrew
From: Vinod Koul <[email protected]>
Date: Tue, 19 Feb 2019 12:29:43 +0530
Quoted 6 lines
RGMII_IDspecifies that we should have internal delay, so resurrect the delay addition routine but under theRGMII_IDmode.Fixes 40269aa9f40a ("net: dsa: qca8k: disable delay for RGMII mode")Tested-by Michal Vokáč <[email protected]>Signed-off-by Vinod Koul <[email protected]>
Applied, thanks.