Merge tag 'v4.2-next-arm64-2' of https://github.com/mbgg/linux-mediatek into next/arm64

Add SMP support for mt6795 SoC.

* tag 'v4.2-next-arm64-2' of https://github.com/mbgg/linux-mediatek:
  ARM64: dts: mt6795: enable basic SMP bringup for MT6795

Signed-off-by: Olof Johansson <olof@lixom.net>

1 files changed, 13 insertions, 0 deletions

diff --git a/arch/arm64/boot/dts/mediatek/mt6795.dtsi b/arch/arm64/boot/dts/mediatek/mt6795.dtsi
index da200e788936..c85659d0ff5d 100644
--- a/arch/arm64/boot/dts/mediatek/mt6795.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt6795.dtsi
@@ -20,6 +20,11 @@
         #address-cells = <2>;
         #size-cells = <2>;
 
+        psci {
+                compatible = "arm,psci-0.2";
+                method = "smc";
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -27,48 +32,56 @@
                 cpu0: cpu@0 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x000>;
                 };
 
                 cpu1: cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x001>;
                 };
 
                 cpu2: cpu@2 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x002>;
                 };
 
                 cpu3: cpu@3 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x003>;
                 };
 
                 cpu4: cpu@100 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x100>;
                 };
 
                 cpu5: cpu@101 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x101>;
                 };
 
                 cpu6: cpu@102 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x102>;
                 };
 
                 cpu7: cpu@103 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a53";
+                        enable-method = "psci";
                         reg = <0x103>;
                 };
         };