Skip to content

Commit

Permalink
[POWERPC] 4xx: Rename CPU nodes to avoid dtc incompatibility
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Josh Boyer committed Dec 23, 2007
1 parent 55aaf6e commit 72fda11
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 18 deletions.
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/bamboo.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/ebony.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/ep405.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/katmai.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/kilauea.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/rainier.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/sequoia.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/taishan.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions arch/powerpc/boot/dts/walnut.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 72fda11

Please sign in to comment.