| From e757a6ee3e6fc1583b12b156588e8583f798d35c Mon Sep 17 00:00:00 2001 |
| From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| Date: Thu, 18 Apr 2013 18:31:35 +0100 |
| Subject: ARM: dts: at91: cpus/cpu node dts updates |
| |
| From: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com> |
| |
| 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> |
| |
| --- |
| arch/arm/boot/dts/at91rm9200.dtsi | 6 +++++- |
| arch/arm/boot/dts/at91sam9260.dtsi | 8 ++++++-- |
| arch/arm/boot/dts/at91sam9263.dtsi | 8 ++++++-- |
| arch/arm/boot/dts/at91sam9g45.dtsi | 8 ++++++-- |
| arch/arm/boot/dts/at91sam9n12.dtsi | 8 ++++++-- |
| arch/arm/boot/dts/at91sam9x5.dtsi | 8 ++++++-- |
| arch/arm/boot/dts/sama5d3.dtsi | 2 ++ |
| 7 files changed, 37 insertions(+), 11 deletions(-) |
| |
| --- a/arch/arm/boot/dts/at91rm9200.dtsi |
| +++ b/arch/arm/boot/dts/at91rm9200.dtsi |
| @@ -35,8 +35,12 @@ |
| ssc2 = &ssc2; |
| }; |
| cpus { |
| - cpu@0 { |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| compatible = "arm,arm920t"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/at91sam9260.dtsi |
| +++ b/arch/arm/boot/dts/at91sam9260.dtsi |
| @@ -32,8 +32,12 @@ |
| ssc0 = &ssc0; |
| }; |
| cpus { |
| - cpu@0 { |
| - compatible = "arm,arm926ejs"; |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| + compatible = "arm,arm926ej-s"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/at91sam9263.dtsi |
| +++ b/arch/arm/boot/dts/at91sam9263.dtsi |
| @@ -29,8 +29,12 @@ |
| ssc1 = &ssc1; |
| }; |
| cpus { |
| - cpu@0 { |
| - compatible = "arm,arm926ejs"; |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| + compatible = "arm,arm926ej-s"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/at91sam9g45.dtsi |
| +++ b/arch/arm/boot/dts/at91sam9g45.dtsi |
| @@ -35,8 +35,12 @@ |
| ssc1 = &ssc1; |
| }; |
| cpus { |
| - cpu@0 { |
| - compatible = "arm,arm926ejs"; |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| + compatible = "arm,arm926ej-s"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/at91sam9n12.dtsi |
| +++ b/arch/arm/boot/dts/at91sam9n12.dtsi |
| @@ -31,8 +31,12 @@ |
| ssc0 = &ssc0; |
| }; |
| cpus { |
| - cpu@0 { |
| - compatible = "arm,arm926ejs"; |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| + compatible = "arm,arm926ej-s"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/at91sam9x5.dtsi |
| +++ b/arch/arm/boot/dts/at91sam9x5.dtsi |
| @@ -33,8 +33,12 @@ |
| ssc0 = &ssc0; |
| }; |
| cpus { |
| - cpu@0 { |
| - compatible = "arm,arm926ejs"; |
| + #address-cells = <0>; |
| + #size-cells = <0>; |
| + |
| + cpu { |
| + compatible = "arm,arm926ej-s"; |
| + device_type = "cpu"; |
| }; |
| }; |
| |
| --- a/arch/arm/boot/dts/sama5d3.dtsi |
| +++ b/arch/arm/boot/dts/sama5d3.dtsi |
| @@ -36,7 +36,9 @@ |
| }; |
| cpus { |
| cpu@0 { |
| + device_type = "cpu"; |
| compatible = "arm,cortex-a5"; |
| + reg = <0x0>; |
| }; |
| }; |
| |