Commit 72fda114 authored by Josh Boyer's avatar Josh Boyer

[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: default avatarJosh Boyer <jwboyer@linux.vnet.ibm.com>
parent 55aaf6ec
...@@ -16,14 +16,15 @@ / { ...@@ -16,14 +16,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,bamboo"; model = "amcc,bamboo";
compatible = "amcc,bamboo"; compatible = "amcc,bamboo";
dcr-parent = <&/cpus/PowerPC,440EP@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440EP@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440EP";
reg = <0>; reg = <0>;
clock-frequency = <0>; /* Filled in by zImage */ clock-frequency = <0>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
...@@ -16,14 +16,15 @@ / { ...@@ -16,14 +16,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "ibm,ebony"; model = "ibm,ebony";
compatible = "ibm,ebony"; compatible = "ibm,ebony";
dcr-parent = <&/cpus/PowerPC,440GP@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440GP@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440GP";
reg = <0>; reg = <0>;
clock-frequency = <0>; // Filled in by zImage clock-frequency = <0>; // Filled in by zImage
timebase-frequency = <0>; // Filled in by zImage timebase-frequency = <0>; // Filled in by zImage
......
...@@ -14,14 +14,15 @@ / { ...@@ -14,14 +14,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "ep405"; model = "ep405";
compatible = "ep405"; compatible = "ep405";
dcr-parent = <&/cpus/PowerPC,405GP@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,405GP@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,405GP";
reg = <0>; reg = <0>;
clock-frequency = <bebc200>; /* Filled in by zImage */ clock-frequency = <bebc200>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
...@@ -17,14 +17,15 @@ / { ...@@ -17,14 +17,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,katmai"; model = "amcc,katmai";
compatible = "amcc,katmai"; compatible = "amcc,katmai";
dcr-parent = <&/cpus/PowerPC,440SPe@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440SPe@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440SPe";
reg = <0>; reg = <0>;
clock-frequency = <0>; /* Filled in by zImage */ clock-frequency = <0>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
...@@ -13,14 +13,15 @@ / { ...@@ -13,14 +13,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,kilauea"; model = "amcc,kilauea";
compatible = "amcc,kilauea"; compatible = "amcc,kilauea";
dcr-parent = <&/cpus/PowerPC,405EX@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,405EX@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,405EX";
reg = <0>; reg = <0>;
clock-frequency = <0>; /* Filled in by U-Boot */ clock-frequency = <0>; /* Filled in by U-Boot */
timebase-frequency = <0>; /* Filled in by U-Boot */ timebase-frequency = <0>; /* Filled in by U-Boot */
......
...@@ -17,14 +17,15 @@ / { ...@@ -17,14 +17,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,rainier"; model = "amcc,rainier";
compatible = "amcc,rainier"; compatible = "amcc,rainier";
dcr-parent = <&/cpus/PowerPC,440GRx@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440GRx@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440GRx";
reg = <0>; reg = <0>;
clock-frequency = <0>; /* Filled in by zImage */ clock-frequency = <0>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
...@@ -17,14 +17,15 @@ / { ...@@ -17,14 +17,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,sequoia"; model = "amcc,sequoia";
compatible = "amcc,sequoia"; compatible = "amcc,sequoia";
dcr-parent = <&/cpus/PowerPC,440EPx@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440EPx@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440EPx";
reg = <0>; reg = <0>;
clock-frequency = <0>; /* Filled in by zImage */ clock-frequency = <0>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
...@@ -15,14 +15,15 @@ / { ...@@ -15,14 +15,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "amcc,taishan"; model = "amcc,taishan";
compatible = "amcc,taishan"; compatible = "amcc,taishan";
dcr-parent = <&/cpus/PowerPC,440GX@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,440GX@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,440GX";
reg = <0>; reg = <0>;
clock-frequency = <2FAF0800>; // 800MHz clock-frequency = <2FAF0800>; // 800MHz
timebase-frequency = <0>; // Filled in by zImage timebase-frequency = <0>; // Filled in by zImage
......
...@@ -14,14 +14,15 @@ / { ...@@ -14,14 +14,15 @@ / {
#size-cells = <1>; #size-cells = <1>;
model = "ibm,walnut"; model = "ibm,walnut";
compatible = "ibm,walnut"; compatible = "ibm,walnut";
dcr-parent = <&/cpus/PowerPC,405GP@0>; dcr-parent = <&/cpus/cpu@0>;
cpus { cpus {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
PowerPC,405GP@0 { cpu@0 {
device_type = "cpu"; device_type = "cpu";
model = "PowerPC,405GP";
reg = <0>; reg = <0>;
clock-frequency = <bebc200>; /* Filled in by zImage */ clock-frequency = <bebc200>; /* Filled in by zImage */
timebase-frequency = <0>; /* Filled in by zImage */ timebase-frequency = <0>; /* Filled in by zImage */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment