rk312x: update dvfs table, remove gpu 480M

Signed-off-by: 陈亮 <cl@rock-chips.com>

diff --git a/arch/arm/boot/dts/rk3126-86v.dts b/arch/arm/boot/dts/rk3126-86v.dts
index 92abb37946974c8f6f5b1b6ab8b521ffde284871..98cedd303f62c41e203563586cd2293ccdd10247 100644 (file)
--- a/arch/arm/boot/dts/rk3126-86v.dts
+++ b/arch/arm/boot/dts/rk3126-86v.dts
@@ -64,12 +64,7 @@
 
 };
 
-
-
-
 &vd_arm {
-//     regulator_name = "vdd_arm";
-                       
        pd_ddr {
                 clk_ddr {
                        operating-points = <
@@ -99,70 +94,63 @@
                                >;
                        auto-freq=<0>;
                        status="okay";
-                               
-                               };
                        };
+               };
        pd_gpu {
                 clk_gpu {
                        operating-points = <
                                /* KHz    uV */
-                               //200000 1250000
+                               200000 1100000
                                300000 1100000
-                          400000  1150000
-                          480000  1250000
-
+                               400000  1150000
+                               //480000  1250000
                                >;
-
                                status = "okay";
-
-                               };
                        };
-
+               };
        pd_core {
                 clk_core {
                        operating-points = <
                                /* KHz    uV */
-                       216000 1000000
-                       408000 1000000
-                       600000 1100000
-                       696000 1150000
-                       816000 1200000
-                       1008000 1350000
-                       1200000 1425000
-
-
+                               216000 1000000
+                               408000 1000000
+                               600000 1100000
+                               696000 1150000
+                               816000 1200000
+                               1008000 1350000
+                               1200000 1425000
+                               >;
+                       virt-temp-limit-1-cpu-busy = <
+                       /* target-temp  limit-freq */
+                               75      1008000
+                               85      1200000
+                               95      1200000
+                               100     1200000
                                >;
-               virt-temp-limit-1-cpu-busy = <
-               /* target-temp  limit-freq */
-                       75      1008000
-                       85      1200000
-                       95      1200000
-                       100     1200000
-                       >;
-               virt-temp-limit-2-cpu-busy = <
-               /* target-temp  limit-freq */
-                       75      912000
-                       85      1008000
-                       95      1104000
-                       100     1200000
-                       >;
-               virt-temp-limit-3-cpu-busy = <
-               /* target-temp  limit-freq */
-                       75      816000
-                       85      912000
-                       95      100800
-                       100     110400
-                       >;
-               virt-temp-limit-4-cpu-busy = <
-               /* target-temp  limit-freq */
-                       75      816000
-                       85      912000
-                       95      100800
-                       100     110400
-                       >;
-               temp-limit-enable = <1>;
-               target-temp = <85>;
-             };
+                       virt-temp-limit-2-cpu-busy = <
+                       /* target-temp  limit-freq */
+                               75      912000
+                               85      1008000
+                               95      1104000
+                               100     1200000
+                               >;
+                       virt-temp-limit-3-cpu-busy = <
+                       /* target-temp  limit-freq */
+                               75      816000
+                               85      912000
+                               95      100800
+                               100     110400
+                               >;
+                       virt-temp-limit-4-cpu-busy = <
+                       /* target-temp  limit-freq */
+                               75      816000
+                               85      912000
+                               95      100800
+                               100     110400
+                               >;
+                       temp-limit-enable = <1>;
+                       target-temp = <85>;
+               };
         };
 };
 

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index c229c163ffd8eae0e81ab213d3980e482b5bb69c..4ad883e47c54ffbdf3f14696796f7068060a75bc 100755 (executable)
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -130,3 +130,44 @@
                >;
        status="okay";
 };
+
+&clk_gpu_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               200000 950000
+               300000 950000
+               400000 1075000
+               //480000 1175000
+               >;
+       status="okay";
+};
+
+&clk_ddr_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               200000 950000
+               300000 950000
+               400000 1000000
+               533000 1225000
+               >;
+
+       freq-table = <
+               /*status                freq(KHz)*/
+               SYS_STATUS_NORMAL       400000
+               SYS_STATUS_SUSPEND      200000
+               SYS_STATUS_VIDEO_1080P  240000
+               SYS_STATUS_VIDEO_4K     400000
+               SYS_STATUS_PERFORMANCE  528000
+               SYS_STATUS_DUALVIEW     400000
+               SYS_STATUS_BOOST        324000
+               SYS_STATUS_ISP          533000
+               >;
+       auto-freq-table = <
+               240000
+               324000
+               396000
+               528000
+               >;
+       auto-freq=<0>;
+       status="okay";
+};

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 70021769a60c65c9e8baa664f0864a449047ff95..d874220062a879534cca779cb03ee8cf844c83ba 100755 (executable)
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -93,3 +93,60 @@
        status = "okay";
 };
 
+
+&clk_core_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               216000 925000
+               408000 925000
+               600000 950000
+               696000 975000
+               816000 1050000
+               1008000 1175000
+               1200000 1300000
+               1296000 1350000
+               1320000 1375000
+               >;
+       status="okay";
+};
+
+&clk_gpu_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               200000 950000
+               300000 975000
+               400000 1075000
+               //480000 1175000
+               >;
+       status="okay";
+};
+
+&clk_ddr_dvfs_table {
+       operating-points = <
+               /* KHz    uV */
+               200000 950000
+               300000 950000
+               400000 1000000
+               533000 1200000
+               >;
+
+       freq-table = <
+               /*status                freq(KHz)*/
+               SYS_STATUS_NORMAL       400000
+               SYS_STATUS_SUSPEND      200000
+               SYS_STATUS_VIDEO_1080P  240000
+               SYS_STATUS_VIDEO_4K     400000
+               SYS_STATUS_PERFORMANCE  528000
+               SYS_STATUS_DUALVIEW     400000
+               SYS_STATUS_BOOST        324000
+               SYS_STATUS_ISP          533000
+               >;
+       auto-freq-table = <
+               240000
+               324000
+               396000
+               528000
+               >;
+       auto-freq=<0>;
+       status="okay";
+};

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 8f629d3b01d79ec2e28ab936c02adab921e9937b..2978dceb127546e0e7a20596da77022c3da89853 100755 (executable)
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -615,56 +615,6 @@
         };
 
 };
-&clk_core_dvfs_table {
-       operating-points = <
-               /* KHz    uV */
-               408000 1300000
-               600000 1300000
-               696000 1300000
-               816000 1300000
-               1008000 1300000
-               >;
-       status="okay";
-};
-
-&clk_gpu_dvfs_table {
-       operating-points = <
-               /* KHz    uV */
-               200000 1250000
-               300000 1250000
-               >;
-       status="okay";
-};
-
-&clk_ddr_dvfs_table {
-       operating-points = <
-               /* KHz    uV */
-               200000 950000
-               300000 950000
-               400000 1000000
-               533000 1050000
-               >;
-
-       freq-table = <
-               /*status                freq(KHz)*/
-               SYS_STATUS_NORMAL       400000
-               SYS_STATUS_SUSPEND      200000
-               SYS_STATUS_VIDEO_1080P  240000
-               SYS_STATUS_VIDEO_4K     400000
-               SYS_STATUS_PERFORMANCE  528000
-               SYS_STATUS_DUALVIEW     400000
-               SYS_STATUS_BOOST        324000
-               SYS_STATUS_ISP          533000
-               >;
-       auto-freq-table = <
-               240000
-               324000
-               396000
-               528000
-               >;
-       auto-freq=<0>;
-       status="okay";
-};
 
 &pwm0 {
         status = "okay";