ARM: dts: uniphier: switch over to PSCI

Use PSCI for enable-method instead of SoC specific implementation.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>

diff --git a/arch/arm/boot/dts/uniphier-common32.dtsi b/arch/arm/boot/dts/uniphier-common32.dtsi
index be4e3b0514dc3e538ee20fa196167ea5fc9728ff..7fa6edb73e2bbffb38b65c033040b3f64b766058 100644 (file)
--- a/arch/arm/boot/dts/uniphier-common32.dtsi
+++ b/arch/arm/boot/dts/uniphier-common32.dtsi
@@ -45,6 +45,11 @@
 /include/ "skeleton.dtsi"
 
 / {
+       psci {
+               compatible = "arm,psci-0.2";
+               method = "smc";
+       };
+
        clocks {
                refclk: ref {
                        #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/uniphier-ld4.dtsi b/arch/arm/boot/dts/uniphier-ld4.dtsi
index 298fb388c1a33dfc00289419feaf94c1506bda5f..72f8c3579e1636b41960d0e391c6c5a2df3300f3 100644 (file)
--- a/arch/arm/boot/dts/uniphier-ld4.dtsi
+++ b/arch/arm/boot/dts/uniphier-ld4.dtsi
@@ -56,6 +56,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };

diff --git a/arch/arm/boot/dts/uniphier-pro4.dtsi b/arch/arm/boot/dts/uniphier-pro4.dtsi
index fd450f342c494875e61af25fecf8a229fa5ff237..109046d0e41a42347cf67cb76cee29137c2f6fdd 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro4.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro4.dtsi
@@ -51,12 +51,12 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               enable-method = "socionext,uniphier-smp";
 
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -64,6 +64,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <1>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };

diff --git a/arch/arm/boot/dts/uniphier-pro5.dtsi b/arch/arm/boot/dts/uniphier-pro5.dtsi
index 9f9fd8c89b72d33c4fb4da0f68ab8891ad180ed1..ce8e549df94f34bdc20780a28cc3e3832cdf52f8 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pro5.dtsi
+++ b/arch/arm/boot/dts/uniphier-pro5.dtsi
@@ -51,12 +51,12 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               enable-method = "socionext,uniphier-smp";
 
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -64,6 +64,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <1>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };

diff --git a/arch/arm/boot/dts/uniphier-pxs2.dtsi b/arch/arm/boot/dts/uniphier-pxs2.dtsi
index 6d702d2d7757203953ef3457af8b4655a9eccbdf..63c12e8ea029ff489b61e6e78e1a852e4c2b93f2 100644 (file)
--- a/arch/arm/boot/dts/uniphier-pxs2.dtsi
+++ b/arch/arm/boot/dts/uniphier-pxs2.dtsi
@@ -51,12 +51,12 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               enable-method = "socionext,uniphier-smp";
 
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -64,6 +64,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <1>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -71,6 +72,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <2>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -78,6 +80,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <3>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };

diff --git a/arch/arm/boot/dts/uniphier-sld3.dtsi b/arch/arm/boot/dts/uniphier-sld3.dtsi
index f33caf4ef12d615e5903468c9d051a8514b129e7..55f9afa2ee1b64722920b8dbf141df1a2c21f8fe 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld3.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld3.dtsi
@@ -51,12 +51,12 @@
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
-               enable-method = "socionext,uniphier-smp";
 
                cpu@0 {
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
 
@@ -64,10 +64,16 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <1>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };
 
+       psci {
+               compatible = "arm,psci-0.2";
+               method = "smc";
+       };
+
        clocks {
                refclk: ref {
                        #clock-cells = <0>;

diff --git a/arch/arm/boot/dts/uniphier-sld8.dtsi b/arch/arm/boot/dts/uniphier-sld8.dtsi
index 8bab1df6c85407daeaa188d138490268bf10a2e4..6191051ffc66762036a87872c61b7ad39655ecaa 100644 (file)
--- a/arch/arm/boot/dts/uniphier-sld8.dtsi
+++ b/arch/arm/boot/dts/uniphier-sld8.dtsi
@@ -56,6 +56,7 @@
                        device_type = "cpu";
                        compatible = "arm,cortex-a9";
                        reg = <0>;
+                       enable-method = "psci";
                        next-level-cache = <&l2>;
                };
        };