rockchip: clk: fix wrong CONFIG_IS_ENABLED handling
authorHeiko Stuebner <heiko.stuebner@theobroma-systems.com>
Fri, 8 Nov 2019 23:06:30 +0000 (00:06 +0100)
committerKever Yang <kever.yang@rock-chips.com>
Sun, 17 Nov 2019 09:22:53 +0000 (17:22 +0800)
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.stuebner@theobroma-systems.com>
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
drivers/clk/rockchip/clk_rk3036.c
drivers/clk/rockchip/clk_rk3188.c
drivers/clk/rockchip/clk_rk322x.c
drivers/clk/rockchip/clk_rk3288.c
drivers/clk/rockchip/clk_rk3328.c
drivers/clk/rockchip/clk_rk3368.c
drivers/clk/rockchip/clk_rk3399.c
drivers/clk/rockchip/clk_rv1108.c

index 9bf9ced..6d5ae3d 100644 (file)
@@ -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)
index dda686c..3ea9a81 100644 (file)
@@ -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)
index f09730c..6e8a164 100644 (file)
@@ -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)
index 0122381..85d1b67 100644 (file)
@@ -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)
index 4331048..e700a1b 100644 (file)
@@ -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)
index c1a867b..b51d529 100644 (file)
@@ -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)
index a273bd1..9020a9f 100644 (file)
@@ -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)
index acffb59..97fdd09 100644 (file)
@@ -696,7 +696,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)