Skip to contentSkip to conversation

powerpc: 85xx: add proper OF bus ids for the TQM85xx

PATCH In review Wolfgang Grandegger 4 participants 7 messages Jul 25, 2008 – Aug 17, 2008

Subsystems (2)
PowerPC Linux for PowerPC embedded PPC85XX
lore
Share & tools
lore

Wolfgang Grandegger

author
#0 lore raw

PATCH 1/1 powerpc: 85xx: add proper OF bus ids for the TQM85xx

Since recent modifications to the MPC I2C code, the MPC I2C buses are not found any more. This patch fixes the problem by adding proper OF bus ids.

Signed-off-by Wolfgang Grandegger <[email protected]>

---
arch/powerpc/platforms/85xx/tqm85xx.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)
arch/powerpc/platforms/85xx/tqm85xx.c +0 -0
Index: linux-2.6-galak/arch/powerpc/platforms/85xx/tqm85xx.c
===================================================================
@@ -156,15 +156,15 @@ static void tqm85xx_show_cpuinfo(struct }

static struct of_device_id __initdata of_bus_ids[] = {
+ { .type = "soc", },
+ { .compatible = "soc", },

	{ .compatible = "simple-bus", },
	{},
};

static int __init declare_of_platform_devices(void) {
- of_platform_bus_probe(NULL, of_bus_ids, NULL);
-
- return 0;
+ return of_platform_bus_probe(NULL, of_bus_ids, NULL);
}
machine_device_initcall(tqm85xx, declare_of_platform_devices);

#1 lore raw
Quoted 14 lines · Wolfgang Grandegger

Since recent modifications to the MPC I2C code, the MPC I2C buses are not found any more. This patch fixes the problem by adding proper OF bus ids.

Signed-off-by Wolfgang Grandegger <[email protected]>

---
arch/powerpc/platforms/85xx/tqm85xx.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-galak/arch/powerpc/platforms/85xx/tqm85xx.c
===================================================================

arch/powerpc/platforms/85xx/tqm85xx.c static void tqm85xx_show_cpuinfo(struct } · line 160

Quoted 5 lines
arch/powerpc/platforms/85xx/tqm85xx.c +2 -0
@@ -156,15 +156,15 @@ static void tqm85xx_show_cpuinfo(struct }
 
 static struct of_device_id __initdata of_bus_ids[] = {
+       { .type = "soc", },
+       { .compatible = "soc", },
       { .compatible = "simple-bus", },

Ugh, i assume this is to support older .dts files that don't have simple-bus in their compatible property? Please put them at the end of the list and put a comment ahead of them stating that they are legacy support. You should also state in the comment which boards or dts files these entries provide support for.

g.

Signature · 2 lines
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.
author
#2 lore raw
Quoted 16 lines · Grant Likely
Quoted 15 lines · Wolfgang Grandegger

Since recent modifications to the MPC I2C code, the MPC I2C buses are not found any more. This patch fixes the problem by adding proper OF bus ids.

Signed-off-by Wolfgang Grandegger <[email protected]>

---
arch/powerpc/platforms/85xx/tqm85xx.c | 6 +++---

1 file changed, 3 insertions(+), 3 deletions(-)

Index: linux-2.6-galak/arch/powerpc/platforms/85xx/tqm85xx.c
===================================================================

arch/powerpc/platforms/85xx/tqm85xx.c +0 -0
@@ -156,15 +156,15 @@ static void tqm85xx_show_cpuinfo(struct }
Quoted 10 lines

arch/powerpc/platforms/85xx/tqm85xx.c static void tqm85xx_show_cpuinfo(struct } · line 160

Quoted 4 lines
arch/powerpc/platforms/85xx/tqm85xx.c +2 -0
 static struct of_device_id __initdata of_bus_ids[] = {
+       { .type = "soc", },
+       { .compatible = "soc", },
       { .compatible = "simple-bus", },

Ugh, i assume this is to support older .dts files that don't have simple-bus in their compatible property? Please put them at the end of the list and put a comment ahead of them stating that they are legacy support. You should also state in the comment which boards or dts files these entries provide support for.

Ah, I see. For the TQM8548 adding the following compatible line:

        soc8548@e0000000 {
		...
		compatible = "fsl,mpc8548-immr", "simple-bus";

solved my issues. All other DTS files for the TQM85xx modules have this line. It got lost somehow for the TQM8548. Thanks for pointing me to the real problem. Forget this patch, I will send a new one fixing the DTS file.

Wolfgang.

#3 lore raw
Quoted 6 lines · Wolfgang Grandegger

Ah, I see. For the TQM8548 adding the following compatible line:

        soc8548@e0000000 {
        ...
        compatible = "fsl,mpc8548-immr", "simple-bus";

Hmmmm..... While you are there, I think you should drop the "8548" part of "soc8548" to get just "soc@e0000000".

Thanks,
jdl

author
#4 lore raw
Quoted 4 lines · Jon Loeliger
Quoted 2 lines · Wolfgang Grandegger

Ah, I see. For the TQM8548 adding the following compatible line:

Quoted 8 lines
Quoted 4 lines
        soc8548@e0000000 {
        ...
        compatible = "fsl,mpc8548-immr", "simple-bus";

Hmmmm..... While you are there, I think you should drop the "8548" part of "soc8548" to get just "soc@e0000000".

Well, right. I'm going to check the tqm8548.dts file more carefully.

Wolfgang.

author
#5 lore raw
Quoted 11 lines · Wolfgang Grandegger
Quoted 10 lines · Jon Loeliger
Quoted 6 lines · Wolfgang Grandegger

Ah, I see. For the TQM8548 adding the following compatible line:

        soc8548@e0000000 {
        ...
        compatible = "fsl,mpc8548-immr", "simple-bus";
Quoted 4 lines
Quoted 2 lines

Hmmmm..... While you are there, I think you should drop the "8548" part of "soc8548" to get just "soc@e0000000".

Well, right. I'm going to check the tqm8548.dts file more carefully.

Looking into 2.6.27-rc3, I realized that these issues have not yet been fixed :-(. I just sent out a patch for 2.6.27 doing so:

http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061725.html

Thanks.

Wolfgang.

#6 lore raw
Quoted 6 lines
Quoted 5 lines · Wolfgang Grandegger
Quoted 3 lines · Jon Loeliger

Hmmmm..... While you are there, I think you should drop the "8548" part of "soc8548" to get just "soc@e0000000".

Quoted 6 lines
Quoted 1 line

Well, right. I'm going to check the tqm8548.dts file more carefully.

Looking into 2.6.27-rc3, I realized that these issues have not yet been fixed :-(. I just sent out a patch for 2.6.27 doing so:

http://ozlabs.org/pipermail/linuxppc-dev/2008-August/061725.html

Thanks!

jdl