Advertisement
Guest User

Untitled

a guest
Dec 3rd, 2020
62
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 1.16 KB | None | 0 0
  1. diff --git a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
  2. index 2184b6c2c784..2e090717d6be 100644
  3. --- a/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
  4. +++ b/drivers/net/ethernet/stmicro/stmmac/dwmac-meson8b.c
  5. @@ -30,7 +30,6 @@
  6.  #define PRG_ETH0_EXT_RMII_MODE     4
  7.  
  8.  /* mux to choose between fclk_div2 (bit unset) and mpll2 (bit set) */
  9. -#define PRG_ETH0_CLK_M250_SEL_SHIFT    4
  10.  #define PRG_ETH0_CLK_M250_SEL_MASK GENMASK(4, 4)
  11.  
  12.  /* TX clock delay in ns = "8ns / 4 * tx_dly_val" (where 8ns are exactly one
  13. @@ -166,8 +165,9 @@ static int meson8b_init_rgmii_tx_clk(struct meson8b_dwmac *dwmac)
  14.         return -ENOMEM;
  15.  
  16.     clk_configs->m250_mux.reg = dwmac->regs + PRG_ETH0;
  17. -   clk_configs->m250_mux.shift = PRG_ETH0_CLK_M250_SEL_SHIFT;
  18. -   clk_configs->m250_mux.mask = PRG_ETH0_CLK_M250_SEL_MASK;
  19. +   clk_configs->m250_mux.shift = __ffs(PRG_ETH0_CLK_M250_SEL_MASK);
  20. +   clk_configs->m250_mux.mask = PRG_ETH0_CLK_M250_SEL_MASK >>
  21. +                    clk_configs->m250_mux.shift;
  22.     clk = meson8b_dwmac_register_clk(dwmac, "m250_sel", mux_parents,
  23.                      ARRAY_SIZE(mux_parents), &clk_mux_ops,
  24.                      &clk_configs->m250_mux.hw);
  25.  
  26.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement