[POWERPC] 4xx: Rename CPU nodes to avoid dtc incompatibility

Recent DTC versions disallow certain special characters in full paths without
being quoted with {}.  That however breaks compatibility with older DTC
versions.  Work around this by renaming the CPU nodes for the 4xx files to a
generic node name, and specify the processor type in the model property of the
CPU node.

Signed-off-by: Josh Boyer <jwboyer@linux.vnet.ibm.com>

diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 03f5d94..51ada46 100644 (file)
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -16,14 +16,15 @@
        #size-cells = <1>;
        model = "amcc,bamboo";
        compatible = "amcc,bamboo";
-       dcr-parent = <&/cpus/PowerPC,440EP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440EP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440EP";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */

diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 331c424..3cb2849 100644 (file)
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -16,14 +16,15 @@
        #size-cells = <1>;
        model = "ibm,ebony";
        compatible = "ibm,ebony";
-       dcr-parent = <&/cpus/PowerPC,440GP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440GP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440GP";
                        reg = <0>;
                        clock-frequency = <0>; // Filled in by zImage
                        timebase-frequency = <0>; // Filled in by zImage

diff --git a/arch/powerpc/boot/dts/ep405.dts b/arch/powerpc/boot/dts/ep405.dts
index 007f3c2..16cfc0d 100644 (file)
--- a/arch/powerpc/boot/dts/ep405.dts
+++ b/arch/powerpc/boot/dts/ep405.dts
@@ -14,14 +14,15 @@
        #size-cells = <1>;
        model = "ep405";
        compatible = "ep405";
-       dcr-parent = <&/cpus/PowerPC,405GP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,405GP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,405GP";
                        reg = <0>;
                        clock-frequency = <bebc200>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */

diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index d4dedc2..d3135c5 100644 (file)
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -17,14 +17,15 @@
        #size-cells = <1>;
        model = "amcc,katmai";
        compatible = "amcc,katmai";
-       dcr-parent = <&/cpus/PowerPC,440SPe@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440SPe@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440SPe";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */

diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index aa6a517..0a3fbfa 100644 (file)
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -13,14 +13,15 @@
        #size-cells = <1>;
        model = "amcc,kilauea";
        compatible = "amcc,kilauea";
-       dcr-parent = <&/cpus/PowerPC,405EX@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,405EX@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,405EX";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by U-Boot */
                        timebase-frequency = <0>; /* Filled in by U-Boot */

diff --git a/arch/powerpc/boot/dts/rainier.dts b/arch/powerpc/boot/dts/rainier.dts
index cf1b95d..63d996e 100644 (file)
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -17,14 +17,15 @@
        #size-cells = <1>;
        model = "amcc,rainier";
        compatible = "amcc,rainier";
-       dcr-parent = <&/cpus/PowerPC,440GRx@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440GRx@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440GRx";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */

diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 0c07848..b8184e6 100644 (file)
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -17,14 +17,15 @@
        #size-cells = <1>;
        model = "amcc,sequoia";
        compatible = "amcc,sequoia";
-       dcr-parent = <&/cpus/PowerPC,440EPx@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440EPx@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440EPx";
                        reg = <0>;
                        clock-frequency = <0>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */

diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 259972b..0dec702 100644 (file)
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -15,14 +15,15 @@
        #size-cells = <1>;
        model = "amcc,taishan";
        compatible = "amcc,taishan";
-       dcr-parent = <&/cpus/PowerPC,440GX@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,440GX@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,440GX";
                        reg = <0>;
                        clock-frequency = <2FAF0800>; // 800MHz
                        timebase-frequency = <0>; // Filled in by zImage

diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index 681633e..8fcf6aa 100644 (file)
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -14,14 +14,15 @@
        #size-cells = <1>;
        model = "ibm,walnut";
        compatible = "ibm,walnut";
-       dcr-parent = <&/cpus/PowerPC,405GP@0>;
+       dcr-parent = <&/cpus/cpu@0>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,405GP@0 {
+               cpu@0 {
                        device_type = "cpu";
+                       model = "PowerPC,405GP";
                        reg = <0>;
                        clock-frequency = <bebc200>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */