ARM64: dts: rk3399: support more frequency for evb2

RK3399 evb2 support A72 1.8G / A53 1.5G.

Change-Id: If3b034b3e2b57e1a867d99593529efc95dd51b66
Signed-off-by: Chen Liang <cl@rock-chips.com>

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
index d00d8ff37ac0d4da3e8121dd7605b082667b9371..35abddaf21956bd6826d62326bc752fb3e5b8670 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2.dtsi
@@ -55,6 +55,140 @@
        };
 };
 
+&cluster0_opp {
+       opp00 {
+               opp-hz = /bits/ 64 <408000000>;
+               opp-microvolt = <800000>;
+               clock-latency-ns = <40000>;
+       };
+       opp01 {
+               opp-hz = /bits/ 64 <600000000>;
+               opp-microvolt = <800000>;
+       };
+       opp02 {
+               opp-hz = /bits/ 64 <816000000>;
+               opp-microvolt = <800000>;
+       };
+       opp03 {
+               opp-hz = /bits/ 64 <1008000000>;
+               opp-microvolt = <875000>;
+       };
+       opp04 {
+               opp-hz = /bits/ 64 <1200000000>;
+               opp-microvolt = <925000>;
+       };
+       opp05 {
+               opp-hz = /bits/ 64 <1416000000>;
+               opp-microvolt = <1025000>;
+       };
+       opp06 {
+               opp-hz = /bits/ 64 <1512000000>;
+               opp-microvolt = <1075000>;
+       };
+};
+
+&cluster1_opp {
+       opp00 {
+               opp-hz = /bits/ 64 <408000000>;
+               opp-microvolt = <800000>;
+               clock-latency-ns = <40000>;
+       };
+       opp01 {
+               opp-hz = /bits/ 64 <600000000>;
+               opp-microvolt = <800000>;
+       };
+       opp02 {
+               opp-hz = /bits/ 64 <816000000>;
+               opp-microvolt = <800000>;
+       };
+       opp03 {
+               opp-hz = /bits/ 64 <1008000000>;
+               opp-microvolt = <850000>;
+       };
+       opp04 {
+               opp-hz = /bits/ 64 <1200000000>;
+               opp-microvolt = <925000>;
+       };
+       opp05 {
+               opp-hz = /bits/ 64 <1416000000>;
+               opp-microvolt = <1025000>;
+       };
+       opp06 {
+               opp-hz = /bits/ 64 <1608000000>;
+               opp-microvolt = <1125000>;
+       };
+       opp07 {
+               opp-hz = /bits/ 64 <1800000000>;
+               opp-microvolt = <1200000>;
+       };
+};
+
+&CPU_COST_A72 {
+       busy-cost-data = <
+               232   349       /*  408MHz */
+               341   547       /*  600MHz */
+               464   794       /*  816MHz */
+               573   1141      /* 1008MHz */
+               683   1850      /* 1200MHz */
+               805   2499      /* 1416MHz */
+               915   2922      /* 1608MHz */
+               1024  3416      /* 1800MHz */
+       >;
+       idle-cost-data = <
+             15
+              0
+       >;
+};
+
+&CPU_COST_A53 {
+       busy-cost-data = <
+               121    40       /*  408M */
+               179    62       /*  600M */
+               243    90       /*  816M */
+               300    126      /* 1008M */
+               357    196      /* 1200M */
+               421    246      /* 1416M */
+               449    263      /* 1512M */
+       >;
+       idle-cost-data = <
+             6
+             0
+       >;
+};
+
+&CLUSTER_COST_A72 {
+       busy-cost-data = <
+               232   349       /*  408MHz */
+               341   547       /*  600MHz */
+               464   794       /*  816MHz */
+               573   1141      /* 1008MHz */
+               683   1850      /* 1200MHz */
+               805   2499      /* 1416MHz */
+               915   2922      /* 1608MHz */
+               1024  3416      /* 1800MHz */
+       >;
+       idle-cost-data = <
+                65
+                65
+       >;
+};
+
+&CLUSTER_COST_A53 {
+       busy-cost-data = <
+               121    40       /*  408M */
+               179    62       /*  600M */
+               243    90       /*  816M */
+               300    126      /* 1008M */
+               357    196      /* 1200M */
+               421    246      /* 1416M */
+               449    263      /* 1512M */
+       >;
+       idle-cost-data = <
+               56
+               56
+       >;
+};
+
 &i2c0 {
        vdd_cpu_b: syr827@40 {
                compatible = "silergy,syr827";

diff --git a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi
index dd66bfa2b3c22f1525f5f88f8d50d10516fc4c23..5b09347a32f54da9582dd0c42458a471fefd9652 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3399-sched-energy.dtsi
@@ -79,14 +79,14 @@
 energy-costs {
        CPU_COST_A72: core-cost0 {
                busy-cost-data = <
-                       232   349
-                       341   547
-                       464   794
-                       573   1141
-                       683   1850
-               //      805   2499
-               //      915   2922
-               //      1024  3416
+                       232   349       /*  408MHz */
+                       341   547       /*  600MHz */
+                       464   794       /*  816MHz */
+                       573   1141      /* 1008MHz */
+                       683   1850      /* 1200MHz */
+               //      805   2499      /* 1416MHz */
+               //      915   2922      /* 1608MHz */
+               //      1024  3416      /* 1800MHz */
                >;
                idle-cost-data = <
                      15
@@ -95,12 +95,13 @@ energy-costs {
        };
        CPU_COST_A53: core-cost1 {
                busy-cost-data = <
-                       121    40
-                       179    62
-                       243    90
-                       300    126
-                       357    196
-                       421    246
+                       121    40       /*  408M */
+                       179    62       /*  600M */
+                       243    90       /*  816M */
+                       300    126      /* 1008M */
+                       357    196      /* 1200M */
+                       421    246      /* 1416M */
+               //      449    263      /* 1512M */
                >;
                idle-cost-data = <
                      6
@@ -109,11 +110,14 @@ energy-costs {
        };
        CLUSTER_COST_A72: cluster-cost0 {
                busy-cost-data = <
-                       417    24
-                       579    32
-                       744    43
-                       883    49
-                      1024    64
+                       232   349       /*  408MHz */
+                       341   547       /*  600MHz */
+                       464   794       /*  816MHz */
+                       573   1141      /* 1008MHz */
+                       683   1850      /* 1200MHz */
+               //      805   2499      /* 1416MHz */
+               //      915   2922      /* 1608MHz */
+               //      1024  3416      /* 1800MHz */
                >;
                idle-cost-data = <
                         65
@@ -122,11 +126,13 @@ energy-costs {
        };
        CLUSTER_COST_A53: cluster-cost1 {
                busy-cost-data = <
-                       235    26
-                       303    30
-                       368    39
-                       406    47
-                       447    57
+                       121    40       /*  408M */
+                       179    62       /*  600M */
+                       243    90       /*  816M */
+                       300    126      /* 1008M */
+                       357    196      /* 1200M */
+                       421    246      /* 1416M */
+               //      449    263      /* 1512M */
                >;
                idle-cost-data = <
                        56