[PATCH] clk: rockchip: Correct usage of IS_ENABLED() macro

Kever Yang kever.yang at rock-chips.com
Fri Feb 28 09:00:49 CET 2025


Hi Tom,

On 2025/2/27 04:31, Tom Rini wrote:
> 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 at konsulko.com>
> ---
> Cc: Kever Yang <kever.yang at rock-chips.com>
Reviewed-by: Kever Yang <kever.yang at rock-chips.com>

Thanks,
- Kever
> ---
>   drivers/clk/rockchip/clk_rk3568.c | 4 ++--
>   drivers/clk/rockchip/clk_rk3588.c | 4 ++--
>   2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk_rk3568.c b/drivers/clk/rockchip/clk_rk3568.c
> index 977699d509d6..533031caead6 100644
> --- a/drivers/clk/rockchip/clk_rk3568.c
> +++ b/drivers/clk/rockchip/clk_rk3568.c
> @@ -2680,7 +2680,7 @@ static ulong rk3568_clk_set_rate(struct clk *clk, ulong rate)
>   	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)
>   {
>   	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 = {
>   	.get_rate = rk3568_clk_get_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,
>   #endif
>   };
> diff --git a/drivers/clk/rockchip/clk_rk3588.c b/drivers/clk/rockchip/clk_rk3588.c
> index 6042fc10cdbd..8c3a113526f9 100644
> --- a/drivers/clk/rockchip/clk_rk3588.c
> +++ b/drivers/clk/rockchip/clk_rk3588.c
> @@ -1822,7 +1822,7 @@ static ulong rk3588_clk_set_rate(struct clk *clk, ulong rate)
>    */
>   #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,
>   						     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 = {
>   	.get_rate = rk3588_clk_get_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,
>   #endif
>   };


More information about the U-Boot mailing list