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

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

[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 <wg@grandegger.com>
---
 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
===================================================================
--- linux-2.6-galak.orig/arch/powerpc/platforms/85xx/tqm85xx.c
+++ 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);
 

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Grant Likely]

On Fri, Jul 25, 2008 at 3:44 AM, Wolfgang Grandegger <wg@grandegger.com> wrote:
> 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 <wg@grandegger.com>
> ---
> 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
> ===================================================================
> --- linux-2.6-galak.orig/arch/powerpc/platforms/85xx/tqm85xx.c
> +++ 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", },

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.

-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Wolfgang Grandegger]

Grant Likely wrote:
> On Fri, Jul 25, 2008 at 3:44 AM, Wolfgang Grandegger <wg@grandegger.com> wrote:
>> 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 <wg@grandegger.com>
>> ---
>> 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
>> ===================================================================
>> --- linux-2.6-galak.orig/arch/powerpc/platforms/85xx/tqm85xx.c
>> +++ 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", },
> 
> 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.

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Jon Loeliger]

Wolfgang Grandegger wrote:

> 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

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Wolfgang Grandegger]

Jon Loeliger wrote:
> Wolfgang Grandegger wrote:
> 
>> 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".

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

Wolfgang.

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Wolfgang Grandegger]

Wolfgang Grandegger wrote:
> Jon Loeliger wrote:
>> Wolfgang Grandegger wrote:
>>
>>> 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".
> 
> 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.

Re: [PATCH] powerpc: 85xx: add proper OF bus ids for the TQM85xx

[Jon Loeliger]

> Wolfgang Grandegger wrote:
> > Jon Loeliger wrote:
> >>
> >> 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!

jdl