Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/powerpc/boot/dts/bamboo.dts

+3 −2
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/boot/dts/ebony.dts

+3 −2
Original line number Diff line number Diff line
@@ -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

arch/powerpc/boot/dts/ep405.dts

+3 −2
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/boot/dts/katmai.dts

+3 −2
Original line number Diff line number Diff line
@@ -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 */

arch/powerpc/boot/dts/kilauea.dts

+3 −2
Original line number Diff line number Diff line
@@ -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 */