aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-06 14:20:05 -0500
committerJosh Boyer <jwboyer@linux.vnet.ibm.com>2007-12-23 14:33:47 -0500
commit72fda1148e14d2f06d8653c26f579b7d2dabba57 (patch)
treefa4087faf70c14eb333ffc693d6e32b13d01d742
parent55aaf6ecf796b809100abfbdf359ef8309a7aac9 (diff)
[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>
-rw-r--r--arch/powerpc/boot/dts/bamboo.dts5
-rw-r--r--arch/powerpc/boot/dts/ebony.dts5
-rw-r--r--arch/powerpc/boot/dts/ep405.dts5
-rw-r--r--arch/powerpc/boot/dts/katmai.dts5
-rw-r--r--arch/powerpc/boot/dts/kilauea.dts5
-rw-r--r--arch/powerpc/boot/dts/rainier.dts5
-rw-r--r--arch/powerpc/boot/dts/sequoia.dts5
-rw-r--r--arch/powerpc/boot/dts/taishan.dts5
-rw-r--r--arch/powerpc/boot/dts/walnut.dts5
9 files changed, 27 insertions, 18 deletions
diff --git a/arch/powerpc/boot/dts/bamboo.dts b/arch/powerpc/boot/dts/bamboo.dts
index 03f5d94ce363..51ada46e3831 100644
--- a/arch/powerpc/boot/dts/bamboo.dts
+++ b/arch/powerpc/boot/dts/bamboo.dts
@@ -16,14 +16,15 @@
16 #size-cells = <1>; 16 #size-cells = <1>;
17 model = "amcc,bamboo"; 17 model = "amcc,bamboo";
18 compatible = "amcc,bamboo"; 18 compatible = "amcc,bamboo";
19 dcr-parent = <&/cpus/PowerPC,440EP@0>; 19 dcr-parent = <&/cpus/cpu@0>;
20 20
21 cpus { 21 cpus {
22 #address-cells = <1>; 22 #address-cells = <1>;
23 #size-cells = <0>; 23 #size-cells = <0>;
24 24
25 PowerPC,440EP@0 { 25 cpu@0 {
26 device_type = "cpu"; 26 device_type = "cpu";
27 model = "PowerPC,440EP";
27 reg = <0>; 28 reg = <0>;
28 clock-frequency = <0>; /* Filled in by zImage */ 29 clock-frequency = <0>; /* Filled in by zImage */
29 timebase-frequency = <0>; /* Filled in by zImage */ 30 timebase-frequency = <0>; /* Filled in by zImage */
diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index 331c424e97ea..3cb2849eefe1 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -16,14 +16,15 @@
16 #size-cells = <1>; 16 #size-cells = <1>;
17 model = "ibm,ebony"; 17 model = "ibm,ebony";
18 compatible = "ibm,ebony"; 18 compatible = "ibm,ebony";
19 dcr-parent = <&/cpus/PowerPC,440GP@0>; 19 dcr-parent = <&/cpus/cpu@0>;
20 20
21 cpus { 21 cpus {
22 #address-cells = <1>; 22 #address-cells = <1>;
23 #size-cells = <0>; 23 #size-cells = <0>;
24 24
25 PowerPC,440GP@0 { 25 cpu@0 {
26 device_type = "cpu"; 26 device_type = "cpu";
27 model = "PowerPC,440GP";
27 reg = <0>; 28 reg = <0>;
28 clock-frequency = <0>; // Filled in by zImage 29 clock-frequency = <0>; // Filled in by zImage
29 timebase-frequency = <0>; // Filled in by zImage 30 timebase-frequency = <0>; // Filled in by zImage
diff --git a/arch/powerpc/boot/dts/ep405.dts b/arch/powerpc/boot/dts/ep405.dts
index 007f3c24d3f2..16cfc0d01774 100644
--- a/arch/powerpc/boot/dts/ep405.dts
+++ b/arch/powerpc/boot/dts/ep405.dts
@@ -14,14 +14,15 @@
14 #size-cells = <1>; 14 #size-cells = <1>;
15 model = "ep405"; 15 model = "ep405";
16 compatible = "ep405"; 16 compatible = "ep405";
17 dcr-parent = <&/cpus/PowerPC,405GP@0>; 17 dcr-parent = <&/cpus/cpu@0>;
18 18
19 cpus { 19 cpus {
20 #address-cells = <1>; 20 #address-cells = <1>;
21 #size-cells = <0>; 21 #size-cells = <0>;
22 22
23 PowerPC,405GP@0 { 23 cpu@0 {
24 device_type = "cpu"; 24 device_type = "cpu";
25 model = "PowerPC,405GP";
25 reg = <0>; 26 reg = <0>;
26 clock-frequency = <bebc200>; /* Filled in by zImage */ 27 clock-frequency = <bebc200>; /* Filled in by zImage */
27 timebase-frequency = <0>; /* Filled in by zImage */ 28 timebase-frequency = <0>; /* Filled in by zImage */
diff --git a/arch/powerpc/boot/dts/katmai.dts b/arch/powerpc/boot/dts/katmai.dts
index d4dedc2e44cc..d3135c58d0e4 100644
--- a/arch/powerpc/boot/dts/katmai.dts
+++ b/arch/powerpc/boot/dts/katmai.dts
@@ -17,14 +17,15 @@
17 #size-cells = <1>; 17 #size-cells = <1>;
18 model = "amcc,katmai"; 18 model = "amcc,katmai";
19 compatible = "amcc,katmai"; 19 compatible = "amcc,katmai";
20 dcr-parent = <&/cpus/PowerPC,440SPe@0>; 20 dcr-parent = <&/cpus/cpu@0>;
21 21
22 cpus { 22 cpus {
23 #address-cells = <1>; 23 #address-cells = <1>;
24 #size-cells = <0>; 24 #size-cells = <0>;
25 25
26 PowerPC,440SPe@0 { 26 cpu@0 {
27 device_type = "cpu"; 27 device_type = "cpu";
28 model = "PowerPC,440SPe";
28 reg = <0>; 29 reg = <0>;
29 clock-frequency = <0>; /* Filled in by zImage */ 30 clock-frequency = <0>; /* Filled in by zImage */
30 timebase-frequency = <0>; /* Filled in by zImage */ 31 timebase-frequency = <0>; /* Filled in by zImage */
diff --git a/arch/powerpc/boot/dts/kilauea.dts b/arch/powerpc/boot/dts/kilauea.dts
index aa6a51769930..0a3fbfa4a99b 100644
--- a/arch/powerpc/boot/dts/kilauea.dts
+++ b/arch/powerpc/boot/dts/kilauea.dts
@@ -13,14 +13,15 @@
13 #size-cells = <1>; 13 #size-cells = <1>;
14 model = "amcc,kilauea"; 14 model = "amcc,kilauea";
15 compatible = "amcc,kilauea"; 15 compatible = "amcc,kilauea";
16 dcr-parent = <&/cpus/PowerPC,405EX@0>; 16 dcr-parent = <&/cpus/cpu@0>;
17 17
18 cpus { 18 cpus {
19 #address-cells = <1>; 19 #address-cells = <1>;
20 #size-cells = <0>; 20 #size-cells = <0>;
21 21
22 PowerPC,405EX@0 { 22 cpu@0 {
23 device_type = "cpu"; 23 device_type = "cpu";
24 model = "PowerPC,405EX";
24 reg = <0>; 25 reg = <0>;
25 clock-frequency = <0>; /* Filled in by U-Boot */ 26 clock-frequency = <0>; /* Filled in by U-Boot */
26 timebase-frequency = <0>; /* Filled in by U-Boot */ 27 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 cf1b95d1f14b..63d996e647c8 100644
--- a/arch/powerpc/boot/dts/rainier.dts
+++ b/arch/powerpc/boot/dts/rainier.dts
@@ -17,14 +17,15 @@
17 #size-cells = <1>; 17 #size-cells = <1>;
18 model = "amcc,rainier"; 18 model = "amcc,rainier";
19 compatible = "amcc,rainier"; 19 compatible = "amcc,rainier";
20 dcr-parent = <&/cpus/PowerPC,440GRx@0>; 20 dcr-parent = <&/cpus/cpu@0>;
21 21
22 cpus { 22 cpus {
23 #address-cells = <1>; 23 #address-cells = <1>;
24 #size-cells = <0>; 24 #size-cells = <0>;
25 25
26 PowerPC,440GRx@0 { 26 cpu@0 {
27 device_type = "cpu"; 27 device_type = "cpu";
28 model = "PowerPC,440GRx";
28 reg = <0>; 29 reg = <0>;
29 clock-frequency = <0>; /* Filled in by zImage */ 30 clock-frequency = <0>; /* Filled in by zImage */
30 timebase-frequency = <0>; /* Filled in by zImage */ 31 timebase-frequency = <0>; /* Filled in by zImage */
diff --git a/arch/powerpc/boot/dts/sequoia.dts b/arch/powerpc/boot/dts/sequoia.dts
index 0c078483601c..b8184e653bb6 100644
--- a/arch/powerpc/boot/dts/sequoia.dts
+++ b/arch/powerpc/boot/dts/sequoia.dts
@@ -17,14 +17,15 @@
17 #size-cells = <1>; 17 #size-cells = <1>;
18 model = "amcc,sequoia"; 18 model = "amcc,sequoia";
19 compatible = "amcc,sequoia"; 19 compatible = "amcc,sequoia";
20 dcr-parent = <&/cpus/PowerPC,440EPx@0>; 20 dcr-parent = <&/cpus/cpu@0>;
21 21
22 cpus { 22 cpus {
23 #address-cells = <1>; 23 #address-cells = <1>;
24 #size-cells = <0>; 24 #size-cells = <0>;
25 25
26 PowerPC,440EPx@0 { 26 cpu@0 {
27 device_type = "cpu"; 27 device_type = "cpu";
28 model = "PowerPC,440EPx";
28 reg = <0>; 29 reg = <0>;
29 clock-frequency = <0>; /* Filled in by zImage */ 30 clock-frequency = <0>; /* Filled in by zImage */
30 timebase-frequency = <0>; /* Filled in by zImage */ 31 timebase-frequency = <0>; /* Filled in by zImage */
diff --git a/arch/powerpc/boot/dts/taishan.dts b/arch/powerpc/boot/dts/taishan.dts
index 259972b594b2..0dec702c5261 100644
--- a/arch/powerpc/boot/dts/taishan.dts
+++ b/arch/powerpc/boot/dts/taishan.dts
@@ -15,14 +15,15 @@
15 #size-cells = <1>; 15 #size-cells = <1>;
16 model = "amcc,taishan"; 16 model = "amcc,taishan";
17 compatible = "amcc,taishan"; 17 compatible = "amcc,taishan";
18 dcr-parent = <&/cpus/PowerPC,440GX@0>; 18 dcr-parent = <&/cpus/cpu@0>;
19 19
20 cpus { 20 cpus {
21 #address-cells = <1>; 21 #address-cells = <1>;
22 #size-cells = <0>; 22 #size-cells = <0>;
23 23
24 PowerPC,440GX@0 { 24 cpu@0 {
25 device_type = "cpu"; 25 device_type = "cpu";
26 model = "PowerPC,440GX";
26 reg = <0>; 27 reg = <0>;
27 clock-frequency = <2FAF0800>; // 800MHz 28 clock-frequency = <2FAF0800>; // 800MHz
28 timebase-frequency = <0>; // Filled in by zImage 29 timebase-frequency = <0>; // Filled in by zImage
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index 681633ec954f..8fcf6aa17113 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -14,14 +14,15 @@
14 #size-cells = <1>; 14 #size-cells = <1>;
15 model = "ibm,walnut"; 15 model = "ibm,walnut";
16 compatible = "ibm,walnut"; 16 compatible = "ibm,walnut";
17 dcr-parent = <&/cpus/PowerPC,405GP@0>; 17 dcr-parent = <&/cpus/cpu@0>;
18 18
19 cpus { 19 cpus {
20 #address-cells = <1>; 20 #address-cells = <1>;
21 #size-cells = <0>; 21 #size-cells = <0>;
22 22
23 PowerPC,405GP@0 { 23 cpu@0 {
24 device_type = "cpu"; 24 device_type = "cpu";
25 model = "PowerPC,405GP";
25 reg = <0>; 26 reg = <0>;
26 clock-frequency = <bebc200>; /* Filled in by zImage */ 27 clock-frequency = <bebc200>; /* Filled in by zImage */
27 timebase-frequency = <0>; /* Filled in by zImage */ 28 timebase-frequency = <0>; /* Filled in by zImage */