Merge branch 'akpm' (patches from Andrew)

[sfrench/cifs-2.6.git] / arch / arm64 / boot / dts / hisilicon / hip06.dtsi

diff --git a/arch/arm64/boot/dts/hisilicon/hip06.dtsi b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
index d78a6a755d03dfb1c2ac6ffacd1a990fec9fa7b8..56625587b6deda74dd1c1b41c2d34bcd94d1847b 100644 (file)
--- a/arch/arm64/boot/dts/hisilicon/hip06.dtsi
+++ b/arch/arm64/boot/dts/hisilicon/hip06.dtsi
@@ -87,7 +87,7 @@
 
                cpu0: cpu@10000 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10000>;
                        enable-method = "psci";
                        next-level-cache = <&cluster0_l2>;
@@ -95,7 +95,7 @@
 
                cpu1: cpu@10001 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10001>;
                        enable-method = "psci";
                        next-level-cache = <&cluster0_l2>;
@@ -103,7 +103,7 @@
 
                cpu2: cpu@10002 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10002>;
                        enable-method = "psci";
                        next-level-cache = <&cluster0_l2>;
@@ -111,7 +111,7 @@
 
                cpu3: cpu@10003 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10003>;
                        enable-method = "psci";
                        next-level-cache = <&cluster0_l2>;
@@ -119,7 +119,7 @@
 
                cpu4: cpu@10100 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10100>;
                        enable-method = "psci";
                        next-level-cache = <&cluster1_l2>;
@@ -127,7 +127,7 @@
 
                cpu5: cpu@10101 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10101>;
                        enable-method = "psci";
                        next-level-cache = <&cluster1_l2>;
@@ -135,7 +135,7 @@
 
                cpu6: cpu@10102 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10102>;
                        enable-method = "psci";
                        next-level-cache = <&cluster1_l2>;
@@ -143,7 +143,7 @@
 
                cpu7: cpu@10103 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10103>;
                        enable-method = "psci";
                        next-level-cache = <&cluster1_l2>;
@@ -151,7 +151,7 @@
 
                cpu8: cpu@10200 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10200>;
                        enable-method = "psci";
                        next-level-cache = <&cluster2_l2>;
@@ -159,7 +159,7 @@
 
                cpu9: cpu@10201 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10201>;
                        enable-method = "psci";
                        next-level-cache = <&cluster2_l2>;
@@ -167,7 +167,7 @@
 
                cpu10: cpu@10202 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10202>;
                        enable-method = "psci";
                        next-level-cache = <&cluster2_l2>;
@@ -175,7 +175,7 @@
 
                cpu11: cpu@10203 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10203>;
                        enable-method = "psci";
                        next-level-cache = <&cluster2_l2>;
@@ -183,7 +183,7 @@
 
                cpu12: cpu@10300 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10300>;
                        enable-method = "psci";
                        next-level-cache = <&cluster3_l2>;
@@ -191,7 +191,7 @@
 
                cpu13: cpu@10301 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10301>;
                        enable-method = "psci";
                        next-level-cache = <&cluster3_l2>;
@@ -199,7 +199,7 @@
 
                cpu14: cpu@10302 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10302>;
                        enable-method = "psci";
                        next-level-cache = <&cluster3_l2>;
@@ -207,7 +207,7 @@
 
                cpu15: cpu@10303 {
                        device_type = "cpu";
-                       compatible = "arm,cortex-a57", "arm,armv8";
+                       compatible = "arm,cortex-a57";
                        reg = <0x10303>;
                        enable-method = "psci";
                        next-level-cache = <&cluster3_l2>;