Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: dsa: mv88e6xxx: Add RGMII delay to 88E6320

Currently, the .port_set_rgmii_delay hook is missing for the 88E6320
family, which causes failure to retrieve an IP address via DHCP.

Add mv88e6320_port_set_rgmii_delay() that allows applying the RGMII
delay for ports 2, 5, and 6, which are the only ports that can be used
in RGMII mode.

Tested on a custom i.MX8MN board connected to an 88E6320 switch.

This change also applies safely to the 88E6321 variant.

The only difference between 88E6320 versus 88E6321 is the temperature
grade and pinout.

They share exactly the same MDIO register map for ports 2, 5, and 6,
which are the only ports that can be used in RGMII mode.

Signed-off-by: Steffen Bätz <steffen@innosonix.de>
[fabio: Improved commit log and extended it to mv88e6321_ops]
Signed-off-by: Fabio Estevam <festevam@denx.de>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lore.kernel.org/r/20221028163158.198108-1-festevam@gmail.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Steffen Bätz and committed by
Jakub Kicinski
91e87045 eff1744e

+13
+2
drivers/net/dsa/mv88e6xxx/chip.c
··· 5029 5029 .phy_write = mv88e6xxx_g2_smi_phy_write, 5030 5030 .port_set_link = mv88e6xxx_port_set_link, 5031 5031 .port_sync_link = mv88e6xxx_port_sync_link, 5032 + .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, 5032 5033 .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, 5033 5034 .port_tag_remap = mv88e6095_port_tag_remap, 5034 5035 .port_set_frame_mode = mv88e6351_port_set_frame_mode, ··· 5074 5073 .phy_write = mv88e6xxx_g2_smi_phy_write, 5075 5074 .port_set_link = mv88e6xxx_port_set_link, 5076 5075 .port_sync_link = mv88e6xxx_port_sync_link, 5076 + .port_set_rgmii_delay = mv88e6320_port_set_rgmii_delay, 5077 5077 .port_set_speed_duplex = mv88e6185_port_set_speed_duplex, 5078 5078 .port_tag_remap = mv88e6095_port_tag_remap, 5079 5079 .port_set_frame_mode = mv88e6351_port_set_frame_mode,
+9
drivers/net/dsa/mv88e6xxx/port.c
··· 133 133 return mv88e6xxx_port_set_rgmii_delay(chip, port, mode); 134 134 } 135 135 136 + int mv88e6320_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port, 137 + phy_interface_t mode) 138 + { 139 + if (port != 2 && port != 5 && port != 6) 140 + return -EOPNOTSUPP; 141 + 142 + return mv88e6xxx_port_set_rgmii_delay(chip, port, mode); 143 + } 144 + 136 145 int mv88e6xxx_port_set_link(struct mv88e6xxx_chip *chip, int port, int link) 137 146 { 138 147 u16 reg;
+2
drivers/net/dsa/mv88e6xxx/port.h
··· 332 332 333 333 int mv88e6185_port_set_pause(struct mv88e6xxx_chip *chip, int port, 334 334 int pause); 335 + int mv88e6320_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port, 336 + phy_interface_t mode); 335 337 int mv88e6352_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port, 336 338 phy_interface_t mode); 337 339 int mv88e6390_port_set_rgmii_delay(struct mv88e6xxx_chip *chip, int port,