]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
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 9bf9cedaf8cded8b5aaa08adf6d96dac773be83e..6d5ae3d003143be4bfe6d32bf2bd3eab4097a59e 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 dda686cfb3a084fa43b3fb0922afafef8f50f7a9..3ea9a81b32456c1afe69344acf9c7a659610f6f2 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 f09730c91b452be2880d7e5fcfb40b2f95fbce6f..6e8a164d6220594bce61f7ca3c3062275765648d 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 01223816337660386bc5f163c30c1e1b6caf3412..85d1b67e4311985f7f1fa9e3fb67cb23108315e3 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 4331048a87612113bf3f2a684eccc21e32e05782..e700a1bc25cb0e5ed431e085b247c8b80c407f96 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 c1a867b2eded7fb355ef72233584c979e08580f7..b51d529adea02858e33242d1122d01533649f0c6 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 a273bd1bebe476164a2356a3ed03aba993d3f30b..9020a9f202acb2f6286726c3f1cfb2b28fde00c3 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 acffb592b00c1e2503d20efa2514c6573e8c5d75..97fdd099ef39a04e6f151cbe63c3bdb40565ae25 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)