[PATCH] mach-ux500: add devicetree compat nodes

[PATCH] mach-ux500: add devicetree compat nodes

[Niklas Hernaeus]

From: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

This adds devicetree compat members to all the U8500 reference
boards.

Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm/mach-ux500/board-mop500.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index cd54aba..7cbefa7 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -643,6 +643,21 @@ static void __init mop500_init_machine(void)
 	regulator_has_full_constraints();
 }
 
+static const char * mop500_dt_board_compat[] = {
+	"stericsson,mop500",
+	NULL
+};
+
+static const char * hrefv60_dt_board_compat[] = {
+	"stericsson,hrefv60",
+	NULL
+};
+
+static const char * snowball_dt_board_compat[] = {
+	"stericsson,snowball",
+	NULL
+};
+
 MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
 	/* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
 	.boot_params	= 0x100,
@@ -651,6 +666,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
 	/* we re-use nomadik timer here */
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= mop500_dt_board_compat,
 MACHINE_END
 
 MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
@@ -659,6 +675,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
 	.init_irq	= ux500_init_irq,
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= hrefv60_dt_board_compat,
 MACHINE_END
 
 MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
@@ -668,4 +685,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
 	/* we re-use nomadik timer here */
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= snowball_dt_board_compat,
 MACHINE_END
-- 
1.7.2.5

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Rob Herring]

On 11/11/2011 09:05 AM, Niklas Hernaeus wrote:
> From: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> 
> This adds devicetree compat members to all the U8500 reference
> boards.
> 
> Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
> ---
>  arch/arm/mach-ux500/board-mop500.c |   18 ++++++++++++++++++
>  1 files changed, 18 insertions(+), 0 deletions(-)
> 
> diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
> index cd54aba..7cbefa7 100644
> --- a/arch/arm/mach-ux500/board-mop500.c
> +++ b/arch/arm/mach-ux500/board-mop500.c
> @@ -643,6 +643,21 @@ static void __init mop500_init_machine(void)
>  	regulator_has_full_constraints();
>  }
>  
> +static const char * mop500_dt_board_compat[] = {
> +	"stericsson,mop500",
> +	NULL
> +};
> +
> +static const char * hrefv60_dt_board_compat[] = {
> +	"stericsson,hrefv60",
> +	NULL
> +};
> +
> +static const char * snowball_dt_board_compat[] = {
> +	"stericsson,snowball",
> +	NULL
> +};
> +
>  MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>  	/* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
>  	.boot_params	= 0x100,
> @@ -651,6 +666,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>  	/* we re-use nomadik timer here */
>  	.timer		= &ux500_timer,
>  	.init_machine	= mop500_init_machine,
> +	.dt_compat	= mop500_dt_board_compat,
>  MACHINE_END
>  
>  MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
> @@ -659,6 +675,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>  	.init_irq	= ux500_init_irq,
>  	.timer		= &ux500_timer,
>  	.init_machine	= mop500_init_machine,
> +	.dt_compat	= hrefv60_dt_board_compat,
>  MACHINE_END
>  
>  MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
> @@ -668,4 +685,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>  	/* we re-use nomadik timer here */
>  	.timer		= &ux500_timer,
>  	.init_machine	= mop500_init_machine,
> +	.dt_compat	= snowball_dt_board_compat,
>  MACHINE_END

These all look very similar and should be combined. Why do you not have
1 machine for all DT platforms as other SOCs are doing?

Rob

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Linus Walleij]

On Fri, Nov 11, 2011 at 4:17 PM, Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:

>>  MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>>       /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> */
>>       .boot_params    = 0x100,
>> @@ -651,6 +666,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>>       /* we re-use nomadik timer here */
>>       .timer          = &ux500_timer,
>>       .init_machine   = mop500_init_machine,
>> +     .dt_compat      = mop500_dt_board_compat,
>>  MACHINE_END
>>
>>  MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>> @@ -659,6 +675,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>>       .init_irq       = ux500_init_irq,
>>       .timer          = &ux500_timer,
>>       .init_machine   = mop500_init_machine,
>> +     .dt_compat      = hrefv60_dt_board_compat,
>>  MACHINE_END
>>
>>  MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>> @@ -668,4 +685,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>>       /* we re-use nomadik timer here */
>>       .timer          = &ux500_timer,
>>       .init_machine   = mop500_init_machine,
>> +     .dt_compat      = snowball_dt_board_compat,
>>  MACHINE_END
>
> These all look very similar and should be combined. Why do you not have
> 1 machine for all DT platforms as other SOCs are doing?

This needs to be rebased for the latest kernel.
Which looks like this:

MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
        /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
        .atag_offset    = 0x100,
        .map_io         = u8500_map_io,
        .init_irq       = ux500_init_irq,
        /* we re-use nomadik timer here */
        .timer          = &ux500_timer,
        .init_machine   = mop500_init_machine,
MACHINE_END

MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
        .atag_offset    = 0x100,
        .map_io         = u8500_map_io,
        .init_irq       = ux500_init_irq,
        .timer          = &ux500_timer,
        .init_machine   = hrefv60_init_machine,
MACHINE_END

MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
        .atag_offset    = 0x100,
        .map_io         = u8500_map_io,
        .init_irq       = ux500_init_irq,
        /* we re-use nomadik timer here */
        .timer          = &ux500_timer,
        .init_machine   = snowball_init_machine,
MACHINE_END

So - different .init_machine() calls, needed to simplify the board
files as of now. (Patch from Lee Jones.)

Yours,
Linus Walleij

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Rob Herring]

On 11/11/2011 09:59 AM, Linus Walleij wrote:
> On Fri, Nov 11, 2011 at 4:17 PM, Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> 
>>>  MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>>>       /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
>>>       .boot_params    = 0x100,
>>> @@ -651,6 +666,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>>>       /* we re-use nomadik timer here */
>>>       .timer          = &ux500_timer,
>>>       .init_machine   = mop500_init_machine,
>>> +     .dt_compat      = mop500_dt_board_compat,
>>>  MACHINE_END
>>>
>>>  MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>>> @@ -659,6 +675,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>>>       .init_irq       = ux500_init_irq,
>>>       .timer          = &ux500_timer,
>>>       .init_machine   = mop500_init_machine,
>>> +     .dt_compat      = hrefv60_dt_board_compat,
>>>  MACHINE_END
>>>
>>>  MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>>> @@ -668,4 +685,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>>>       /* we re-use nomadik timer here */
>>>       .timer          = &ux500_timer,
>>>       .init_machine   = mop500_init_machine,
>>> +     .dt_compat      = snowball_dt_board_compat,
>>>  MACHINE_END
>>
>> These all look very similar and should be combined. Why do you not have
>> 1 machine for all DT platforms as other SOCs are doing?
> 
> This needs to be rebased for the latest kernel.
> Which looks like this:
> 
> MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
>         /* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
>         .atag_offset    = 0x100,
>         .map_io         = u8500_map_io,
>         .init_irq       = ux500_init_irq,
>         /* we re-use nomadik timer here */
>         .timer          = &ux500_timer,
>         .init_machine   = mop500_init_machine,
> MACHINE_END
> 
> MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
>         .atag_offset    = 0x100,
>         .map_io         = u8500_map_io,
>         .init_irq       = ux500_init_irq,
>         .timer          = &ux500_timer,
>         .init_machine   = hrefv60_init_machine,
> MACHINE_END
> 
> MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
>         .atag_offset    = 0x100,
>         .map_io         = u8500_map_io,
>         .init_irq       = ux500_init_irq,
>         /* we re-use nomadik timer here */
>         .timer          = &ux500_timer,
>         .init_machine   = snowball_init_machine,
> MACHINE_END
> 
> So - different .init_machine() calls, needed to simplify the board
> files as of now. (Patch from Lee Jones.)
> 

But ultimately I would expect that the init_machine calls to be the same
with a DT based machine. This goes back to do we add DT to existing
boards or create a new clean DT machine and add to it as boards are
converted?

Rob

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Linus Walleij]

On Fri, Nov 11, 2011 at 5:13 PM, Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> On 11/11/2011 09:59 AM, Linus Walleij wrote:
>>
>> So - different .init_machine() calls, needed to simplify the board
>> files as of now. (Patch from Lee Jones.)
>
> But ultimately I would expect that the init_machine calls to be the same
> with a DT based machine. This goes back to do we add DT to existing
> boards or create a new clean DT machine and add to it as boards are
> converted?

Yes that should be the ultimate goal. So the current per-board
init functions register the I2C, MMC (SDI), SPI, UART and
regulator devices etc. So then these drivers need to be patched to
get their board/platform data from DT first.

In that case we should hold this patch off and only keep it for
internal testing until all necessary drivers are ready and patched
so we can replace all board files with a single DT-based one,
instead of this compromise solution.

Is this what everybody else does?

Thanks,
Linus Walleij

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Rob Herring]

On 11/11/2011 10:26 AM, Linus Walleij wrote:
> On Fri, Nov 11, 2011 at 5:13 PM, Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
>> On 11/11/2011 09:59 AM, Linus Walleij wrote:
>>>
>>> So - different .init_machine() calls, needed to simplify the board
>>> files as of now. (Patch from Lee Jones.)
>>
>> But ultimately I would expect that the init_machine calls to be the same
>> with a DT based machine. This goes back to do we add DT to existing
>> boards or create a new clean DT machine and add to it as boards are
>> converted?
> 
> Yes that should be the ultimate goal. So the current per-board
> init functions register the I2C, MMC (SDI), SPI, UART and
> regulator devices etc. So then these drivers need to be patched to
> get their board/platform data from DT first.
> 
> In that case we should hold this patch off and only keep it for
> internal testing until all necessary drivers are ready and patched
> so we can replace all board files with a single DT-based one,
> instead of this compromise solution.
> 
I would not hold off. You only need to have a minimal set that's enough
to boot.

> Is this what everybody else does?

That was the the consensus in Budapest in May. It's much cleaner to
start with a new board file and then ultimately just delete the old
ones. But it's really up to the board/SOC maintainer.

Rob

> Thanks,
> Linus Walleij

Re: [PATCH] mach-ux500: add devicetree compat nodes

[Linus Walleij]

On Fri, Nov 11, 2011 at 5:38 PM, Rob Herring <robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> wrote:
> [Me]
>> In that case we should hold this patch off and only keep it for
>> internal testing until all necessary drivers are ready and patched
>> so we can replace all board files with a single DT-based one,
>> instead of this compromise solution.
>>
> I would not hold off. You only need to have a minimal set that's enough
> to boot.

In our case UART, I2C and MMC is necessary to boot, so then we
anyway need to wait for these to be patched first. So we'd better hold
it back for now I think.

Linus Walleij

[PATCH] mach-ux500: add devicetree compat nodes

[Niklas Hernaeus]

From: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>

This adds devicetree compat members to all the U8500 reference
boards.

Signed-off-by: Linus Walleij <linus.walleij-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>
---
 arch/arm/mach-ux500/board-mop500.c |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index cd54aba..7cbefa7 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -643,6 +643,21 @@ static void __init mop500_init_machine(void)
 	regulator_has_full_constraints();
 }
 
+static const char * mop500_dt_board_compat[] = {
+	"stericsson,mop500",
+	NULL
+};
+
+static const char * hrefv60_dt_board_compat[] = {
+	"stericsson,hrefv60",
+	NULL
+};
+
+static const char * snowball_dt_board_compat[] = {
+	"stericsson,snowball",
+	NULL
+};
+
 MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
 	/* Maintainer: Srinidhi Kasagar <srinidhi.kasagar-0IS4wlFg1OjSUeElwK9/Pw@public.gmane.org> */
 	.boot_params	= 0x100,
@@ -651,6 +666,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
 	/* we re-use nomadik timer here */
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= mop500_dt_board_compat,
 MACHINE_END
 
 MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
@@ -659,6 +675,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
 	.init_irq	= ux500_init_irq,
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= hrefv60_dt_board_compat,
 MACHINE_END
 
 MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
@@ -668,4 +685,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
 	/* we re-use nomadik timer here */
 	.timer		= &ux500_timer,
 	.init_machine	= mop500_init_machine,
+	.dt_compat	= snowball_dt_board_compat,
 MACHINE_END
-- 
1.7.2.5