Commit fd1ba2965244 ("drivers: clk: Fix using assigned-clocks in the
node of the clock it sets up"), first included in v2020.01-rc2, added
a clock-uclass post_probe() hook that applies clock controllers own
assigned clocks.

Remove the redundant clk_set_defaults() call from the RV1126 clock
driver probe() ops. Also remove the unused sync_kernel field that only
recorded whether assigned clocks had been applied.

Fixes: a25338aa896a ("clk: rockchip: Add rv1126 clk support")
Signed-off-by: Jonas Karlman <[email protected]>
---
 arch/arm/include/asm/arch-rockchip/cru_rv1126.h | 1 -
 drivers/clk/rockchip/clk_rv1126.c               | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/arch/arm/include/asm/arch-rockchip/cru_rv1126.h 
b/arch/arm/include/asm/arch-rockchip/cru_rv1126.h
index ae273de31442..20e580a8eb3d 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rv1126.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rv1126.h
@@ -72,7 +72,6 @@ struct rv1126_clk_priv {
        ulong armclk_hz;
        ulong armclk_enter_hz;
        ulong armclk_init_hz;
-       bool sync_kernel;
        bool set_armclk_rate;
 };
 
diff --git a/drivers/clk/rockchip/clk_rv1126.c 
b/drivers/clk/rockchip/clk_rv1126.c
index 39920d34b75a..018232dcb027 100644
--- a/drivers/clk/rockchip/clk_rv1126.c
+++ b/drivers/clk/rockchip/clk_rv1126.c
@@ -1772,7 +1772,6 @@ static void rv1126_clk_init(struct rv1126_clk_priv *priv)
 {
        int ret;
 
-       priv->sync_kernel = false;
        if (!priv->armclk_enter_hz) {
                priv->armclk_enter_hz =
                        rockchip_pll_get_rate(&rv1126_pll_clks[APLL],
@@ -1812,7 +1811,6 @@ static void rv1126_clk_init(struct rv1126_clk_priv *priv)
 static int rv1126_clk_probe(struct udevice *dev)
 {
        struct rv1126_clk_priv *priv = dev_get_priv(dev);
-       int ret;
 
        priv->grf = syscon_get_first_range(ROCKCHIP_SYSCON_GRF);
        if (IS_ERR(priv->grf))
@@ -1820,13 +1818,6 @@ static int rv1126_clk_probe(struct udevice *dev)
 
        rv1126_clk_init(priv);
 
-       /* Process 'assigned-{clocks/clock-parents/clock-rates}' properties */
-       ret = clk_set_defaults(dev, 1);
-       if (ret)
-               debug("%s clk_set_defaults failed %d\n", __func__, ret);
-       else
-               priv->sync_kernel = true;
-
        return 0;
 }
 
-- 
2.55.0

Reply via email to