Merge branch 'CR_2417_CPUIdle_515_mason.huo' into 'jh7110-5.15.y-devel'

[platform/kernel/linux-starfive.git] / arch / riscv / boot / dts / starfive / jh7110.dtsi

diff --git a/arch/riscv/boot/dts/starfive/jh7110.dtsi b/arch/riscv/boot/dts/starfive/jh7110.dtsi
index fdb4a7e..5ff2001 100644 (file)
--- a/arch/riscv/boot/dts/starfive/jh7110.dtsi
+++ b/arch/riscv/boot/dts/starfive/jh7110.dtsi
@@ -85,8 +85,7 @@
                        i-tlb-sets = <1>;
                        i-tlb-size = <40>;
                        mmu-type = "riscv,sv39";
-                       cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
-                            &CLUSTER_RET_0 &CLUSTER_NONRET_0>;
+                       cpu-idle-states = <&CPU_NONRET_0_0>;
                        next-level-cache = <&cachectrl>;
                        riscv,isa = "rv64imac";
                        tlb-split;
@@ -114,8 +113,7 @@
                        i-tlb-sets = <1>;
                        i-tlb-size = <40>;
                        mmu-type = "riscv,sv39";
-                       cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
-                            &CLUSTER_RET_0 &CLUSTER_NONRET_0>;
+                       cpu-idle-states = <&CPU_NONRET_0_0>;
                        next-level-cache = <&cachectrl>;
                        riscv,isa = "rv64imafdc";
                        tlb-split;
@@ -144,8 +142,7 @@
                        i-tlb-sets = <1>;
                        i-tlb-size = <40>;
                        mmu-type = "riscv,sv39";
-                       cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
-                            &CLUSTER_RET_0 &CLUSTER_NONRET_0>;
+                       cpu-idle-states = <&CPU_NONRET_0_0>;
                        next-level-cache = <&cachectrl>;
                        riscv,isa = "rv64imafdc";
                        tlb-split;
@@ -174,8 +171,7 @@
                        i-tlb-sets = <1>;
                        i-tlb-size = <40>;
                        mmu-type = "riscv,sv39";
-                       cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
-                            &CLUSTER_RET_0 &CLUSTER_NONRET_0>;
+                       cpu-idle-states = <&CPU_NONRET_0_0>;
                        next-level-cache = <&cachectrl>;
                        riscv,isa = "rv64imafdc";
                        tlb-split;
@@ -204,8 +200,7 @@
                        i-tlb-sets = <1>;
                        i-tlb-size = <40>;
                        mmu-type = "riscv,sv39";
-                       cpu-idle-states = <&CPU_RET_0_0 &CPU_NONRET_0_0
-                            &CLUSTER_RET_0 &CLUSTER_NONRET_0>;
+                       cpu-idle-states = <&CPU_NONRET_0_0>;
                        next-level-cache = <&cachectrl>;
                        riscv,isa = "rv64imafdc";
                        tlb-split;
@@ -220,42 +215,15 @@
                };
        };
 
-    idle-states {
-        CPU_RET_0_0: cpu-retentive-0-0 {
-            compatible = "starfive,jh7110-idle-state";
-            riscv,sbi-suspend-param = <0x10000000>;
-            entry-latency-us = <20>;
-            exit-latency-us = <40>;
-            min-residency-us = <80>;
-        };
-
-        CPU_NONRET_0_0: cpu-nonretentive-0-0 {
-            compatible = "starfive,jh7110-idle-state";
-            riscv,sbi-suspend-param = <0x90000000>;
-            entry-latency-us = <250>;
-            exit-latency-us = <500>;
-            min-residency-us = <950>;
-        };
-
-        CLUSTER_RET_0: cluster-retentive-0 {
-            compatible = "starfive,jh7110-idle-state";
-            riscv,sbi-suspend-param = <0x11000000>;
-            local-timer-stop;
-            entry-latency-us = <50>;
-            exit-latency-us = <100>;
-            min-residency-us = <250>;
-            wakeup-latency-us = <130>;
-        };
-
-        CLUSTER_NONRET_0: cluster-nonretentive-0 {
-            compatible = "starfive,jh7110-idle-state";
-            riscv,sbi-suspend-param = <0x91000000>;
-            local-timer-stop;
-            entry-latency-us = <600>;
-            exit-latency-us = <1100>;
-            min-residency-us = <2700>;
-            wakeup-latency-us = <1500>;
-        };
+       idle-states {
+               CPU_NONRET_0_0: cpu-nonretentive-0-0 {
+                       compatible = "riscv,idle-state";
+                       riscv,sbi-suspend-param = <0x80000000>;
+                       entry-latency-us = <600>;
+                       exit-latency-us = <1100>;
+                       min-residency-us = <2700>;
+                       wakeup-latency-us = <1500>;
+               };
        };
 
        soc: soc {