random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-13 20:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

clk: rockchip: Correct usage of IS_ENABLED() macro

Browse Source 
These two files were using IS_ENABLED() to test for CONFIG flags but omitted
the CONFIG_ prefix and so did not work as expected.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
This commit is contained in:
Tom Rini 2025-02-26 14:31:23 -06:00 committed by Kever Yang
parent 4871db6082
commit 126262b2be
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/clk/rockchip/clk_rk3568.c
View File

@ -2680,7 +2680,7 @@ static ulong rk3568_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
}; };
#if (IS_ENABLED(OF_CONTROL)) || (!IS_ENABLED(OF_PLATDATA)) #if (CONFIG_IS_ENABLED(OF_CONTROL)) || (!CONFIG_IS_ENABLED(OF_PLATDATA))
static int rk3568_gmac0_src_set_parent(struct clk *clk, struct clk *parent) static int rk3568_gmac0_src_set_parent(struct clk *clk, struct clk *parent)
{ {
struct rk3568_clk_priv *priv = dev_get_priv(clk->dev); struct rk3568_clk_priv *priv = dev_get_priv(clk->dev);
@ -2859,7 +2859,7 @@ static int rk3568_clk_set_parent(struct clk *clk, struct clk *parent)
static struct clk_ops rk3568_clk_ops = { static struct clk_ops rk3568_clk_ops = {
.get_rate = rk3568_clk_get_rate, .get_rate = rk3568_clk_get_rate,
.set_rate = rk3568_clk_set_rate, .set_rate = rk3568_clk_set_rate,
#if (IS_ENABLED(OF_CONTROL)) || (!IS_ENABLED(OF_PLATDATA)) #if (CONFIG_IS_ENABLED(OF_CONTROL)) || (!CONFIG_IS_ENABLED(OF_PLATDATA))
.set_parent = rk3568_clk_set_parent, .set_parent = rk3568_clk_set_parent,
#endif #endif
}; };

4
drivers/clk/rockchip/clk_rk3588.c
View File

@ -1822,7 +1822,7 @@ static ulong rk3588_clk_set_rate(struct clk *clk, ulong rate)
*/ */
#define ROCKCHIP_MMC_DELAY_ELEMENT_PSEC 60 #define ROCKCHIP_MMC_DELAY_ELEMENT_PSEC 60
#if (IS_ENABLED(OF_CONTROL)) || (!IS_ENABLED(OF_PLATDATA)) #if (CONFIG_IS_ENABLED(OF_CONTROL)) || (!CONFIG_IS_ENABLED(OF_PLATDATA))
static int __maybe_unused rk3588_dclk_vop_set_parent(struct clk *clk, static int __maybe_unused rk3588_dclk_vop_set_parent(struct clk *clk,
struct clk *parent) struct clk *parent)
{ {
@ -1915,7 +1915,7 @@ static int rk3588_clk_set_parent(struct clk *clk, struct clk *parent)
static struct clk_ops rk3588_clk_ops = { static struct clk_ops rk3588_clk_ops = {
.get_rate = rk3588_clk_get_rate, .get_rate = rk3588_clk_get_rate,
.set_rate = rk3588_clk_set_rate, .set_rate = rk3588_clk_set_rate,
#if (IS_ENABLED(OF_CONTROL)) || (!IS_ENABLED(OF_PLATDATA)) #if (CONFIG_IS_ENABLED(OF_CONTROL)) || (!CONFIG_IS_ENABLED(OF_PLATDATA))
.set_parent = rk3588_clk_set_parent, .set_parent = rk3588_clk_set_parent,
#endif #endif
}; };