Skip to contentSkip to conversation

powerpc: delete boot-cpu property from all DTS files

PATCH In review Timur Tabi 3 participants 5 messages Feb 14, 2007 – Feb 15, 2007

Subsystems (3)
lore
Share & tools
lore

Timur Tabi

author
#0 lore raw

PATCH v3 1/1 powerpc: delete boot-cpu property from all DTS files

The 'linux,boot-cpu' property is obsolete, so remove it from all of the DTS files and from booting-without-of.txt. The boot CPU is actually defined in the device tree header, and U-Boot sets that field. The device tree compiler also complains if the property exists.

---

Note: The '64-bit' property is already defined by the OF PPC binding and is added to show an example of a property without a value. We're not actually adding a new property definition.

 Documentation/powerpc/booting-without-of.txt |    5 ++---
 arch/powerpc/boot/dts/kuroboxHD.dts          |    1 -
 arch/powerpc/boot/dts/kuroboxHG.dts          |    1 -
 arch/powerpc/boot/dts/mpc7448hpc2.dts        |    1 -
 arch/powerpc/boot/dts/mpc8272ads.dts         |    1 -
 arch/powerpc/boot/dts/mpc8323emds.dts        |    1 -
 arch/powerpc/boot/dts/mpc8360emds.dts        |    1 -
 arch/powerpc/boot/dts/mpc8560ads.dts         |    1 -
 arch/powerpc/boot/dts/mpc8641_hpcn.dts       |    1 -
 arch/powerpc/boot/dts/mpc866ads.dts          |    1 -
 arch/powerpc/boot/dts/mpc885ads.dts          |    1 -
 11 files changed, 2 insertions(+), 13 deletions(-)
Documentation/powerpc/booting-without-of.txt +2 -3
index 3b51467..c539bfc 100644
@@ -497,7 +497,7 @@ looks like in practice.
       |   |- device_type = "cpu"
       |   |- reg = <0>
       |   |- clock-frequency = <5f5e1000>
-      |   |- linux,boot-cpu
+      |   |- 64-bit
       |   |- linux,phandle = <2>
       |
       o memory@0
@@ -519,7 +519,7 @@ physical memory layout.  It also includes misc information passed
 through /chosen, like in this example, the platform type (mandatory)
 and the kernel command line arguments (optional).
 
-The /cpus/PowerPC,970@0/linux,boot-cpu property is an example of a
+The /cpus/PowerPC,970@0/64-bit property is an example of a
 property without a value. All other properties have a value. The
 significance of the #address-cells and #size-cells properties will be
 explained in chapter IV which defines precisely the required nodes and
@@ -778,7 +778,6 @@ address which can extend beyond that limit.
       bytes
     - d-cache-size : one cell, size of L1 data cache in bytes
     - i-cache-size : one cell, size of L1 instruction cache in bytes
-    - linux, boot-cpu : Should be defined if this cpu is the boot cpu.
 
   Recommended properties:
 
arch/powerpc/boot/dts/kuroboxHD.dts +0 -1
index 096e94a..b897918 100644
@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHD.dtb -V 16 kuroboxHD.dts"
 
 		PowerPC,603e { /* Really 8241 */
 			linux,phandle = <2100>;
-			linux,boot-cpu;
 			device_type = "cpu";
 			reg = <0>;
 			clock-frequency = <bebc200>;	/* Fixed by bootwrapper */
arch/powerpc/boot/dts/kuroboxHG.dts +0 -1
index d06b0b0..7531027 100644
@@ -35,7 +35,6 @@ build with: "dtc -f -I dts -O dtb -o kuroboxHG.dtb -V 16 kuroboxHG.dts"
 
 		PowerPC,603e { /* Really 8241 */
 			linux,phandle = <2100>;
-			linux,boot-cpu;
 			device_type = "cpu";
 			reg = <0>;
 			clock-frequency = <fdad680>;	/* Fixed by bootwrapper */
arch/powerpc/boot/dts/mpc7448hpc2.dts +0 -1
index c4d9562..4164351 100644
@@ -36,7 +36,6 @@
 			bus-frequency = <0>;		// From U-Boot
 			32-bit;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 
arch/powerpc/boot/dts/mpc8272ads.dts +0 -1
index 26b44f7..260b2e4 100644
@@ -34,7 +34,6 @@
                        clock-frequency = <0>;
                        32-bit;
                        linux,phandle = <201>;
-                       linux,boot-cpu;
                };
        };
 
arch/powerpc/boot/dts/mpc8323emds.dts +0 -1
index fa7ef24..eaf0f86 100644
@@ -34,7 +34,6 @@
 			clock-frequency = <0>;
 			32-bit;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 
arch/powerpc/boot/dts/mpc8360emds.dts +0 -1
index 9022192..303bd66 100644
@@ -39,7 +39,6 @@
 			clock-frequency = <1F78A400>;
 			32-bit;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 
arch/powerpc/boot/dts/mpc8560ads.dts +0 -1
index 119bd5d..c74d6eb 100644
@@ -35,7 +35,6 @@
 			clock-frequency = <312c8040>;
 			32-bit;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 
arch/powerpc/boot/dts/mpc8641_hpcn.dts +0 -1
index f0c7731..258fccb 100644
@@ -32,7 +32,6 @@
 			bus-frequency = <0>;		// From uboot
 			clock-frequency = <0>;		// From uboot
 			32-bit;
-			linux,boot-cpu;
 		};
 		PowerPC,8641@1 {
 			device_type = "cpu";
arch/powerpc/boot/dts/mpc866ads.dts +0 -1
index 5d40052..2b56b5d 100644
@@ -37,7 +37,6 @@
 			interrupts = <f 2>;	// decrementer interrupt
 			interrupt-parent = <ff000000>;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 
arch/powerpc/boot/dts/mpc885ads.dts +0 -1
index cf1a19f..faecd08 100644
@@ -37,7 +37,6 @@
 			interrupts = <f 2>;	// decrementer interrupt
 			interrupt-parent = <ff000000>;
 			linux,phandle = <201>;
-			linux,boot-cpu;
 		};
 	};
 

--
1.5.0

#1 lore raw
Quoted 4 lines · Timur Tabi

The 'linux,boot-cpu' property is obsolete, so remove it from all of the DTS files and from booting-without-of.txt. The boot CPU is actually defined in the device tree header, and U-Boot sets that field. The device tree compiler also complains if the property exists.

This looks sane to me. If you're going about this sort of dts cleanup, it would be nice to remove all the linux,phandle properties and use dtc's reference facility to auto-generate them instead.

Signature · 4 lines
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson
author
#2 lore raw
Quoted 3 lines · David Gibson

This looks sane to me. If you're going about this sort of dts cleanup, it would be nice to remove all the linux,phandle properties and use dtc's reference facility to auto-generate them instead.

I wouldn't mind making a patch to do that, once my current patch is applied (hint hint). However, I'd have to study-up on linux,phandle, because I don't know anything about it. I just created the boot-cpu patch because someone around here said that that property should go, and I was doing other device-tree related work at the time.

Signature · 2 lines
Timur Tabi
Linux Kernel Developer @ Freescale
#3 lore raw
In reply to Timur Tabi

While you're at it...

Documentation/powerpc/booting-without-of.txt physical memory layout. It also includes misc information passed · line 523

Quoted 3 lines
Documentation/powerpc/booting-without-of.txt +1 -1
-The /cpus/PowerPC,970@0/linux,boot-cpu property is an example of a
+The /cpus/PowerPC,970@0/64-bit property is an example of a
 property without a value. All other properties have a value. The

s/All other properties/All other properties in this example/

I had to read this ten times before understanding what was meant :-)

Also, why is there a special header for this in the device tree blob? It could just have reused /chosen/cpu (with an identity ihandle>phandle mapping perhaps) -- just like the /aliases node could be used for aliases, instead of this new labels scheme.

Why reinvent the wheel :-)

Patch looks good of course.

Segher

author
#4 lore raw
Quoted 2 lines · Segher Boessenkool

Also, why is there a special header for this in the device tree blob?

I have no idea. I just know that it's there, and that the DTS files had to be cleaned up.

Signature · 2 lines
Timur Tabi
Linux Kernel Developer @ Freescale