rk3066b: change dvfs to scale volt bystep

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index c4aae0aa0fe9173afabd1ddfa6629b4959378eb5..4bc6752ca626ab966160646c7d87121c71668699 100755 (executable)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -1072,12 +1072,8 @@ int dvfs_target_cpu(struct clk *clk, unsigned long rate_hz)
                        volt_dep_new = dvfs_vd_get_newvolt_bypd(&vd_core);\r
                        if (volt_dep_new <= 0) \r
                                goto fail_roll_back;\r
-#ifdef CONFIG_ARCH_RK3066B\r
-                       ret = dvfs_scale_volt_direct(dvfs_clk->vd, volt_new);\r
-#else\r
                        ret = dvfs_scale_volt_bystep(dvfs_clk->vd, &vd_core, volt_new, volt_dep_new, \r
                                        ARM_HIGHER_LOGIC, LOGIC_HIGHER_ARM); \r
-#endif\r
                        if (ret < 0) \r
                                goto fail_roll_back;\r
                } else {\r
@@ -1113,12 +1109,8 @@ int dvfs_target_cpu(struct clk *clk, unsigned long rate_hz)
                        volt_dep_new = dvfs_vd_get_newvolt_bypd(&vd_core);\r
                        if (volt_dep_new <= 0) \r
                                goto out;\r
-#ifdef CONFIG_ARCH_RK3066B\r
-                       ret = dvfs_scale_volt_direct(dvfs_clk->vd, volt_new);\r
-#else\r
                        ret = dvfs_scale_volt_bystep(dvfs_clk->vd, &vd_core, volt_new, volt_dep_new, \r
                                        ARM_HIGHER_LOGIC, LOGIC_HIGHER_ARM); \r
-#endif\r
                        if (ret < 0) \r
                                goto out;\r
                } else {\r
@@ -1202,12 +1194,8 @@ int dvfs_target_core(struct clk *clk, unsigned long rate_hz)
 \r
                if (volt_dep_new < 0) \r
                        goto fail_roll_back;\r
-#ifdef CONFIG_ARCH_RK3066B\r
-               ret = dvfs_scale_volt_direct(dvfs_clk->vd, volt_new);\r
-#else\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
-#endif\r
                if (ret < 0) \r
                        goto fail_roll_back;\r
        }\r
@@ -1235,12 +1223,8 @@ int dvfs_target_core(struct clk *clk, unsigned long rate_hz)
 \r
                if (volt_dep_new < 0) \r
                        goto out;\r
-#ifdef CONFIG_ARCH_RK3066B\r
-               ret = dvfs_scale_volt_direct(dvfs_clk->vd, volt_new);\r
-#else\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
-#endif\r
                if (ret < 0) \r
                        goto out;\r
        }\r