CPUFREQ: delete different cpufreq tables for sm1. [1/1]

PD#SWPL-6205

Problem:
delete different cpufreq tables.

Solution:
delete different cpufreq tables.

Verify:
sm1_ac200, verify pass

Change-Id: I99142d2f99847f45eafc876a1b2d785a28815e15
Signed-off-by: Hong Guo <hong.guo@amlogic.com>

diff --git a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
index 092be31..78e5264 100644 (file)
--- a/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm/boot/dts/amlogic/mesonsm1.dtsi
@@ -1687,46 +1687,52 @@
 
        vddcpu0: pwmao_d-regulator {
                compatible = "pwm-regulator";
-               pwms = <&pwm_AO_cd MESON_PWM_1 1250 0>;
+               pwms = <&pwm_AO_cd MESON_PWM_1 1500 0>;
                regulator-name = "vddcpu0";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
+               regulator-min-microvolt = <690000>;
+               regulator-max-microvolt = <1050000>;
                regulator-always-on;
-               max-duty-cycle = <1250>;
+               max-duty-cycle = <1500>;
                /* Voltage Duty-Cycle */
-               voltage-table = <1022000 0>,
-                       <1011000 3>,
-                       <1001000 6>,
-                       <991000 10>,
-                       <981000 13>,
-                       <971000 16>,
-                       <961000 20>,
-                       <951000 23>,
-                       <941000 26>,
-                       <931000 30>,
-                       <921000 33>,
-                       <911000 36>,
-                       <901000 40>,
-                       <891000 43>,
-                       <881000 46>,
-                       <871000 50>,
-                       <861000 53>,
-                       <851000 56>,
-                       <841000 60>,
-                       <831000 63>,
-                       <821000 67>,
-                       <811000 70>,
-                       <801000 73>,
-                       <791000 76>,
-                       <781000 80>,
-                       <771000 83>,
-                       <761000 86>,
-                       <751000 90>,
-                       <741000 93>,
-                       <731000 96>,
-                       <721000 100>;
+               voltage-table = <1050000 0>,
+                       <1040000 3>,
+                       <1030000 6>,
+                       <1020000 8>,
+                       <1010000 11>,
+                       <1000000 14>,
+                       <990000 17>,
+                       <980000 20>,
+                       <970000 23>,
+                       <960000 26>,
+                       <950000 29>,
+                       <940000 31>,
+                       <930000 34>,
+                       <920000 37>,
+                       <910000 40>,
+                       <900000 43>,
+                       <890000 45>,
+                       <880000 48>,
+                       <870000 51>,
+                       <860000 54>,
+                       <850000 56>,
+                       <840000 59>,
+                       <830000 62>,
+                       <820000 65>,
+                       <810000 68>,
+                       <800000 70>,
+                       <790000 73>,
+                       <780000 76>,
+                       <770000 79>,
+                       <760000 81>,
+                       <750000 84>,
+                       <740000 87>,
+                       <730000 89>,
+                       <720000 92>,
+                       <710000 95>,
+                       <700000 98>,
+                       <690000 100>;
                status = "okay";
-        };
+       };
 
        ddr_bandwidth {
                compatible = "amlogic, ddr-bandwidth";

diff --git a/arch/arm/boot/dts/amlogic/sm1_pxp.dts b/arch/arm/boot/dts/amlogic/sm1_pxp.dts
index 68defec..e20b956 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_pxp.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_pxp.dts
@@ -402,47 +402,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <981000>;
+                       opp-hz = /bits/ 64 <1800000000>;
+                       opp-microvolt = <1010000>;
                };
        };
 

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
index ac23c56..4bcc93b 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -719,163 +719,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-       };
-
-       cpu_opp_table1: cpu_opp_table1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-       };
-
-       cpu_opp_table2: cpu_opp_table2 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-               opp12 {
-                       opp-hz = /bits/ 64 <2016000000>;
-                       opp-microvolt = <1011000>;
-               };
-               opp13 {
-                       opp-hz = /bits/ 64 <2100000000>;
-                       opp-microvolt = <1011000>;
+                       opp-microvolt = <1010000>;
                };
        };
 
@@ -888,50 +772,6 @@
 
 }; /* end of / */
 
-&CPU0 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU1 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU2 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU3 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
 &meson_fb {
        status = "okay";
        display_size_default = <1920 1080 1920 2160 32>;

diff --git a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
index 6ee48b0..80ad0c0 100644 (file)
--- a/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -719,163 +719,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-       };
-
-       cpu_opp_table1: cpu_opp_table1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-       };
-
-       cpu_opp_table2: cpu_opp_table2 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-               opp12 {
-                       opp-hz = /bits/ 64 <2016000000>;
-                       opp-microvolt = <1011000>;
-               };
-               opp13 {
-                       opp-hz = /bits/ 64 <2100000000>;
-                       opp-microvolt = <1011000>;
+                       opp-microvolt = <1010000>;
                };
        };
 
@@ -888,50 +772,6 @@
 
 }; /* end of / */
 
-&CPU0 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU1 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU2 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU3 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
 &meson_fb {
        status = "okay";
        display_size_default = <1920 1080 1920 2160 32>;

diff --git a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
index 6a0bb43..3b28b89 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/mesonsm1.dtsi
@@ -1687,46 +1687,52 @@
 
        vddcpu0: pwmao_d-regulator {
                compatible = "pwm-regulator";
-               pwms = <&pwm_AO_cd MESON_PWM_1 1250 0>;
+               pwms = <&pwm_AO_cd MESON_PWM_1 1500 0>;
                regulator-name = "vddcpu0";
-               regulator-min-microvolt = <721000>;
-               regulator-max-microvolt = <1022000>;
+               regulator-min-microvolt = <690000>;
+               regulator-max-microvolt = <1050000>;
                regulator-always-on;
-               max-duty-cycle = <1250>;
+               max-duty-cycle = <1500>;
                /* Voltage Duty-Cycle */
-               voltage-table = <1022000 0>,
-                       <1011000 3>,
-                       <1001000 6>,
-                       <991000 10>,
-                       <981000 13>,
-                       <971000 16>,
-                       <961000 20>,
-                       <951000 23>,
-                       <941000 26>,
-                       <931000 30>,
-                       <921000 33>,
-                       <911000 36>,
-                       <901000 40>,
-                       <891000 43>,
-                       <881000 46>,
-                       <871000 50>,
-                       <861000 53>,
-                       <851000 56>,
-                       <841000 60>,
-                       <831000 63>,
-                       <821000 67>,
-                       <811000 70>,
-                       <801000 73>,
-                       <791000 76>,
-                       <781000 80>,
-                       <771000 83>,
-                       <761000 86>,
-                       <751000 90>,
-                       <741000 93>,
-                       <731000 96>,
-                       <721000 100>;
+               voltage-table = <1050000 0>,
+                       <1040000 3>,
+                       <1030000 6>,
+                       <1020000 8>,
+                       <1010000 11>,
+                       <1000000 14>,
+                       <990000 17>,
+                       <980000 20>,
+                       <970000 23>,
+                       <960000 26>,
+                       <950000 29>,
+                       <940000 31>,
+                       <930000 34>,
+                       <920000 37>,
+                       <910000 40>,
+                       <900000 43>,
+                       <890000 45>,
+                       <880000 48>,
+                       <870000 51>,
+                       <860000 54>,
+                       <850000 56>,
+                       <840000 59>,
+                       <830000 62>,
+                       <820000 65>,
+                       <810000 68>,
+                       <800000 70>,
+                       <790000 73>,
+                       <780000 76>,
+                       <770000 79>,
+                       <760000 81>,
+                       <750000 84>,
+                       <740000 87>,
+                       <730000 89>,
+                       <720000 92>,
+                       <710000 95>,
+                       <700000 98>,
+                       <690000 100>;
                status = "okay";
-        };
+       };
 
        ddr_bandwidth {
                compatible = "amlogic, ddr-bandwidth";

diff --git a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
index 0bc3a65..07a8e1b 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_pxp.dts
@@ -403,47 +403,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <981000>;
+                       opp-hz = /bits/ 64 <1800000000>;
+                       opp-microvolt = <1010000>;
                };
        };
 

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
index 77153c3..0348807 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_ac200.dts
@@ -717,163 +717,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-       };
-
-       cpu_opp_table1: cpu_opp_table1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-       };
-
-       cpu_opp_table2: cpu_opp_table2 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-               opp12 {
-                       opp-hz = /bits/ 64 <2016000000>;
-                       opp-microvolt = <1011000>;
-               };
-               opp13 {
-                       opp-hz = /bits/ 64 <2100000000>;
-                       opp-microvolt = <1011000>;
+                       opp-microvolt = <1010000>;
                };
        };
 
@@ -886,50 +770,6 @@
 
 }; /* end of / */
 
-&CPU0 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>;
-                       //<&cpu_opp_table1>,
-                       //<&cpu_opp_table2>;
-};
-
-&CPU1 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU2 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU3 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
 &meson_fb {
        status = "okay";
        display_size_default = <1920 1080 1920 2160 32>;

diff --git a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
index 928009c..029569f 100644 (file)
--- a/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
+++ b/arch/arm64/boot/dts/amlogic/sm1_s905d3_skt.dts
@@ -717,163 +717,47 @@
 
                opp00 {
                        opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp01 {
                        opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp02 {
                        opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp03 {
                        opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <750000>;
                };
                opp04 {
                        opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <770000>;
                };
                opp05 {
                        opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
+                       opp-microvolt = <790000>;
                };
                opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
+                       opp-hz = /bits/ 64 <1404000000>;
+                       opp-microvolt = <830000>;
                };
                opp07 {
                        opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
+                       opp-microvolt = <870000>;
                };
                opp08 {
                        opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
+                       opp-microvolt = <890000>;
                };
                opp09 {
                        opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
+                       opp-microvolt = <960000>;
                };
                opp10 {
                        opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-       };
-
-       cpu_opp_table1: cpu_opp_table1 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-       };
-
-       cpu_opp_table2: cpu_opp_table2 {
-               compatible = "operating-points-v2";
-               opp-shared;
-
-               opp00 {
-                       opp-hz = /bits/ 64 <100000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp01 {
-                       opp-hz = /bits/ 64 <250000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp02 {
-                       opp-hz = /bits/ 64 <500000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp03 {
-                       opp-hz = /bits/ 64 <667000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp04 {
-                       opp-hz = /bits/ 64 <1000000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp05 {
-                       opp-hz = /bits/ 64 <1200000000>;
-                       opp-microvolt = <731000>;
-               };
-               opp06 {
-                       opp-hz = /bits/ 64 <1398000000>;
-                       opp-microvolt = <761000>;
-               };
-               opp07 {
-                       opp-hz = /bits/ 64 <1512000000>;
-                       opp-microvolt = <791000>;
-               };
-               opp08 {
-                       opp-hz = /bits/ 64 <1608000000>;
-                       opp-microvolt = <831000>;
-               };
-               opp09 {
-                       opp-hz = /bits/ 64 <1704000000>;
-                       opp-microvolt = <861000>;
-               };
-               opp10 {
-                       opp-hz = /bits/ 64 <1800000000>;
-                       opp-microvolt = <981000>;
-               };
-               opp11 {
-                       opp-hz = /bits/ 64 <1908000000>;
-                       opp-microvolt = <991000>;
-               };
-               opp12 {
-                       opp-hz = /bits/ 64 <2016000000>;
-                       opp-microvolt = <1011000>;
-               };
-               opp13 {
-                       opp-hz = /bits/ 64 <2100000000>;
-                       opp-microvolt = <1011000>;
+                       opp-microvolt = <1010000>;
                };
        };
 
@@ -886,50 +770,6 @@
 
 }; /* end of / */
 
-&CPU0 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>;
-                       //<&cpu_opp_table1>,
-                       //<&cpu_opp_table2>;
-};
-
-&CPU1 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU2 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
-&CPU3 {
-       /*set differents table cpufreq max*/
-       diff_tables_supply;
-       hispeed_cpufreq_max = <2100>;
-       medspeed_cpufreq_max = <1908>;
-       lospeed_cpufreq_max = <1800>;
-       operating-points-v2 = <&cpu_opp_table0>,
-                       <&cpu_opp_table1>,
-                       <&cpu_opp_table2>;
-};
-
 &meson_fb {
        status = "okay";
        display_size_default = <1920 1080 1920 2160 32>;