net: stmmac: rk: use rk_encode_wm16() for RMII clock

The RMII clock is a single bit, which is set for 100M and clear for
10M. Move this out of struct rk_reg_speed_data (which gets rid of
this structure) into the struct rk_clock_fields as the bitmask for
this bit.

This gets rid of the per-SoC variability in the calls to
rk_set_reg_speed().

Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1vmqnH-00000007VCz-1WmP@rmk-PC.armlinux.org.uk
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
index d5846838c364bcdc7bae095edfea2a4d65d7f54f..9c845562c79fe80f436523b98f2fa0364164a91d 100644 (file)
--- a/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
+++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c
@@ -28,14 +28,10 @@ struct rk_priv_data;
 
 struct rk_clock_fields {
        u16 gmii_clk_sel_mask;
+       u16 rmii_clk_sel_mask;
        u16 mac_speed_mask;
 };
 
-struct rk_reg_speed_data {
-       unsigned int rmii_10;
-       unsigned int rmii_100;
-};
-
 struct rk_gmac_ops {
        int (*init)(struct rk_priv_data *bsp_priv);
        void (*set_to_rgmii)(struct rk_priv_data *bsp_priv,
@@ -172,7 +168,6 @@ static int rk_write_clock_grf_reg(struct rk_priv_data *bsp_priv, u32 val)
 }
 
 static int rk_set_reg_speed(struct rk_priv_data *bsp_priv,
-                           const struct rk_reg_speed_data *rsd,
                            phy_interface_t interface, int speed)
 {
        unsigned int val;
@@ -186,17 +181,9 @@ static int rk_set_reg_speed(struct rk_priv_data *bsp_priv,
                val = rk_encode_wm16(ret, bsp_priv->clock.gmii_clk_sel_mask);
        } else if (interface == PHY_INTERFACE_MODE_RMII) {
                val = rk_encode_wm16(speed == SPEED_100,
-                                    bsp_priv->clock.mac_speed_mask);
-               if (speed == SPEED_10) {
-                       val |= rsd->rmii_10;
-               } else if (speed == SPEED_100) {
-                       val |= rsd->rmii_100;
-               } else {
-                       /* Phylink will not allow inappropriate speeds for
-                        * interface modes, so this should never happen.
-                        */
-                       return -EINVAL;
-               }
+                                    bsp_priv->clock.mac_speed_mask) |
+                     rk_encode_wm16(speed == SPEED_100,
+                                    bsp_priv->clock.rmii_clk_sel_mask);
        } else {
                /* This should never happen, as .get_interfaces() limits
                 * the interface modes that are supported to RGMII and/or
@@ -367,8 +354,6 @@ static const struct rk_gmac_ops px30_ops = {
 /* RK3128_GRF_MAC_CON1 */
 #define RK3128_GMAC_FLOW_CTRL          GRF_BIT(9)
 #define RK3128_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(9)
-#define RK3128_GMAC_RMII_CLK_25M       GRF_BIT(11)
-#define RK3128_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(11)
 
 static void rk3128_set_to_rgmii(struct rk_priv_data *bsp_priv,
                                int tx_delay, int rx_delay)
@@ -383,16 +368,10 @@ static void rk3128_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3128_reg_speed_data = {
-       .rmii_10 = RK3128_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3128_GMAC_RMII_CLK_25M,
-};
-
 static int rk3128_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3128_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3128_ops = {
@@ -406,6 +385,7 @@ static const struct rk_gmac_ops rk3128_ops = {
 
        .clock_grf_reg = RK3128_GRF_MAC_CON1,
        .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12),
+       .clock.rmii_clk_sel_mask = BIT_U16(11),
        .clock.mac_speed_mask = BIT_U16(10),
 };
 
@@ -421,8 +401,6 @@ static const struct rk_gmac_ops rk3128_ops = {
 /* RK3228_GRF_MAC_CON1 */
 #define RK3228_GMAC_FLOW_CTRL          GRF_BIT(3)
 #define RK3228_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(3)
-#define RK3228_GMAC_RMII_CLK_25M       GRF_BIT(7)
-#define RK3228_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(7)
 #define RK3228_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(0)
 #define RK3228_GMAC_TXCLK_DLY_DISABLE  GRF_CLR_BIT(0)
 #define RK3228_GMAC_RXCLK_DLY_ENABLE   GRF_BIT(1)
@@ -448,16 +426,10 @@ static void rk3228_set_to_rmii(struct rk_priv_data *bsp_priv)
        regmap_write(bsp_priv->grf, RK3228_GRF_MAC_CON1, GRF_BIT(11));
 }
 
-static const struct rk_reg_speed_data rk3228_reg_speed_data = {
-       .rmii_10 = RK3228_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3228_GMAC_RMII_CLK_25M,
-};
-
 static int rk3228_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3228_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3228_integrated_phy_powerup(struct rk_priv_data *priv)
@@ -481,6 +453,7 @@ static const struct rk_gmac_ops rk3228_ops = {
 
        .clock_grf_reg = RK3228_GRF_MAC_CON1,
        .clock.gmii_clk_sel_mask = GENMASK_U16(9, 8),
+       .clock.rmii_clk_sel_mask = BIT_U16(7),
        .clock.mac_speed_mask = BIT_U16(2),
 };
 
@@ -490,8 +463,6 @@ static const struct rk_gmac_ops rk3228_ops = {
 /*RK3288_GRF_SOC_CON1*/
 #define RK3288_GMAC_FLOW_CTRL          GRF_BIT(9)
 #define RK3288_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(9)
-#define RK3288_GMAC_RMII_CLK_25M       GRF_BIT(11)
-#define RK3288_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(11)
 
 /*RK3288_GRF_SOC_CON3*/
 #define RK3288_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(14)
@@ -514,16 +485,10 @@ static void rk3288_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3288_reg_speed_data = {
-       .rmii_10 = RK3288_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3288_GMAC_RMII_CLK_25M,
-};
-
 static int rk3288_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3288_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3288_ops = {
@@ -537,6 +502,7 @@ static const struct rk_gmac_ops rk3288_ops = {
 
        .clock_grf_reg = RK3288_GRF_SOC_CON1,
        .clock.gmii_clk_sel_mask = GENMASK_U16(13, 12),
+       .clock.rmii_clk_sel_mask = BIT_U16(11),
        .clock.mac_speed_mask = BIT_U16(10),
 };
 
@@ -550,14 +516,10 @@ static void rk3308_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3308_reg_speed_data = {
-};
-
 static int rk3308_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3308_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3308_ops = {
@@ -583,8 +545,6 @@ static const struct rk_gmac_ops rk3308_ops = {
 /* RK3328_GRF_MAC_CON1 */
 #define RK3328_GMAC_FLOW_CTRL          GRF_BIT(3)
 #define RK3328_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(3)
-#define RK3328_GMAC_RMII_CLK_25M       GRF_BIT(7)
-#define RK3328_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(7)
 #define RK3328_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(0)
 #define RK3328_GMAC_RXCLK_DLY_ENABLE   GRF_BIT(1)
 
@@ -626,16 +586,10 @@ static void rk3328_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3328_reg_speed_data = {
-       .rmii_10 = RK3328_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3328_GMAC_RMII_CLK_25M,
-};
-
 static int rk3328_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3328_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3328_integrated_phy_powerup(struct rk_priv_data *priv)
@@ -657,6 +611,7 @@ static const struct rk_gmac_ops rk3328_ops = {
        .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4),
        .gmac_rmii_mode_mask = BIT_U16(9),
 
+       .clock.rmii_clk_sel_mask = BIT_U16(7),
        .clock.mac_speed_mask = BIT_U16(2),
 
        .regs_valid = true,
@@ -673,8 +628,6 @@ static const struct rk_gmac_ops rk3328_ops = {
 /* RK3366_GRF_SOC_CON6 */
 #define RK3366_GMAC_FLOW_CTRL          GRF_BIT(8)
 #define RK3366_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(8)
-#define RK3366_GMAC_RMII_CLK_25M       GRF_BIT(3)
-#define RK3366_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(3)
 
 /* RK3366_GRF_SOC_CON7 */
 #define RK3366_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(7)
@@ -697,16 +650,10 @@ static void rk3366_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3366_reg_speed_data = {
-       .rmii_10 = RK3366_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3366_GMAC_RMII_CLK_25M,
-};
-
 static int rk3366_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3366_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3366_ops = {
@@ -720,6 +667,7 @@ static const struct rk_gmac_ops rk3366_ops = {
 
        .clock_grf_reg = RK3366_GRF_SOC_CON6,
        .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4),
+       .clock.rmii_clk_sel_mask = BIT_U16(3),
        .clock.mac_speed_mask = BIT_U16(7),
 };
 
@@ -729,8 +677,6 @@ static const struct rk_gmac_ops rk3366_ops = {
 /* RK3368_GRF_SOC_CON15 */
 #define RK3368_GMAC_FLOW_CTRL          GRF_BIT(8)
 #define RK3368_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(8)
-#define RK3368_GMAC_RMII_CLK_25M       GRF_BIT(3)
-#define RK3368_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(3)
 
 /* RK3368_GRF_SOC_CON16 */
 #define RK3368_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(7)
@@ -753,16 +699,10 @@ static void rk3368_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3368_reg_speed_data = {
-       .rmii_10 = RK3368_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3368_GMAC_RMII_CLK_25M,
-};
-
 static int rk3368_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3368_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3368_ops = {
@@ -776,6 +716,7 @@ static const struct rk_gmac_ops rk3368_ops = {
 
        .clock_grf_reg = RK3368_GRF_SOC_CON15,
        .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4),
+       .clock.rmii_clk_sel_mask = BIT_U16(3),
        .clock.mac_speed_mask = BIT_U16(7),
 };
 
@@ -785,8 +726,6 @@ static const struct rk_gmac_ops rk3368_ops = {
 /* RK3399_GRF_SOC_CON5 */
 #define RK3399_GMAC_FLOW_CTRL          GRF_BIT(8)
 #define RK3399_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(8)
-#define RK3399_GMAC_RMII_CLK_25M       GRF_BIT(3)
-#define RK3399_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(3)
 
 /* RK3399_GRF_SOC_CON6 */
 #define RK3399_GMAC_TXCLK_DLY_ENABLE   GRF_BIT(7)
@@ -809,16 +748,10 @@ static void rk3399_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3399_reg_speed_data = {
-       .rmii_10 = RK3399_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RK3399_GMAC_RMII_CLK_25M,
-};
-
 static int rk3399_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3399_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rk3399_ops = {
@@ -832,6 +765,7 @@ static const struct rk_gmac_ops rk3399_ops = {
 
        .clock_grf_reg = RK3399_GRF_SOC_CON5,
        .clock.gmii_clk_sel_mask = GENMASK_U16(5, 4),
+       .clock.rmii_clk_sel_mask = BIT_U16(3),
        .clock.mac_speed_mask = BIT_U16(7),
 };
 
@@ -840,9 +774,6 @@ static const struct rk_gmac_ops rk3399_ops = {
 
 #define RK3506_GMAC_RMII_MODE          GRF_BIT(1)
 
-#define RK3506_GMAC_CLK_RMII_DIV2      GRF_BIT(3)
-#define RK3506_GMAC_CLK_RMII_DIV20     GRF_CLR_BIT(3)
-
 #define RK3506_GMAC_CLK_SELECT_CRU     GRF_CLR_BIT(5)
 #define RK3506_GMAC_CLK_SELECT_IO      GRF_BIT(5)
 
@@ -873,16 +804,10 @@ static void rk3506_set_to_rmii(struct rk_priv_data *bsp_priv)
        regmap_write(bsp_priv->grf, offset, RK3506_GMAC_RMII_MODE);
 }
 
-static const struct rk_reg_speed_data rk3506_reg_speed_data = {
-       .rmii_10 = RK3506_GMAC_CLK_RMII_DIV20,
-       .rmii_100 = RK3506_GMAC_CLK_RMII_DIV2,
-};
-
 static int rk3506_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3506_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3506_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -904,6 +829,9 @@ static const struct rk_gmac_ops rk3506_ops = {
        .set_to_rmii = rk3506_set_to_rmii,
        .set_speed = rk3506_set_speed,
        .set_clock_selection = rk3506_set_clock_selection,
+
+       .clock.rmii_clk_sel_mask = BIT_U16(3),
+
        .regs_valid = true,
        .regs = {
                0xff4c8000, /* gmac0 */
@@ -933,11 +861,6 @@ static const struct rk_gmac_ops rk3506_ops = {
 #define RK3528_GMAC1_CLK_SELECT_CRU    GRF_CLR_BIT(12)
 #define RK3528_GMAC1_CLK_SELECT_IO     GRF_BIT(12)
 
-#define RK3528_GMAC0_CLK_RMII_DIV2     GRF_BIT(3)
-#define RK3528_GMAC0_CLK_RMII_DIV20    GRF_CLR_BIT(3)
-#define RK3528_GMAC1_CLK_RMII_DIV2     GRF_BIT(10)
-#define RK3528_GMAC1_CLK_RMII_DIV20    GRF_CLR_BIT(10)
-
 #define RK3528_GMAC0_CLK_RMII_GATE     GRF_BIT(2)
 #define RK3528_GMAC0_CLK_RMII_NOGATE   GRF_CLR_BIT(2)
 #define RK3528_GMAC1_CLK_RMII_GATE     GRF_BIT(9)
@@ -948,11 +871,13 @@ static int rk3528_init(struct rk_priv_data *bsp_priv)
        switch (bsp_priv->id) {
        case 0:
                bsp_priv->clock_grf_reg = RK3528_VO_GRF_GMAC_CON;
+               bsp_priv->clock.rmii_clk_sel_mask = BIT_U16(3);
                return 0;
 
        case 1:
                bsp_priv->clock_grf_reg = RK3528_VPU_GRF_GMAC_CON5;
                bsp_priv->clock.gmii_clk_sel_mask = GENMASK_U16(11, 10);
+               bsp_priv->clock.rmii_clk_sel_mask = BIT_U16(10);
                return 0;
 
        default:
@@ -984,27 +909,10 @@ static void rk3528_set_to_rmii(struct rk_priv_data *bsp_priv)
                             RK3528_GMAC0_PHY_INTF_SEL_RMII);
 }
 
-static const struct rk_reg_speed_data rk3528_gmac0_reg_speed_data = {
-       .rmii_10 = RK3528_GMAC0_CLK_RMII_DIV20,
-       .rmii_100 = RK3528_GMAC0_CLK_RMII_DIV2,
-};
-
-static const struct rk_reg_speed_data rk3528_gmac1_reg_speed_data = {
-       .rmii_10 = RK3528_GMAC1_CLK_RMII_DIV20,
-       .rmii_100 = RK3528_GMAC1_CLK_RMII_DIV2,
-};
-
 static int rk3528_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       const struct rk_reg_speed_data *rsd;
-
-       if (bsp_priv->id == 1)
-               rsd = &rk3528_gmac1_reg_speed_data;
-       else
-               rsd = &rk3528_gmac0_reg_speed_data;
-
-       return rk_set_reg_speed(bsp_priv, rsd, interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3528_set_clock_selection(struct rk_priv_data *bsp_priv,
@@ -1144,9 +1052,6 @@ static const struct rk_gmac_ops rk3568_ops = {
 #define RK3576_GMAC_CLK_SELECT_IO              GRF_BIT(7)
 #define RK3576_GMAC_CLK_SELECT_CRU             GRF_CLR_BIT(7)
 
-#define RK3576_GMAC_CLK_RMII_DIV2              GRF_BIT(5)
-#define RK3576_GMAC_CLK_RMII_DIV20             GRF_CLR_BIT(5)
-
 #define RK3576_GMAC_CLK_RMII_GATE              GRF_BIT(4)
 #define RK3576_GMAC_CLK_RMII_NOGATE            GRF_CLR_BIT(4)
 
@@ -1195,16 +1100,10 @@ static void rk3576_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rk3578_reg_speed_data = {
-       .rmii_10 = RK3576_GMAC_CLK_RMII_DIV20,
-       .rmii_100 = RK3576_GMAC_CLK_RMII_DIV2,
-};
-
 static int rk3576_set_gmac_speed(struct rk_priv_data *bsp_priv,
                                 phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rk3578_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3576_set_clock_selection(struct rk_priv_data *bsp_priv, bool input,
@@ -1233,6 +1132,7 @@ static const struct rk_gmac_ops rk3576_ops = {
        .gmac_rmii_mode_mask = BIT_U16(3),
 
        .clock.gmii_clk_sel_mask = GENMASK_U16(6, 5),
+       .clock.rmii_clk_sel_mask = BIT_U16(5),
 
        .php_grf_required = true,
        .regs_valid = true,
@@ -1266,9 +1166,6 @@ static const struct rk_gmac_ops rk3576_ops = {
 #define RK3588_GMAC_CLK_SELECT_CRU(id)         GRF_BIT(5 * (id) + 4)
 #define RK3588_GMAC_CLK_SELECT_IO(id)          GRF_CLR_BIT(5 * (id) + 4)
 
-#define RK3588_GMA_CLK_RMII_DIV2(id)           GRF_BIT(5 * (id) + 2)
-#define RK3588_GMA_CLK_RMII_DIV20(id)          GRF_CLR_BIT(5 * (id) + 2)
-
 #define RK3588_GMAC_CLK_RMII_GATE(id)          GRF_BIT(5 * (id) + 1)
 #define RK3588_GMAC_CLK_RMII_NOGATE(id)                GRF_CLR_BIT(5 * (id) + 1)
 
@@ -1278,11 +1175,13 @@ static int rk3588_init(struct rk_priv_data *bsp_priv)
        case 0:
                bsp_priv->gmac_phy_intf_sel_mask = GENMASK_U16(5, 3);
                bsp_priv->clock.gmii_clk_sel_mask = GENMASK_U16(3, 2);
+               bsp_priv->clock.rmii_clk_sel_mask = BIT_U16(2);
                return 0;
 
        case 1:
                bsp_priv->gmac_phy_intf_sel_mask = GENMASK_U16(11, 9);
                bsp_priv->clock.gmii_clk_sel_mask = GENMASK_U16(8, 7);
+               bsp_priv->clock.rmii_clk_sel_mask = BIT_U16(7);
                return 0;
 
        default:
@@ -1316,27 +1215,10 @@ static void rk3588_set_to_rmii(struct rk_priv_data *bsp_priv)
                     RK3588_GMAC_CLK_RMII_MODE(bsp_priv->id));
 }
 
-static const struct rk_reg_speed_data rk3588_gmac0_speed_data = {
-       .rmii_10 = RK3588_GMA_CLK_RMII_DIV20(0),
-       .rmii_100 = RK3588_GMA_CLK_RMII_DIV2(0),
-};
-
-static const struct rk_reg_speed_data rk3588_gmac1_speed_data = {
-       .rmii_10 = RK3588_GMA_CLK_RMII_DIV20(1),
-       .rmii_100 = RK3588_GMA_CLK_RMII_DIV2(1),
-};
-
 static int rk3588_set_gmac_speed(struct rk_priv_data *bsp_priv,
                                 phy_interface_t interface, int speed)
 {
-       const struct rk_reg_speed_data *rsd;
-
-       if (bsp_priv->id == 0)
-               rsd = &rk3588_gmac0_speed_data;
-       else
-               rsd = &rk3588_gmac1_speed_data;
-
-       return rk_set_reg_speed(bsp_priv, rsd, interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static void rk3588_set_clock_selection(struct rk_priv_data *bsp_priv, bool input,
@@ -1378,23 +1260,15 @@ static const struct rk_gmac_ops rk3588_ops = {
 /* RV1108_GRF_GMAC_CON0 */
 #define RV1108_GMAC_FLOW_CTRL          GRF_BIT(3)
 #define RV1108_GMAC_FLOW_CTRL_CLR      GRF_CLR_BIT(3)
-#define RV1108_GMAC_RMII_CLK_25M       GRF_BIT(7)
-#define RV1108_GMAC_RMII_CLK_2_5M      GRF_CLR_BIT(7)
 
 static void rv1108_set_to_rmii(struct rk_priv_data *bsp_priv)
 {
 }
 
-static const struct rk_reg_speed_data rv1108_reg_speed_data = {
-       .rmii_10 = RV1108_GMAC_RMII_CLK_2_5M,
-       .rmii_100 = RV1108_GMAC_RMII_CLK_25M,
-};
-
 static int rv1108_set_speed(struct rk_priv_data *bsp_priv,
                            phy_interface_t interface, int speed)
 {
-       return rk_set_reg_speed(bsp_priv, &rv1108_reg_speed_data,
-                               interface, speed);
+       return rk_set_reg_speed(bsp_priv, interface, speed);
 }
 
 static const struct rk_gmac_ops rv1108_ops = {
@@ -1405,6 +1279,7 @@ static const struct rk_gmac_ops rv1108_ops = {
        .gmac_phy_intf_sel_mask = GENMASK_U16(6, 4),
 
        .clock_grf_reg = RV1108_GRF_GMAC_CON0,
+       .clock.rmii_clk_sel_mask = BIT_U16(7),
        .clock.mac_speed_mask = BIT_U16(2),
 };