aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorLorenzo Pieralisi <lorenzo.pieralisi@arm.com>2013-04-18 13:31:35 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-09-26 20:18:02 -0400
commit0fc9593a11f12e1c8cbe28cecf7a0ef3b2797822 (patch)
tree3dbda1b075b16e2a32afbf3fb500dee0b17d5854 /arch/arm/boot
parent736899ab702dc85345217e124686b661a56ecb6a (diff)
ARM: dts: at91: cpus/cpu node dts updates
commit e757a6ee3e6fc1583b12b156588e8583f798d35c upstream. This patch updates the in-kernel dts files according to the latest cpus and cpu bindings updates for ARM. Signed-off-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/at91rm9200.dtsi6
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi8
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi8
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi8
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi8
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi8
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi2
7 files changed, 37 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 5d3ed5aafc69..0af879a4eafa 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -35,8 +35,12 @@
35 ssc2 = &ssc2; 35 ssc2 = &ssc2;
36 }; 36 };
37 cpus { 37 cpus {
38 cpu@0 { 38 #address-cells = <0>;
39 #size-cells = <0>;
40
41 cpu {
39 compatible = "arm,arm920t"; 42 compatible = "arm,arm920t";
43 device_type = "cpu";
40 }; 44 };
41 }; 45 };
42 46
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 43a18f74cddb..0dbdb846f90a 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -32,8 +32,12 @@
32 ssc0 = &ssc0; 32 ssc0 = &ssc0;
33 }; 33 };
34 cpus { 34 cpus {
35 cpu@0 { 35 #address-cells = <0>;
36 compatible = "arm,arm926ejs"; 36 #size-cells = <0>;
37
38 cpu {
39 compatible = "arm,arm926ej-s";
40 device_type = "cpu";
37 }; 41 };
38 }; 42 };
39 43
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 94b58ab2cc08..fcd38f89904e 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -29,8 +29,12 @@
29 ssc1 = &ssc1; 29 ssc1 = &ssc1;
30 }; 30 };
31 cpus { 31 cpus {
32 cpu@0 { 32 #address-cells = <0>;
33 compatible = "arm,arm926ejs"; 33 #size-cells = <0>;
34
35 cpu {
36 compatible = "arm,arm926ej-s";
37 device_type = "cpu";
34 }; 38 };
35 }; 39 };
36 40
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index bf18a735c37d..479a0622cdb8 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -35,8 +35,12 @@
35 ssc1 = &ssc1; 35 ssc1 = &ssc1;
36 }; 36 };
37 cpus { 37 cpus {
38 cpu@0 { 38 #address-cells = <0>;
39 compatible = "arm,arm926ejs"; 39 #size-cells = <0>;
40
41 cpu {
42 compatible = "arm,arm926ej-s";
43 device_type = "cpu";
40 }; 44 };
41 }; 45 };
42 46
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 8d25f889928e..a92ec78349a2 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -31,8 +31,12 @@
31 ssc0 = &ssc0; 31 ssc0 = &ssc0;
32 }; 32 };
33 cpus { 33 cpus {
34 cpu@0 { 34 #address-cells = <0>;
35 compatible = "arm,arm926ejs"; 35 #size-cells = <0>;
36
37 cpu {
38 compatible = "arm,arm926ej-s";
39 device_type = "cpu";
36 }; 40 };
37 }; 41 };
38 42
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index b5833d1f7cff..2b2b6923d16b 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -33,8 +33,12 @@
33 ssc0 = &ssc0; 33 ssc0 = &ssc0;
34 }; 34 };
35 cpus { 35 cpus {
36 cpu@0 { 36 #address-cells = <0>;
37 compatible = "arm,arm926ejs"; 37 #size-cells = <0>;
38
39 cpu {
40 compatible = "arm,arm926ej-s";
41 device_type = "cpu";
38 }; 42 };
39 }; 43 };
40 44
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 5000e0d42849..ea324767f7e7 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -36,7 +36,9 @@
36 }; 36 };
37 cpus { 37 cpus {
38 cpu@0 { 38 cpu@0 {
39 device_type = "cpu";
39 compatible = "arm,cortex-a5"; 40 compatible = "arm,cortex-a5";
41 reg = <0x0>;
40 }; 42 };
41 }; 43 };
42 44