net: stmmac: visconti: reorganise visconti_eth_set_clk_tx_rate()

Rather than testing dwmac->phy_intf_sel several times for the same
values in this function, group the code together. The only part
which was common was stopping the internal clock before programming
the clock setting.

This further improves the readability of this function.

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Link: https://patch.msgid.link/E1uRH26-004UyM-9G@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
index ef86f9dce791e9348604e2106d32b85862a1194d..c2aaac4a5ac18570e0ba1bd6c176d0e9f6319d4a 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c
@@ -76,6 +76,22 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
                default:
                        return -EINVAL;
                }
+
+               /* Stop internal clock */
+               val = readl(dwmac->reg + REG_ETHER_CLOCK_SEL);
+               val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | ETHER_CLK_SEL_RX_TX_CLK_EN);
+               val |= ETHER_CLK_SEL_TX_O_E_N_IN;
+               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
+
+               /* Set Clock-Mux, Start clock, Set TX_O direction */
+               val = clk_sel_val | ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC;
+               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
+
+               val |= ETHER_CLK_SEL_RX_TX_CLK_EN;
+               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
+
+               val &= ~ETHER_CLK_SEL_TX_O_E_N_IN;
+               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
        } else if (dwmac->phy_intf_sel == ETHER_CONFIG_INTF_RMII) {
                switch (speed) {
                case SPEED_100:
@@ -89,27 +105,14 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
                default:
                        return -EINVAL;
                }
-       }
-
-       /* Stop internal clock */
-       val = readl(dwmac->reg + REG_ETHER_CLOCK_SEL);
-       val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | ETHER_CLK_SEL_RX_TX_CLK_EN);
-       val |= ETHER_CLK_SEL_TX_O_E_N_IN;
-       writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
 
-       /* Set Clock-Mux, Start clock, Set TX_O direction */
-       switch (dwmac->phy_intf_sel) {
-       case ETHER_CONFIG_INTF_RGMII:
-               val = clk_sel_val | ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC;
-               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
-
-               val |= ETHER_CLK_SEL_RX_TX_CLK_EN;
+               /* Stop internal clock */
+               val = readl(dwmac->reg + REG_ETHER_CLOCK_SEL);
+               val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | ETHER_CLK_SEL_RX_TX_CLK_EN);
+               val |= ETHER_CLK_SEL_TX_O_E_N_IN;
                writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
 
-               val &= ~ETHER_CLK_SEL_TX_O_E_N_IN;
-               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
-               break;
-       case ETHER_CONFIG_INTF_RMII:
+               /* Set Clock-Mux, Start clock, Set TX_O direction */
                val = clk_sel_val | ETHER_CLK_SEL_RX_CLK_EXT_SEL_DIV |
                        ETHER_CLK_SEL_TX_CLK_EXT_SEL_DIV | ETHER_CLK_SEL_TX_O_E_N_IN |
                        ETHER_CLK_SEL_RMII_CLK_SEL_RX_C;
@@ -120,16 +123,20 @@ static int visconti_eth_set_clk_tx_rate(void *bsp_priv, struct clk *clk_tx_i,
 
                val |= ETHER_CLK_SEL_RMII_CLK_EN | ETHER_CLK_SEL_RX_TX_CLK_EN;
                writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
-               break;
-       case ETHER_CONFIG_INTF_MII:
-       default:
+       } else {
+               /* Stop internal clock */
+               val = readl(dwmac->reg + REG_ETHER_CLOCK_SEL);
+               val &= ~(ETHER_CLK_SEL_RMII_CLK_EN | ETHER_CLK_SEL_RX_TX_CLK_EN);
+               val |= ETHER_CLK_SEL_TX_O_E_N_IN;
+               writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
+
+               /* Set Clock-Mux, Start clock, Set TX_O direction */
                val = clk_sel_val | ETHER_CLK_SEL_RX_CLK_EXT_SEL_RXC |
                        ETHER_CLK_SEL_TX_CLK_EXT_SEL_TXC | ETHER_CLK_SEL_TX_O_E_N_IN;
                writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
 
                val |= ETHER_CLK_SEL_RX_TX_CLK_EN;
                writel(val, dwmac->reg + REG_ETHER_CLOCK_SEL);
-               break;
        }
 
        return 0;