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

Configure Feed

Select the types of activity you want to include in your feed.

net: stmmac: thead: convert to use phy_interface

dwmac-thead supports either MII or RGMII interface modes only.

None of the DTS files set "mac-mode", so mac_interface will be
identical to phy_interface.

Convert dwmac-thead to use phy_interface when determining the
interface mode rather than mac_interface.

Also convert the error prints to use phy_modes() so that we get a
meaningful string rather than a number for the interface mode.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1uytpq-00000006H2q-0ajY@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

authored by

Russell King (Oracle) and committed by
Jakub Kicinski 3a94ecdf 0fe080fa

+12 -12
+12 -12
drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
··· 56 56 struct thead_dwmac *dwmac = plat->bsp_priv; 57 57 u32 phyif; 58 58 59 - switch (plat->mac_interface) { 59 + switch (plat->phy_interface) { 60 60 case PHY_INTERFACE_MODE_MII: 61 61 phyif = PHY_INTF_MII_GMII; 62 62 break; ··· 67 67 phyif = PHY_INTF_RGMII; 68 68 break; 69 69 default: 70 - dev_err(dwmac->dev, "unsupported phy interface %d\n", 71 - plat->mac_interface); 70 + dev_err(dwmac->dev, "unsupported phy interface %s\n", 71 + phy_modes(plat->phy_interface)); 72 72 return -EINVAL; 73 73 } 74 74 ··· 81 81 struct thead_dwmac *dwmac = plat->bsp_priv; 82 82 u32 txclk_dir; 83 83 84 - switch (plat->mac_interface) { 84 + switch (plat->phy_interface) { 85 85 case PHY_INTERFACE_MODE_MII: 86 86 txclk_dir = TXCLK_DIR_INPUT; 87 87 break; ··· 92 92 txclk_dir = TXCLK_DIR_OUTPUT; 93 93 break; 94 94 default: 95 - dev_err(dwmac->dev, "unsupported phy interface %d\n", 96 - plat->mac_interface); 95 + dev_err(dwmac->dev, "unsupported phy interface %s\n", 96 + phy_modes(plat->phy_interface)); 97 97 return -EINVAL; 98 98 } 99 99 ··· 112 112 113 113 plat = dwmac->plat; 114 114 115 - switch (plat->mac_interface) { 115 + switch (plat->phy_interface) { 116 116 /* For MII, rxc/txc is provided by phy */ 117 117 case PHY_INTERFACE_MODE_MII: 118 118 return 0; ··· 143 143 return 0; 144 144 145 145 default: 146 - dev_err(dwmac->dev, "unsupported phy interface %d\n", 147 - plat->mac_interface); 146 + dev_err(dwmac->dev, "unsupported phy interface %s\n", 147 + phy_modes(plat->phy_interface)); 148 148 return -EINVAL; 149 149 } 150 150 } ··· 154 154 struct thead_dwmac *dwmac = plat->bsp_priv; 155 155 u32 reg, div; 156 156 157 - switch (plat->mac_interface) { 157 + switch (plat->phy_interface) { 158 158 case PHY_INTERFACE_MODE_MII: 159 159 reg = GMAC_RX_CLK_EN | GMAC_TX_CLK_EN; 160 160 break; ··· 177 177 break; 178 178 179 179 default: 180 - dev_err(dwmac->dev, "unsupported phy interface %d\n", 181 - plat->mac_interface); 180 + dev_err(dwmac->dev, "unsupported phy interface %s\n", 181 + phy_modes(plat->phy_interface)); 182 182 return -EINVAL; 183 183 } 184 184