]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
clk: rockchip: rk356x: Fix set rate of SCLK_SFC clock
authorJonas Karlman <jonas@kwiboo.se>
Mon, 22 Apr 2024 06:28:40 +0000 (06:28 +0000)
committerKever Yang <kever.yang@rock-chips.com>
Fri, 26 Apr 2024 07:47:04 +0000 (15:47 +0800)
The SCLK_SFC can be set to a rate of 24, 50, 75, 100, 125 or 150 MHz.

However, clk_set_rate() will fail unless one of those exact rates are
used, and with newer and updated device tree files that contain
spi-max-frequency values that does not exactly match these rates use of
SPI flash may fail.

Fix this by using the highest possible rate that exceeds or is equal to
the requested rate.

Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
drivers/clk/rockchip/clk_rk3568.c

index 999f48ea4b4e2c21d0f18623728c4f71f31b10db..24eeca8bf265ab0cfe7eede20db3d1adefaaa643 100644 (file)
@@ -1527,28 +1527,20 @@ static ulong rk3568_sfc_set_clk(struct rk3568_clk_priv *priv, ulong rate)
        struct rk3568_cru *cru = priv->cru;
        int src_clk;
 
-       switch (rate) {
-       case OSC_HZ:
-               src_clk = SCLK_SFC_SEL_24M;
-               break;
-       case 50 * MHz:
-               src_clk = SCLK_SFC_SEL_50M;
-               break;
-       case 75 * MHz:
-               src_clk = SCLK_SFC_SEL_75M;
-               break;
-       case 100 * MHz:
-               src_clk = SCLK_SFC_SEL_100M;
-               break;
-       case 125 * MHz:
-               src_clk = SCLK_SFC_SEL_125M;
-               break;
-       case 150 * MHz:
+       if (rate >= 150 * MHz)
                src_clk = SCLK_SFC_SEL_150M;
-               break;
-       default:
+       else if (rate >= 125 * MHz)
+               src_clk = SCLK_SFC_SEL_125M;
+       else if (rate >= 100 * MHz)
+               src_clk = SCLK_SFC_SEL_100M;
+       else if (rate >= 75 * MHz)
+               src_clk = SCLK_SFC_SEL_75M;
+       else if (rate >= 50 * MHz)
+               src_clk = SCLK_SFC_SEL_50M;
+       else if (rate >= OSC_HZ)
+               src_clk = SCLK_SFC_SEL_24M;
+       else
                return -ENOENT;
-       }
 
        rk_clrsetreg(&cru->clksel_con[28],
                     SCLK_SFC_SEL_MASK,