Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=72fda1148e14d2f06d8653c26f579b7d2dabba57
Commit:     72fda1148e14d2f06d8653c26f579b7d2dabba57
Parent:     55aaf6ecf796b809100abfbdf359ef8309a7aac9
Author:     Josh Boyer <[EMAIL PROTECTED]>
AuthorDate: Thu Dec 6 13:20:05 2007 -0600
Committer:  Josh Boyer <[EMAIL PROTECTED]>
CommitDate: Sun Dec 23 13:33:47 2007 -0600

    [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 <[EMAIL PROTECTED]>
---
 arch/powerpc/boot/dts/bamboo.dts  |    5 +++--
 arch/powerpc/boot/dts/ebony.dts   |    5 +++--
 arch/powerpc/boot/dts/ep405.dts   |    5 +++--
 arch/powerpc/boot/dts/katmai.dts  |    5 +++--
 arch/powerpc/boot/dts/kilauea.dts |    5 +++--
 arch/powerpc/boot/dts/rainier.dts |    5 +++--
 arch/powerpc/boot/dts/sequoia.dts |    5 +++--
 arch/powerpc/boot/dts/taishan.dts |    5 +++--
 arch/powerpc/boot/dts/walnut.dts  |    5 +++--
 9 files changed, 27 insertions(+), 18 deletions(-)

diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 03f5d94..51ada46 100644
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        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
--- 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,[EMAIL PROTECTED]>;
+       dcr-parent = <&/cpus/[EMAIL PROTECTED]>;
 
        cpus {
                #address-cells = <1>;
                #size-cells = <0>;
 
-               PowerPC,[EMAIL PROTECTED] {
+               [EMAIL PROTECTED] {
                        device_type = "cpu";
+                       model = "PowerPC,405GP";
                        reg = <0>;
                        clock-frequency = <bebc200>; /* Filled in by zImage */
                        timebase-frequency = <0>; /* Filled in by zImage */
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to