]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
clk: use private clk struct in CLK_CCF's enable/disable functions
authorMaksim Kiselev <bigunclemax@gmail.com>
Tue, 5 Sep 2023 22:16:49 +0000 (01:16 +0300)
committerSean Anderson <seanga2@gmail.com>
Wed, 1 Nov 2023 19:14:09 +0000 (15:14 -0400)
In clk_enable()/clk_disable() functions, when CCF is activated,
we must pass a private clk struct to enable()/disable() ops functions.
Otherwise, the use of a container_of() construction within these ops
should be banned. Because passing a non-private clk struct to
container_of() results in an out of range error.

At the moment, clk-mux, clk-fixed-factor, clk-gate and possibly other
clocks use container_of() in their enable()/disable() functions.
Therefore, for these functions to work correclty, private clk struct
must be passed.

Signed-off-by: Maksim Kiselev <bigunclemax@gmail.com>
Reviewed-by: Sean Anderson <seanga2@gmail.com>
Link: https://lore.kernel.org/r/20230905221649.3577929-1-bigunclemax@gmail.com
drivers/clk/clk-uclass.c

index dcbc3ee1a1e174d615db9bc0e5c083a22fe7e4d0..3b5e3f9c86b327829a4d03e27f0752990a89331f 100644 (file)
@@ -656,7 +656,7 @@ int clk_enable(struct clk *clk)
                }
 
                if (ops->enable) {
-                       ret = ops->enable(clk);
+                       ret = ops->enable(clkp ? clkp : clk);
                        if (ret) {
                                printf("Enable %s failed\n", clk->dev->name);
                                return ret;
@@ -713,7 +713,7 @@ int clk_disable(struct clk *clk)
                }
 
                if (ops->disable) {
-                       ret = ops->disable(clk);
+                       ret = ops->disable(clkp ? clkp : clk);
                        if (ret)
                                return ret;
                }