X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=target%2Flinux%2Fipq806x%2Fpatches-4.14%2F0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch;h=f3e79b2178270287afb2474214df62db48548f38;hp=166964961baa627f9f074c867f6f80272eb2a555;hb=bc0ca20ca90e4d58090392c96b6d8d6405444268;hpb=93dd2f7211db6607184adadb488582e01fd5c29b

diff --git a/target/linux/ipq806x/patches-4.14/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch b/target/linux/ipq806x/patches-4.14/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch
index 166964961b..f3e79b2178 100644
--- a/target/linux/ipq806x/patches-4.14/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch
+++ b/target/linux/ipq806x/patches-4.14/0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch
@@ -11,16 +11,16 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 
 --- a/drivers/cpufreq/cpufreq-dt.c
 +++ b/drivers/cpufreq/cpufreq-dt.c
-@@ -48,11 +48,41 @@ static int set_target(struct cpufreq_pol
-	struct private_data *priv = policy->driver_data;
-	int ret;
-	unsigned long target_freq = policy->freq_table[index].frequency * 1000;
+@@ -49,11 +49,42 @@ static int set_target(struct cpufreq_pol
+ 	struct private_data *priv = policy->driver_data;
+ 	int ret;
+ 	unsigned long target_freq = policy->freq_table[index].frequency * 1000;
 +	struct clk *l2_clk = policy->l2_clk;
 +	unsigned int l2_freq;
 +	unsigned long new_l2_freq = 0;
-
-	mutex_lock(&priv->lock);
-	ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq);
+ 
+ 	mutex_lock(&priv->lock);
+ 	ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq);
 -	if (!ret)
 +
 +	if (!ret) {
@@ -43,30 +43,31 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 +			l2_freq = clk_get_rate(l2_clk);
 +
 +			if (l2_freq != new_l2_freq) {
++				ret = clk_set_rate(l2_clk, policy->l2_rate[0]);
 +				/* scale l2 with the core */
 +				ret = clk_set_rate(l2_clk, new_l2_freq);
 +			}
 +		}
 +
-		priv->opp_freq = target_freq;
+ 		priv->opp_freq = target_freq;
 +	}
 +
-	mutex_unlock(&priv->lock);
-
-	return ret;
-@@ -196,6 +226,8 @@ static int cpufreq_init(struct cpufreq_p
-	const char *name;
-	int ret;
-	struct srcu_notifier_head *opp_srcu_head;
+ 	mutex_unlock(&priv->lock);
+ 
+ 	return ret;
+@@ -197,6 +227,8 @@ static int cpufreq_init(struct cpufreq_p
+ 	const char *name;
+ 	int ret;
+ 	struct srcu_notifier_head *opp_srcu_head;
 +	struct device_node *l2_np;
 +	struct clk *l2_clk = NULL;
-
-	cpu_dev = get_cpu_device(policy->cpu);
-	if (!cpu_dev) {
-@@ -303,6 +335,13 @@ static int cpufreq_init(struct cpufreq_p
-
-	policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000;
-
+ 
+ 	cpu_dev = get_cpu_device(policy->cpu);
+ 	if (!cpu_dev) {
+@@ -305,6 +337,13 @@ static int cpufreq_init(struct cpufreq_p
+ 
+ 	policy->suspend_freq = dev_pm_opp_get_suspend_opp_freq(cpu_dev) / 1000;
+ 
 +	l2_clk = clk_get(cpu_dev, "l2");
 +	if (!IS_ERR(l2_clk))
 +		policy->l2_clk = l2_clk;
@@ -74,17 +75,17 @@ Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
 +	if (l2_np)
 +		of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3);
 +
-	ret = cpufreq_table_validate_and_show(policy, freq_table);
-	if (ret) {
-		dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__,
+ 	ret = cpufreq_table_validate_and_show(policy, freq_table);
+ 	if (ret) {
+ 		dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__,
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
 @@ -73,6 +73,8 @@ struct cpufreq_policy {
-	unsigned int		cpu;    /* cpu managing this policy, must be online */
-
-	struct clk		*clk;
+ 	unsigned int		cpu;    /* cpu managing this policy, must be online */
+ 
+ 	struct clk		*clk;
 +	struct clk		*l2_clk; /* L2 clock */
 +	unsigned int		l2_rate[3]; /* L2 bus clock rate thresholds */
-	struct cpufreq_cpuinfo	cpuinfo;/* see above */
-
-	unsigned int		min;    /* in kHz */
+ 	struct cpufreq_cpuinfo	cpuinfo;/* see above */
+ 
+ 	unsigned int		min;    /* in kHz */