Message ID | 20200411192824.24229-1-paweldembicki@gmail.com |
---|---|
State | New |
Headers | show |
Series | [1/2] phy: mv88e61xx: add support for RGMII TX/RX delay | expand |
On Sat, Apr 11, 2020 at 09:28:24PM +0200, Pawel Dembicki wrote: > Clock delay in RGMII is required for some boards. > This patch introduce CONFIG_MV88E61XX_CPU_PORT_TX_DELAY and > CONFIG_MV88E61XX_CPU_PORT_RX_DELAY defines, which are setting > proper bits in PORT_REG_PHYS_CTRL register. > > Cc: Chris Packham <judge.packham at gmail.com> > Cc: Joe Hershberger <joe.hershberger at ni.com> > Cc: Anatolij Gustschin <agust at denx.de> > Cc: Tim Harvey <tharvey at gateworks.com> > Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com> > --- > drivers/net/phy/mv88e61xx.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c > index 5aff7ed397..889327639d 100644 > --- a/drivers/net/phy/mv88e61xx.c > +++ b/drivers/net/phy/mv88e61xx.c > @@ -94,6 +94,8 @@ > #define PORT_REG_STATUS_CMODE_1000BASE_X 0x9 > #define PORT_REG_STATUS_CMODE_SGMII 0xa > > +#define PORT_REG_PHYS_CTRL_RGMII_RX_DELAY BIT(15) > +#define PORT_REG_PHYS_CTRL_RGMII_TX_DELAY BIT(14) > #define PORT_REG_PHYS_CTRL_PCS_AN_EN BIT(10) > #define PORT_REG_PHYS_CTRL_PCS_AN_RST BIT(9) > #define PORT_REG_PHYS_CTRL_FC_VALUE BIT(7) > @@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port) > PORT_REG_PHYS_CTRL_SPD1000; > } > > - if (port == CONFIG_MV88E61XX_CPU_PORT) > + if (port == CONFIG_MV88E61XX_CPU_PORT) { > val |= PORT_REG_PHYS_CTRL_LINK_VALUE | > PORT_REG_PHYS_CTRL_LINK_FORCE; > +#if defined(CONFIG_MV88E61XX_CPU_PORT_RX_DELAY) > + val |= PORT_REG_PHYS_CTRL_RGMII_RX_DELAY; > +#endif > +#if defined(CONFIG_MV88E61XX_CPU_PORT_TX_DELAY) > + val |= PORT_REG_PHYS_CTRL_RGMII_TX_DELAY; > +#endif > + } > > return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL, > val); Two problems. First, you cannot add new CONFIG symbols that are not in Kconfig. Second, similar to Chris' comment in "net: mvgbe: add support for differ PHY addresses" this should likely come via the device tree I suspect. Thanks!
diff --git a/drivers/net/phy/mv88e61xx.c b/drivers/net/phy/mv88e61xx.c index 5aff7ed397..889327639d 100644 --- a/drivers/net/phy/mv88e61xx.c +++ b/drivers/net/phy/mv88e61xx.c @@ -94,6 +94,8 @@ #define PORT_REG_STATUS_CMODE_1000BASE_X 0x9 #define PORT_REG_STATUS_CMODE_SGMII 0xa +#define PORT_REG_PHYS_CTRL_RGMII_RX_DELAY BIT(15) +#define PORT_REG_PHYS_CTRL_RGMII_TX_DELAY BIT(14) #define PORT_REG_PHYS_CTRL_PCS_AN_EN BIT(10) #define PORT_REG_PHYS_CTRL_PCS_AN_RST BIT(9) #define PORT_REG_PHYS_CTRL_FC_VALUE BIT(7) @@ -747,9 +749,16 @@ static int mv88e61xx_fixed_port_setup(struct phy_device *phydev, u8 port) PORT_REG_PHYS_CTRL_SPD1000; } - if (port == CONFIG_MV88E61XX_CPU_PORT) + if (port == CONFIG_MV88E61XX_CPU_PORT) { val |= PORT_REG_PHYS_CTRL_LINK_VALUE | PORT_REG_PHYS_CTRL_LINK_FORCE; +#if defined(CONFIG_MV88E61XX_CPU_PORT_RX_DELAY) + val |= PORT_REG_PHYS_CTRL_RGMII_RX_DELAY; +#endif +#if defined(CONFIG_MV88E61XX_CPU_PORT_TX_DELAY) + val |= PORT_REG_PHYS_CTRL_RGMII_TX_DELAY; +#endif + } return mv88e61xx_port_write(phydev, port, PORT_REG_PHYS_CTRL, val);
Clock delay in RGMII is required for some boards. This patch introduce CONFIG_MV88E61XX_CPU_PORT_TX_DELAY and CONFIG_MV88E61XX_CPU_PORT_RX_DELAY defines, which are setting proper bits in PORT_REG_PHYS_CTRL register. Cc: Chris Packham <judge.packham at gmail.com> Cc: Joe Hershberger <joe.hershberger at ni.com> Cc: Anatolij Gustschin <agust at denx.de> Cc: Tim Harvey <tharvey at gateworks.com> Signed-off-by: Pawel Dembicki <paweldembicki at gmail.com> --- drivers/net/phy/mv88e61xx.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)