[U-Boot] [PATCH 2/2] rockchip: clk: fix wrong CONFIG_IS_ENABLED handling

[Kever Yang]

On 2019/10/24 上午1:45, Heiko Stuebner wrote:
> CONFIG_IS_ENABLED() needs the config name like used in Kconfig, so
> without the leading CONFIG_. The clock drivers all wrongly check for
> CONFIG_RESET_ROCKCHIP, fix that
>
> Signed-off-by: Heiko Stuebner <heiko at sntech.de>


Reviewed-by: Kever Yang <kever.yang at rock-chips.com>


Thanks,

- Kever

> ---
>   drivers/clk/rockchip/clk_rk3036.c | 2 +-
>   drivers/clk/rockchip/clk_rk3188.c | 2 +-
>   drivers/clk/rockchip/clk_rk322x.c | 2 +-
>   drivers/clk/rockchip/clk_rk3288.c | 2 +-
>   drivers/clk/rockchip/clk_rk3328.c | 2 +-
>   drivers/clk/rockchip/clk_rk3368.c | 2 +-
>   drivers/clk/rockchip/clk_rk3399.c | 2 +-
>   drivers/clk/rockchip/clk_rv1108.c | 2 +-
>   8 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/clk/rockchip/clk_rk3036.c b/drivers/clk/rockchip/clk_rk3036.c
> index 9bf9cedaf8..6d5ae3d003 100644
> --- a/drivers/clk/rockchip/clk_rk3036.c
> +++ b/drivers/clk/rockchip/clk_rk3036.c
> @@ -352,7 +352,7 @@ static int rk3036_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3036_cru, cru_softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 9);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk3188.c b/drivers/clk/rockchip/clk_rk3188.c
> index dda686cfb3..3ea9a81b32 100644
> --- a/drivers/clk/rockchip/clk_rk3188.c
> +++ b/drivers/clk/rockchip/clk_rk3188.c
> @@ -590,7 +590,7 @@ static int rk3188_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3188_cru, cru_softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 9);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk322x.c b/drivers/clk/rockchip/clk_rk322x.c
> index f09730c91b..6e8a164d62 100644
> --- a/drivers/clk/rockchip/clk_rk322x.c
> +++ b/drivers/clk/rockchip/clk_rk322x.c
> @@ -508,7 +508,7 @@ static int rk322x_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk322x_cru, cru_softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 9);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
> index 0122381633..85d1b67e43 100644
> --- a/drivers/clk/rockchip/clk_rk3288.c
> +++ b/drivers/clk/rockchip/clk_rk3288.c
> @@ -1015,7 +1015,7 @@ static int rk3288_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3288_cru, cru_softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 12);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk3328.c b/drivers/clk/rockchip/clk_rk3328.c
> index 4331048a87..e700a1bc25 100644
> --- a/drivers/clk/rockchip/clk_rk3328.c
> +++ b/drivers/clk/rockchip/clk_rk3328.c
> @@ -791,7 +791,7 @@ static int rk3328_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3328_cru, softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 12);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk3368.c b/drivers/clk/rockchip/clk_rk3368.c
> index c1a867b2ed..b51d529ade 100644
> --- a/drivers/clk/rockchip/clk_rk3368.c
> +++ b/drivers/clk/rockchip/clk_rk3368.c
> @@ -620,7 +620,7 @@ static int rk3368_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3368_cru, softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 15);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
> index a273bd1beb..9020a9f202 100644
> --- a/drivers/clk/rockchip/clk_rk3399.c
> +++ b/drivers/clk/rockchip/clk_rk3399.c
> @@ -1195,7 +1195,7 @@ static int rk3399_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rk3399_cru, softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 21);
>   	if (ret)
> diff --git a/drivers/clk/rockchip/clk_rv1108.c b/drivers/clk/rockchip/clk_rv1108.c
> index 5dc31e1eb0..ca2e25a580 100644
> --- a/drivers/clk/rockchip/clk_rv1108.c
> +++ b/drivers/clk/rockchip/clk_rv1108.c
> @@ -697,7 +697,7 @@ static int rv1108_clk_bind(struct udevice *dev)
>   		sys_child->priv = priv;
>   	}
>   
> -#if CONFIG_IS_ENABLED(CONFIG_RESET_ROCKCHIP)
> +#if CONFIG_IS_ENABLED(RESET_ROCKCHIP)
>   	ret = offsetof(struct rv1108_cru, softrst_con[0]);
>   	ret = rockchip_reset_bind(dev, ret, 13);
>   	if (ret)