Revert "rk30:sdk: store clock request frequency and auto scale frequency when limit...

This reverts commit f0a1404739d7e0e63e8e2745bf92af10faeb0fc4.

diff --git a/arch/arm/mach-rk30/dvfs.c b/arch/arm/mach-rk30/dvfs.c
index ba21ee29a758e453ed0ab0d6d36039dbd4bd9ac8..fe6cf1e225f03ed4496283b559a8b1da4ee7b85c 100644 (file)
--- a/arch/arm/mach-rk30/dvfs.c
+++ b/arch/arm/mach-rk30/dvfs.c
@@ -102,52 +102,25 @@ struct regulator* dvfs_get_regulator(char *regulator_name)
        return NULL;\r
 }\r
 \r
-int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned int max_rate)\r
+int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned max_rate)\r
 {\r
        struct clk_node* dvfs_clk;\r
-       if (!clk->dvfs_info) {\r
-               DVFS_ERR("%s bad dvfs clock\n", __func__);\r
-               return -1;\r
-       }\r
        dvfs_clk = clk->dvfs_info;\r
 \r
        dvfs_clk->freq_limit_en = 1;\r
        dvfs_clk->min_rate = min_rate;\r
        dvfs_clk->max_rate = max_rate;\r
        \r
-       if (!dvfs_clk->enable_dvfs) {\r
-               DVFS_ERR("%s dvfs not enable yet\n", __func__);\r
-               return -1;\r
-       }\r
-\r
-       if (dvfs_clk->req_freq != 0)\r
-               dvfs_set_rate(clk, dvfs_clk->req_freq);\r
-       else\r
-               dvfs_set_rate(clk, dvfs_clk->set_freq);\r
        return 0;\r
 }\r
 \r
 int dvfs_clk_disable_limit(struct clk *clk)\r
 {\r
        struct clk_node* dvfs_clk;\r
-       if (!clk->dvfs_info) {\r
-               DVFS_ERR("%s bad dvfs clock\n", __func__);\r
-               return -1;\r
-       }\r
        dvfs_clk = clk->dvfs_info;\r
        \r
        dvfs_clk->freq_limit_en = 0;\r
        \r
-       if (!dvfs_clk->enable_dvfs) {\r
-               DVFS_ERR("%s dvfs not enable yet\n", __func__);\r
-               return -1;\r
-       }\r
-       \r
-       if (dvfs_clk->req_freq != 0)\r
-               dvfs_set_rate(clk, dvfs_clk->req_freq);\r
-       else\r
-               dvfs_set_rate(clk, dvfs_clk->set_freq);\r
-       \r
        return 0;\r
 }\r
 \r
@@ -570,7 +543,6 @@ static int rk_regist_clk(struct clk_node *dvfs_clk)
                return -1;\r
        mutex_lock(&mutex);\r
        dvfs_clk->enable_dvfs = 0;\r
-       dvfs_clk->req_freq = 0;\r
        dvfs_clk->vd = dvfs_clk->pds[0].pd->vd;\r
        for (i = 0; dvfs_clk->pds[i].pd != NULL; i++) {\r
                child = &(dvfs_clk->pds[i].clk_list);\r
@@ -756,7 +728,6 @@ int dvfs_target_core(struct clk *clk, unsigned long rate_hz)
                return -1;\r
        }\r
        \r
-       dvfs_clk->req_freq = rate_hz;\r
        /* Check limit rate */\r
        if (dvfs_clk->freq_limit_en) {\r
                if (rate_hz < dvfs_clk->min_rate) {\r
@@ -903,7 +874,6 @@ int dvfs_target_cpu(struct clk *clk, unsigned long rate_hz)
                return -1;\r
        }\r
 \r
-       dvfs_clk->req_freq = rate_hz;\r
        /* Check limit rate */\r
        if (dvfs_clk->freq_limit_en) {\r
                if (rate_hz < dvfs_clk->min_rate) {\r

diff --git a/arch/arm/mach-rk30/include/mach/dvfs.h b/arch/arm/mach-rk30/include/mach/dvfs.h
index 8a984c3e3a5ed8a860ef7b013db26a6e57f20a29..d20eb9954eb73315383dc11f8b8d38554f36ee49 100644 (file)
--- a/arch/arm/mach-rk30/include/mach/dvfs.h
+++ b/arch/arm/mach-rk30/include/mach/dvfs.h
@@ -116,8 +116,7 @@ struct depend_lookup {
  */\r
 struct clk_node {\r
        char                    *name;\r
-       int                     req_freq;       //KHZ, frequency request\r
-       int                     set_freq;       //KHZ, frequency be set\r
+       int                     set_freq;       //KHZ\r
        int                     set_volt;       //MV\r
        int                     enable_dvfs;\r
        int                     freq_limit_en;  //sign if use limit frequency\r
@@ -152,7 +151,7 @@ int dvfs_set_freq_volt_table(struct clk *clk, struct cpufreq_frequency_table *ta
 int dvfs_set_depend_table(struct clk *clk, char *vd_name, struct cpufreq_frequency_table *table);\r
 int dvfs_set_arm_logic_volt(struct dvfs_arm_table *dvfs_cpu_logic_table, struct cpufreq_frequency_table *cpu_dvfs_table, struct cpufreq_frequency_table *dep_cpu2core_table);\r
 struct regulator* dvfs_get_regulator(char *regulator_name);\r
-int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned int max_rate);\r
+int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned max_rate);\r
 int dvfs_clk_disable_limit(struct clk *clk);\r
 \r
 void avs_init(void);\r
@@ -171,7 +170,7 @@ static inline int dvfs_set_freq_volt_table(struct clk *clk, struct cpufreq_frequ
 static inline int dvfs_set_depend_table(struct clk *clk, char *vd_name, struct cpufreq_frequency_table *table) {return 0;}\r
 static inline int dvfs_set_arm_logic_volt(struct dvfs_arm_table *dvfs_cpu_logic_table, struct cpufreq_frequency_table *cpu_dvfs_table, struct cpufreq_frequency_table *dep_cpu2core_table){ return 0; }\r
 static inline struct regulator* dvfs_get_regulator(char *regulator_name){ return NULL; }\r
-static inline int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned int max_rate){ return 0; }\r
+static inline int dvfs_clk_enable_limit(struct clk *clk, unsigned int min_rate, unsigned max_rate){ return 0; }\r
 static inline int dvfs_clk_disable_limit(struct clk *clk){ return 0; };\r
 \r
 static inline void avs_init(void){};\r