Skip to content

Commit

Permalink
msm8953: Remove custom frequencies
Browse files Browse the repository at this point in the history 
Let it stock as CAF and Xiaomi do

This will revert:
271b3f6 MSM8953: enable 480MHz and 307MHz as lower freq
5e530ab arm64: dts: overclocking - Add additional frequencies and voltages to speed bins 0 and 2
c7a3e03 arm64: dts: overclocking - Add additional voltage corners to speed bin 2
74af8c8 drivers: cpufreq: Introduce new kernel config to toggle msm8953 overclocking
325459e drivers: cpufreq: overclocking with cmdline option
  • Loading branch information
@khusika
khusika committed Jun 15, 2018
1 parent eaf2491 commit 88f3d2f
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 73 deletions.
48 changes: 24 additions & 24 deletions arch/arm/boot/dts/qcom/msm8953-regulator.dtsi
View file
Expand Up @@ -400,7 +400,7 @@
qcom,cpr-fuse-combos = <64>;
qcom,cpr-speed-bins = <8>;
qcom,cpr-speed-bin-corners =
<9 0 9 0 0 0 7 9>;
<9 0 7 0 0 0 7 9>;
qcom,cpr-corners =
/* Speed bin 0 */
<9 9 9 9 9 9 9 9>,
Expand All @@ -409,7 +409,7 @@
<0 0 0 0 0 0 0 0>,

/* Speed bin 2 */
<9 9 9 9 9 9 9 9>,
<7 7 7 7 7 7 7 7>,

/* Speed bin 3..5 */
<0 0 0 0 0 0 0 0>,
Expand Down Expand Up @@ -450,7 +450,7 @@

/* Speed bin 2 */
<715000 790000 860000 865000 920000
990000 1065000 1065000 1065000>,
990000 1065000>,

/* Speed bin 6 */
<715000 790000 860000 865000 920000
Expand All @@ -467,7 +467,7 @@

/* Speed bin 2 */
<500000 500000 500000 500000 500000
500000 500000 500000 500000>,
500000 500000>,

/* Speed bin 6 */
<500000 500000 500000 500000 500000
Expand Down Expand Up @@ -498,21 +498,21 @@

/* Speed bin 2; CPR rev 0..7 */
< 0 0 0 0 0
0 0 0 0>,
0 0>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,
<50000 50000 50000 50000 50000
50000 50000 50000 50000>,
50000 50000>,

/* Speed bin 6; CPR rev 0..7 */
< 0 0 0 0 0
Expand Down Expand Up @@ -559,9 +559,9 @@

/* Speed bin 2; misc fuse 0..1 */
< 0 0 0 0 0
0 0 0 0>,
0 0>,
< 0 0 30000 0 0
0 0 0 0>,
0 0>,

/* Speed bin 6; misc fuse 0..1 */
< 0 0 0 0 0
Expand All @@ -580,7 +580,7 @@
<1 1 2 2 2 2 2 2 2>,

/* Speed bin 2 */
<1 1 2 2 2 2 2 2 2>,
<1 1 2 2 2 2 2>,

/* Speed bin 6 */
<1 1 2 2 2 2 2>,
Expand All @@ -597,7 +597,7 @@
/* Speed bin 2 */
<652800000 1036800000 1401600000
1689600000 1804800000 1958400000
2016000000 2150400000 2208000000>,
2016000000>,

/* Speed bin 6 */
<652800000 1036800000 1401600000
Expand Down Expand Up @@ -797,14 +797,14 @@
<1 1 1 1 0 0 0 0 0>,

/* Speed bin 2; CPR rev 0..7 */
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<1 1 1 1 0 0 0 0 0>,
<0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0>,
<0 0 0 0 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,
<1 1 1 1 0 0 0>,

/* Speed bin 6; CPR rev 0..7 */
<0 0 0 0 0 0 0>,
Expand Down
34 changes: 5 additions & 29 deletions arch/arm/boot/dts/qcom/msm8953.dtsi
View file
Expand Up @@ -938,12 +938,7 @@
< 1689600000 4>,
< 1804800000 5>,
< 1958400000 6>,
< 2016000000 7>,
< 2150400000 8>,
< 2208000000 9>,
< 307200000 1>,
< 480000000 1>;

< 2016000000 7>;
qcom,speed0-bin-v0-cci =
< 0 0>,
< 261120000 1>,
Expand All @@ -952,10 +947,7 @@
< 675840000 4>,
< 721920000 5>,
< 783360000 6>,
< 806400000 7>,
< 860160000 8>,
< 883200000 9>;

< 806400000 7>;
qcom,speed2-bin-v0-cl =
< 0 0>,
< 652800000 1>,
Expand All @@ -964,12 +956,7 @@
< 1689600000 4>,
< 1804800000 5>,
< 1958400000 6>,
< 2016000000 7>,
< 2150400000 8>,
< 2208000000 9>,
< 307200000 1>,
< 480000000 1>;

< 2016000000 7>;
qcom,speed2-bin-v0-cci =
< 0 0>,
< 261120000 1>,
Expand All @@ -978,10 +965,7 @@
< 675840000 4>,
< 721920000 5>,
< 783360000 6>,
< 806400000 7>,
< 860160000 8>,
< 883200000 9>;

< 806400000 7>;
qcom,speed7-bin-v0-cl =
< 0 0>,
< 652800000 1>,
Expand All @@ -991,8 +975,6 @@
< 1804800000 5>,
< 1958400000 6>,
< 2016000000 7>,
< 307200000 1>,
< 480000000 1>,
< 2150400000 8>,
< 2208000000 9>;
qcom,speed7-bin-v0-cci =
Expand All @@ -1012,9 +994,7 @@
< 1036800000 2>,
< 1401600000 3>,
< 1689600000 4>,
< 1804800000 5>,
< 307200000 1>,
< 480000000 1>;
< 1804800000 5>;
qcom,speed6-bin-v0-cci =
< 0 0>,
< 261120000 1>,
Expand All @@ -1041,8 +1021,6 @@
<&clock_cpu clk_a53_pwr_clk>;

qcom,cpufreq-table =
< 307200 >,
< 480000 >,
< 652800 >,
< 1036800 >,
< 1401600 >,
Expand Down Expand Up @@ -1105,8 +1083,6 @@
cpubw-cpufreq {
target-dev = <&cpubw>;
cpu-to-dev-map =
< 307200 1611>,
< 480000 1611>,
< 652800 1611>,
< 1036800 3221>,
< 1401600 5859>,
Expand Down
8 changes: 0 additions & 8 deletions drivers/cpufreq/Kconfig.arm
View file
Expand Up @@ -254,11 +254,3 @@ config CPU_FREQ_MSM
default y
help
This enables the CPUFreq driver for Qualcomm CPUs.

config CPU_FREQ_MSM_OVERCLOCK_MSM8953
bool "Overclock the MSM8953 soc"
default n
help
Allow overclocking of the MSM8953 platform. Up to 2.2 GHz.

If in doubt, say N.
12 changes: 0 additions & 12 deletions drivers/cpufreq/qcom-cpufreq.c
View file
Expand Up @@ -29,10 +29,6 @@
#include <linux/of.h>
#include <trace/events/power.h>

#ifndef CONFIG_CPU_FREQ_MSM_OVERCLOCK_MSM8953
static const unsigned long arg_cpu_max_c1 = 2016000;
#endif

static DEFINE_MUTEX(l2bw_lock);

static struct clk *cpu_clk[NR_CPUS];
Expand Down Expand Up @@ -437,14 +433,6 @@ static struct cpufreq_frequency_table *cpufreq_parse_dt(struct device *dev,
if (i > 0 && f <= ftbl[i-1].frequency)
break;

#ifndef CONFIG_CPU_FREQ_MSM_OVERCLOCK_MSM8953
//Custom max freq
if (f > arg_cpu_max_c1) {
nf = i;
break;
}
#endif

ftbl[i].driver_data = i;
ftbl[i].frequency = f;
}
Expand Down

0 comments on commit 88f3d2f

Please sign in to comment.