rk3368: add dvfs config

Signed-off-by: Xiao Feng <xf@rock-chips.com>

diff --git a/arch/arm/mach-rockchip/dvfs.c b/arch/arm/mach-rockchip/dvfs.c
index c6d70c03c6edcbe4619157c0a4a3d6d4c6aa8074..f5679cd0723bd55d7709f2bc4b1467eceb19aad8 100644 (file)
--- a/arch/arm/mach-rockchip/dvfs.c
+++ b/arch/arm/mach-rockchip/dvfs.c
@@ -2188,6 +2188,10 @@ int of_dvfs_init(void)
        return 0;
 }
 
+#ifdef CONFIG_ARM64
+arch_initcall_sync(of_dvfs_init);
+#endif
+
 /*********************************************************************************/
 /**
  * dump_dbg_map() : Draw all informations of dvfs while debug

diff --git a/arch/arm64/boot/dts/rk3368-tb_8846.dts b/arch/arm64/boot/dts/rk3368-tb_8846.dts
index 2895e54a3be18c8e667a3965808d13ade1cc12b1..b488dbd91f3a4d2e9ac207e7aa39482a78be0b12 100644 (file)
--- a/arch/arm64/boot/dts/rk3368-tb_8846.dts
+++ b/arch/arm64/boot/dts/rk3368-tb_8846.dts
@@ -650,55 +650,6 @@
         status = "okay";
 };
 
-&clk_core_dvfs_table {
-       operating-points = <
-               /* KHz    uV */
-               126000 900000
-               216000 900000
-               312000 900000
-               408000 900000
-               600000 900000
-               696000 950000
-               816000 1000000
-               1008000 1050000
-               1200000 1100000
-               1416000 1200000
-               1512000 1300000
-               1608000 1350000
-       //      1704000 1350000
-       //      1800000 1400000
-               >;
-        support-pvtm = <1>;
-        pvtm-operating-points = <
-                /* KHz    uV    margin(uV)*/
-                126000 900000   25000
-                216000 900000   25000
-                312000 900000   25000
-                408000 900000   25000
-                600000 900000   25000
-                696000 950000   25000
-                816000 1000000  25000
-                1008000 1050000 25000
-                1200000 1100000 25000
-                1416000 1200000 25000
-                1512000 1300000 25000
-                1608000 1350000 25000
-                >;
-       status="okay";
-};
-
-&clk_gpu_dvfs_table {
-       operating-points = <
-               /* KHz    uV */
-               100000 900000
-               200000 900000
-               300000 950000
-               420000 1050000
-               500000 1150000
-               >;
-       status="okay";
-};
-
 &clk_ddr_dvfs_table {
        operating-points = <
                /* KHz    uV */

diff --git a/arch/arm64/boot/dts/rk3368.dtsi b/arch/arm64/boot/dts/rk3368.dtsi
index 1fc965d295480e8a46d9ca86b6fd65e04dafe724..d9e275af6250e1700be992877b4ea585b34a3e69 100755 (executable)
--- a/arch/arm64/boot/dts/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rk3368.dtsi
@@ -879,35 +879,25 @@
                        regulator_name = "vdd_arm";
                        suspend_volt = <1000>; //mV
                        pd_core {
-                               clk_core_dvfs_table: clk_core {
+                               clk_core_b_dvfs_table: clk_core_b {
                                        operating-points = <
                                                /* KHz    uV */
-                                               312000 1100000
-                                               504000 1100000
-                                               816000 1100000
-                                               1008000 1100000
+                                               312000 1200000
+                                               504000 1200000
+                                               816000 1200000
+                                               1008000 1200000
                                                >;
-                                       channel = <0>;
-                                       temp-limit-enable = <0>;
-                                       target-temp = <80>;
-                                       normal-temp-limit = <
-                                       /*delta-temp    delta-freq*/
-                                               3       96000
-                                               6       144000
-                                               9       192000
-                                               15      384000
-                                               >;
-                                       performance-temp-limit = <
-                                               /*temp    freq*/
-                                               100     816000
+                                       status = "okay";
+                               };
+                               clk_core_l_dvfs_table: clk_core_l {
+                                       operating-points = <
+                                               /* KHz    uV */
+                                               312000 1200000
+                                               504000 1200000
+                                               816000 1200000
+                                               1008000 1200000
                                                >;
                                        status = "okay";
-                                       regu-mode-table = <
-                                               /*freq     mode*/
-                                               1008000    4
-                                               0          3
-                                       >;
-                                       regu-mode-en = <0>;
                                };
                        };
                };
@@ -928,21 +918,6 @@
                                };
                        };
 
-                       pd_vio {
-                               aclk_vio1_dvfs_table: aclk_vio1 {
-                                       operating-points = <
-                                               /* KHz    uV */
-                                               100000 1100000
-                                               500000 1100000
-                                               >;
-                                       status = "okay";
-                               };
-                       };
-               };
-
-               vd_gpu: vd_gpu {
-                       regulator_name = "vdd_gpu";
-                       suspend_volt = <1000>; //mV
                        pd_gpu {
                                clk_gpu_dvfs_table: clk_gpu {
                                        operating-points = <