[PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[Magnus Damm]

From: Magnus Damm <damm@opensource.se>

Convert the marzen board to use DT_MACHINE_START. With this in
place all mach-shmobile boards use DT_MACHINE_START. Also, this
makes it possible for the r8a7779 SMP code to use DT for CPUs.

So appended DTB is the way forward on this board.

Signed-off-by: Magnus Damm <damm@opensource.se>
---

 Written on top of renesas-devel-20130724

 arch/arm/mach-shmobile/board-marzen.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- 0001/arch/arm/mach-shmobile/board-marzen.c
+++ work/arch/arm/mach-shmobile/board-marzen.c	2013-07-24 15:45:39.000000000 +0900
@@ -238,7 +238,7 @@ static void __init marzen_init(void)
 	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+DT_MACHINE_START(MARZEN, "marzen")
 	.smp		= smp_ops(r8a7779_smp_ops),
 	.map_io		= r8a7779_map_io,
 	.init_early	= r8a7779_add_early_devices,

Re: [PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[Simon Horman]

On Wed, Jul 24, 2013 at 04:30:42PM +0900, Magnus Damm wrote:
> From: Magnus Damm <damm@opensource.se>
> 
> Convert the marzen board to use DT_MACHINE_START. With this in
> place all mach-shmobile boards use DT_MACHINE_START. Also, this
> makes it possible for the r8a7779 SMP code to use DT for CPUs.
> 
> So appended DTB is the way forward on this board.

Please supply a patch to update the defconfig accordingly.

> Signed-off-by: Magnus Damm <damm@opensource.se>
> ---
> 
>  Written on top of renesas-devel-20130724
> 
>  arch/arm/mach-shmobile/board-marzen.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> --- 0001/arch/arm/mach-shmobile/board-marzen.c
> +++ work/arch/arm/mach-shmobile/board-marzen.c	2013-07-24 15:45:39.000000000 +0900
> @@ -238,7 +238,7 @@ static void __init marzen_init(void)
>  	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
>  }
>  
> -MACHINE_START(MARZEN, "marzen")
> +DT_MACHINE_START(MARZEN, "marzen")
>  	.smp		= smp_ops(r8a7779_smp_ops),
>  	.map_io		= r8a7779_map_io,
>  	.init_early	= r8a7779_add_early_devices,
> 

Re: [PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[Simon Horman]

On Wed, Jul 24, 2013 at 04:39:53PM +0900, Simon Horman wrote:
> On Wed, Jul 24, 2013 at 04:30:42PM +0900, Magnus Damm wrote:
> > From: Magnus Damm <damm@opensource.se>
> > 
> > Convert the marzen board to use DT_MACHINE_START. With this in
> > place all mach-shmobile boards use DT_MACHINE_START. Also, this
> > makes it possible for the r8a7779 SMP code to use DT for CPUs.
> > 
> > So appended DTB is the way forward on this board.
> 
> Please supply a patch to update the defconfig accordingly.

In the course of testing this patch I created
a patch to update the defconfig. I will post it with
a patch to use DT for SMP but I have some questions about this patch.

It seems to me that the following is also needed:

* Select USE_OF in Kconfig
* Provide dt_compat in DT_MACHINE_START
* Provide r8a7779-marzen dts

I have a revised version of this patch which does the above.
But I wanted to check with you that I am on the right track
before posting it.


Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove
shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have
prepated a patch for r8a7779 I have also prepared a patch to remove
shmobile_smp_init_cpus().

My plan is to post all relevant patches as a series once
my questions above are resolved.

> > Signed-off-by: Magnus Damm <damm@opensource.se>
> > ---
> > 
> >  Written on top of renesas-devel-20130724
> > 
> >  arch/arm/mach-shmobile/board-marzen.c |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > --- 0001/arch/arm/mach-shmobile/board-marzen.c
> > +++ work/arch/arm/mach-shmobile/board-marzen.c	2013-07-24 15:45:39.000000000 +0900
> > @@ -238,7 +238,7 @@ static void __init marzen_init(void)
> >  	platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
> >  }
> >  
> > -MACHINE_START(MARZEN, "marzen")
> > +DT_MACHINE_START(MARZEN, "marzen")
> >  	.smp		= smp_ops(r8a7779_smp_ops),
> >  	.map_io		= r8a7779_map_io,
> >  	.init_early	= r8a7779_add_early_devices,
> > 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> 

Re: [PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[Magnus Damm]

Hi Simon,

On Wed, Jul 24, 2013 at 5:46 PM, Simon Horman <horms@verge.net.au> wrote:
> On Wed, Jul 24, 2013 at 04:39:53PM +0900, Simon Horman wrote:
>> On Wed, Jul 24, 2013 at 04:30:42PM +0900, Magnus Damm wrote:
>> > From: Magnus Damm <damm@opensource.se>
>> >
>> > Convert the marzen board to use DT_MACHINE_START. With this in
>> > place all mach-shmobile boards use DT_MACHINE_START. Also, this
>> > makes it possible for the r8a7779 SMP code to use DT for CPUs.
>> >
>> > So appended DTB is the way forward on this board.
>>
>> Please supply a patch to update the defconfig accordingly.
>
> In the course of testing this patch I created
> a patch to update the defconfig. I will post it with
> a patch to use DT for SMP but I have some questions about this patch.
>
> It seems to me that the following is also needed:
>
> * Select USE_OF in Kconfig
> * Provide dt_compat in DT_MACHINE_START
> * Provide r8a7779-marzen dts
>
> I have a revised version of this patch which does the above.
> But I wanted to check with you that I am on the right track
> before posting it.

Yes, you are correct. It seems that I was (am) too trigger happy.
Thanks for fixing these.

> Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove
> shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have
> prepated a patch for r8a7779 I have also prepared a patch to remove
> shmobile_smp_init_cpus().

I think we should remove that function, but I'd like to put some
shared code in the same file. So I don't want to remove the file.
Perhaps the easiest is to leave it as-is for now and let me deal with
that in an upcoming series.

> My plan is to post all relevant patches as a series once
> my questions above are resolved.

Sounds good, thanks for your help!

Thanks,

/ magnus

Re: [PATCH] ARM: shmobile: marzen: Switch to DT_MACHINE_START

[Simon Horman]

On Wed, Jul 24, 2013 at 07:00:05PM +0900, Magnus Damm wrote:
> Hi Simon,
> 
> On Wed, Jul 24, 2013 at 5:46 PM, Simon Horman <horms@verge.net.au> wrote:
> > On Wed, Jul 24, 2013 at 04:39:53PM +0900, Simon Horman wrote:
> >> On Wed, Jul 24, 2013 at 04:30:42PM +0900, Magnus Damm wrote:
> >> > From: Magnus Damm <damm@opensource.se>
> >> >
> >> > Convert the marzen board to use DT_MACHINE_START. With this in
> >> > place all mach-shmobile boards use DT_MACHINE_START. Also, this
> >> > makes it possible for the r8a7779 SMP code to use DT for CPUs.
> >> >
> >> > So appended DTB is the way forward on this board.
> >>
> >> Please supply a patch to update the defconfig accordingly.
> >
> > In the course of testing this patch I created
> > a patch to update the defconfig. I will post it with
> > a patch to use DT for SMP but I have some questions about this patch.
> >
> > It seems to me that the following is also needed:
> >
> > * Select USE_OF in Kconfig
> > * Provide dt_compat in DT_MACHINE_START
> > * Provide r8a7779-marzen dts
> >
> > I have a revised version of this patch which does the above.
> > But I wanted to check with you that I am on the right track
> > before posting it.
> 
> Yes, you are correct. It seems that I was (am) too trigger happy.
> Thanks for fixing these.

No problem, I'll post the patches.

> > Also, I think that once sh73a0 and r8a7779 uses DT for SMP we can remove
> > shmobile_smp_init_cpus(). As you have posted a patch for sh73a0 I have
> > prepated a patch for r8a7779 I have also prepared a patch to remove
> > shmobile_smp_init_cpus().
> 
> I think we should remove that function, but I'd like to put some
> shared code in the same file. So I don't want to remove the file.
> Perhaps the easiest is to leave it as-is for now and let me deal with
> that in an upcoming series.

Sure, if that is how you would like to roll.
Another option is to remove the file and then add it back again later.

> > My plan is to post all relevant patches as a series once
> > my questions above are resolved.
> 
> Sounds good, thanks for your help!
> 
> Thanks,
> 
> / magnus
>