Skip to contentSkip to conversation

fsl_soc: add support for "fsl, immr" compatible matching

PATCH In review Anton Vorontsov 3 participants 3 messages Feb 1, 2008

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fsl_soc: add support for "fsl, immr" compatible matching

Unfortunately it's still impossible to remove device_type = "soc" from the existing device tree, because older u-boots are looking for it.

Neither we can remove model number from the soc name to heal arch/powerpc/boot/cuboot-85xx.c, because then dts'es will be incompatible with older u-boots again.

So, just one machine converted so far: MPC8360E-RDK. It's new machine so we don't care about backward compatibility yet.

---
 Documentation/powerpc/booting-without-of.txt |   18 ++++------
 arch/powerpc/boot/dts/mpc836x_rdk.dts        |    1 -
 arch/powerpc/sysdev/fsl_soc.c                |   51 +++++++++++++++-----------
 3 files changed, 37 insertions(+), 33 deletions(-)
Documentation/powerpc/booting-without-of.txt +7 -11
index b5e46ef..410c847 100644
@@ -32,7 +32,7 @@ Table of Contents
       c) The /cpus/* nodes
       d) the /memory node(s)
       e) The /chosen node
-      f) the /soc<SOCname> node
+      f) the /soc node
 
   IV - "dtc", the device tree compiler
 
@@ -960,20 +960,16 @@ compatibility.
   under /chosen called interrupt-controller which had a phandle value
   that pointed to the main interrupt controller)
 
-  f) the /soc<SOCname> node
+  f) the /soc node
 
   This node is used to represent a system-on-a-chip (SOC) and must be
   present if the processor is a SOC. The top-level soc node contains
-  information that is global to all devices on the SOC. The node name
-  should contain a unit address for the SOC, which is the base address
-  of the memory-mapped register set for the SOC. The name of an soc
-  node should start with "soc", and the remainder of the name should
-  represent the part number for the soc.  For example, the MPC8540's
-  soc node would be called "soc8540".
+  information that is global to all devices on the SOC. The name of an
+  soc node should be "soc".
 
   Required properties:
 
-    - device_type : Should be "soc"
+    - compatible : Should be "<cpu-specific>-immr", "fsl,immr", "simple-bus"
     - ranges : Should be defined as specified in 1) to describe the
       translation of SOC addresses for memory mapped SOC registers.
     - bus-frequency: Contains the bus frequency for the SOC node.
@@ -2871,11 +2867,11 @@ Note that the #address-cells and #size-cells for the SoC node
 in this example have been explicitly listed; these are likely
 not necessary as they are usually the same as the root node.
 
-	soc8540@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#interrupt-cells = <2>;
-		device_type = "soc";
+		compatible = "fsl,mpc8540-immr", "fsl,immr", "simple-bus";
 		ranges = <00000000 e0000000 00100000>
 		reg = <e0000000 00003000>;
 		bus-frequency = <0>;
arch/powerpc/boot/dts/mpc836x_rdk.dts +0 -1
index b062f9b..e35200a 100644
@@ -57,7 +57,6 @@
 	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		device_type = "soc";
 		compatible = "fsl,mpc8360-immr", "fsl,immr", "simple-bus";
 		ranges = <0 0xe0000000 0x200000>;
 		reg = <0xe0000000 0x200>;
arch/powerpc/sysdev/fsl_soc.c +30 -21

77 lines not on this page · raw message

Signature · 1 line
1.5.2.2
#1 lore raw

Documentation/powerpc/booting-without-of.txt Note that the #address-cells and #size-cells for the SoC node · line 2877

Quoted 10 lines · Anton Vorontsov
Documentation/powerpc/booting-without-of.txt +2 -2
-	soc8540@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#interrupt-cells = <2>;
-		device_type = "soc";
+		compatible = "fsl,mpc8540-immr", "fsl,immr", "simple-bus";
 		ranges = <00000000 e0000000 00100000>
 		reg = <e0000000 00003000>;
 		bus-frequency = <0>;

It's called "CCSR" rather than "IMMR" on 85xx.

-Scott

#2 lore raw
Quoted 13 lines · Scott Wood

Documentation/powerpc/booting-without-of.txt Note that the #address-cells and #size-cells for the SoC node · line 2877

Quoted 10 lines · Anton Vorontsov
Documentation/powerpc/booting-without-of.txt +2 -2
-	soc8540@e0000000 {
+	soc@e0000000 {
 		#address-cells = <1>;
 		#size-cells = <1>;
 		#interrupt-cells = <2>;
-		device_type = "soc";
+		compatible = "fsl,mpc8540-immr", "fsl,immr", "simple-bus";
 		ranges = <00000000 e0000000 00100000>
 		reg = <e0000000 00003000>;
 		bus-frequency = <0>;

It's called "CCSR" rather than "IMMR" on 85xx.

^^ Theory.

$ grep ccsr -r arch/powerpc/boot/dts/
$
$ grep immr -r arch/powerpc/boot/dts/ | grep 85 | cut -d: -f1
arch/powerpc/boot/dts/tqm8540.dts
arch/powerpc/boot/dts/tqm8541.dts
arch/powerpc/boot/dts/mpc8572ds.dts
arch/powerpc/boot/dts/tqm8555.dts
arch/powerpc/boot/dts/stx_gp3_8560.dts
arch/powerpc/boot/dts/mpc885ads.dts
arch/powerpc/boot/dts/tqm8560.dts

^^ Practice. :-)

Maybe "fsl,soc", finally? :-) I think soc, ccsr or immr doesn't really matter, what really matters is consistency. <cpu-specific> part of the -ccsr/-immr should be sufficient to distinct whether we're on 85xx or 83xx...

Signature · 4 lines
Anton Vorontsov
email: [email protected]
backup email: [email protected]
irc://irc.freenode.net/bd2