From: Lukasz Majewski Date: Mon, 24 Jun 2019 13:50:40 +0000 (+0200) Subject: clk: Provide struct clk for fixed rate clock (clk_fixed_rate.c) X-Git-Tag: v2019.10-rc1~9^2~93 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=36bac0a193d4cf37ca9c482567bc72012c1299b5;p=oweals%2Fu-boot.git clk: Provide struct clk for fixed rate clock (clk_fixed_rate.c) Up till now the fixed rate clock ('osc') has been added to UCLASS_CLK without declaring struct clk. As a result it was only accessible by iterating the udevice's uclass list. This is a problem for clock code, which operates on pointers to struct clk (like clk_get_rate()), not udevices. After this change struct clk is accessible from udevice and udevice from struct clk. Signed-off-by: Lukasz Majewski Reviewed-by: Peng Fan --- diff --git a/drivers/clk/clk_fixed_rate.c b/drivers/clk/clk_fixed_rate.c index 50dbb13655..1fdf8c4e54 100644 --- a/drivers/clk/clk_fixed_rate.c +++ b/drivers/clk/clk_fixed_rate.c @@ -8,6 +8,7 @@ #include struct clk_fixed_rate { + struct clk clk; unsigned long fixed_rate; }; @@ -24,10 +25,14 @@ const struct clk_ops clk_fixed_rate_ops = { static int clk_fixed_rate_ofdata_to_platdata(struct udevice *dev) { + struct clk *clk = &to_clk_fixed_rate(dev)->clk; #if !CONFIG_IS_ENABLED(OF_PLATDATA) to_clk_fixed_rate(dev)->fixed_rate = dev_read_u32_default(dev, "clock-frequency", 0); #endif + /* Make fixed rate clock accessible from higher level struct clk */ + dev->uclass_priv = clk; + clk->dev = dev; return 0; }