rk30:sdk: rename point clk_cpu to dvfs_clk_cpu to make a different from others

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index c95e01c6e704f77ee47ea22048d9a2062e2be82c..d9c9fa9267dfc2e8c1819b248901ef93f4b42f8f 100644 (file)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -977,7 +977,7 @@ int dvfs_get_depend_volt(struct clk_node *dvfs_clk, struct vd_node *dvfs_vd_dep,
        DVFS_ERR("%s can not find vd node %s\n", __func__, dvfs_vd_dep->name);\r
        return -1;\r
 }\r
-struct clk_node *clk_cpu;\r
+static struct clk_node *dvfs_clk_cpu;\r
 static struct vd_node vd_core;\r
 int dvfs_target_cpu(struct clk *clk, unsigned long rate_hz)\r
 {\r
@@ -1160,12 +1160,12 @@ int dvfs_target_core(struct clk *clk, unsigned long rate_hz)
        /* if up the rate */\r
        if (rate_new > rate_old) {\r
                DVFS_DBG("-----------------------------rate_new > rate_old\n");\r
-               volt_dep_new = dvfs_vd_get_newvolt_byclk(clk_cpu);\r
+               volt_dep_new = dvfs_vd_get_newvolt_byclk(dvfs_clk_cpu);\r
 \r
                if (volt_dep_new < 0) \r
                        goto fail_roll_back;\r
 \r
-               ret = dvfs_scale_volt_bystep(dvfs_clk->vd, clk_cpu->vd, volt_new, volt_dep_new, \r
+               ret = dvfs_scale_volt_bystep(dvfs_clk->vd, dvfs_clk_cpu->vd, volt_new, volt_dep_new, \r
                                        LOGIC_HIGHER_ARM, ARM_HIGHER_LOGIC); \r
                if (ret < 0) \r
                        goto fail_roll_back;\r
@@ -1190,12 +1190,12 @@ int dvfs_target_core(struct clk *clk, unsigned long rate_hz)
        /* if down the rate */\r
        if (rate_new < rate_old) {\r
                DVFS_DBG("-----------------------------rate_new < rate_old\n");\r
-               volt_dep_new = dvfs_vd_get_newvolt_byclk(clk_cpu);\r
+               volt_dep_new = dvfs_vd_get_newvolt_byclk(dvfs_clk_cpu);\r
 \r
                if (volt_dep_new < 0) \r
                        goto out;\r
 \r
-               ret = dvfs_scale_volt_bystep(dvfs_clk->vd, clk_cpu->vd, volt_new, volt_dep_new, \r
+               ret = dvfs_scale_volt_bystep(dvfs_clk->vd, dvfs_clk_cpu->vd, volt_new, volt_dep_new, \r
                                        LOGIC_HIGHER_ARM, ARM_HIGHER_LOGIC); \r
                if (ret < 0) \r
                        goto out;\r
@@ -1418,7 +1418,7 @@ int rk30_dvfs_init(void)
        for (i = 0; i < ARRAY_SIZE(rk30_depends); i++) {\r
                rk_regist_depends(&rk30_depends[i]);\r
        }\r
-       clk_cpu = dvfs_get_dvfs_clk_byname("cpu");\r
+       dvfs_clk_cpu = dvfs_get_dvfs_clk_byname("cpu");\r
        return 0;\r
 }\r
 \r