[00/05] ARM: shmobile: KZM9D Multiplatform update

Commit Message

Laurent Pinchart Oct. 4, 2013, 7:47 a.m. UTC

Hi Magnus,

Thank you for the patches.

On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> ARM: shmobile: KZM9D Multiplatform update
> 
> [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> support
> [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS

I've reviewed the patches and they look fine to me.

Acked-by: Laurent Pinchart <[e-mail]>

Does this call for the following patch on top of 05/05 ?

From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
From: Laurent Pinchart <[e-mail]>
Date: Fri, 4 Oct 2013 09:44:34 +0200
Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
 string

The only system compatible string used for the KZM9D board is
"renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
compatible string.

Signed-off-by: Laurent Pinchart <[e-mail]>
---
 arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
 1 file changed, 1 deletion(-)

> This series updates mach-shmobile and the KZM9D board code to propose
> a way forward for future CCF-enabled multiplatform board support.
> 
> With this series applied the following rules apply:
> 
>  - CONFIG_ARCH_MULTIPLATFORM=y is used to enable multiplatform
>    - CONFIG_ARCH_SHMOBILE_MULTI=y is used in case of multiplatform build
>  - CONFIG_ARCH SHMOBILE=y is used in case of legacy non-multiplatform build
>  - CONFIG_MACH_KZM9D=y enables KZM9D board support regardless of
> multiplatform
>   - In case of multiplatform build board-kzm9d-reference.c is used
>   - In case of legacy non-multiplatform build board-kzm9d.c is used
> - KZM9D reference can no longer be built for non-multiplatform
> - CONFIG_MACH_KZM9D_REFERENCE actually no longer exists
> - emev2-kzm9d-reference.dts has been removed, use emev2-kzm9d.dts instead
> - The same emev2-kzm9d.dts is used regardless of kernel configuration
>   - emev2-kzm9d.dtb can be used with legacy non-multiplatform
>   - emev2-kzm9d.dtb can be used with multiplatform
> 
> In practice the above means that legacy board code users can keep on using
> existing emev2-kzm9d.dtb as-is, but when updating to multiplatform kernel
> the DTB needs to be updated as well and from that point the DTB needs to
> be updated whenever new hardware is added.
> 
> The above seems pretty straight forward from my point of view, so I
> propose that we follow the same style for future multiplatform board
> support.
> 
> Before merging this series I'd like to see Yoshii-san's CCF patches
> for KZM9D and EMEV2 to be finalized and picked up.
> 
> Signed-off-by: Magnus Damm <[e-mail]>
> ---
> 
>  Written against renesas.git tag renesas-devel-20131001 and
>  [PATCH 00/10] ARM: shmobile: r8a7791 SoC and Koelsch update V2
>  plus selected CCF patches from Yoshii-san.
> 
>  arch/arm/boot/dts/Makefile                     |    3 -
>  arch/arm/boot/dts/emev2-kzm9d-reference.dts    |   57 ---------------------
>  arch/arm/boot/dts/emev2-kzm9d.dts              |   33 +++++++++++++
>  arch/arm/mach-shmobile/Kconfig                 |   22 ---------
>  arch/arm/mach-shmobile/Makefile                |    5 +-
>  arch/arm/mach-shmobile/Makefile.boot           |    1
>  arch/arm/mach-shmobile/board-kzm9d-reference.c |    1

Comments

Simon Horman Oct. 4, 2013, 8:25 a.m. UTC | #1

On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
> Hi Magnus,
> 
> Thank you for the patches.
> 
> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> > ARM: shmobile: KZM9D Multiplatform update
> > 
> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> > support
> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
> 
> I've reviewed the patches and they look fine to me.
> 
> Acked-by: Laurent Pinchart <[e-mail]>
> 
> Does this call for the following patch on top of 05/05 ?
> 
> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
> From: Laurent Pinchart <[e-mail]>
> Date: Fri, 4 Oct 2013 09:44:34 +0200
> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
>  string
> 
> The only system compatible string used for the KZM9D board is
> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
> compatible string.
> 
> Signed-off-by: Laurent Pinchart <[e-mail]>
> ---
>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> index 054d8d5..d2c6466 100644
> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
>  
>  static const char *kzm9d_boards_compat_dt[] __initdata = {
>  	"renesas,kzm9d",
> -	"renesas,kzm9d-reference",
>  	NULL,
>  };

In theory no because someone might be using a DTS with
renesas,kzm9d-reference in the wild. In practice I don't think
that is the case so I feel ok about this patch. Magnus, what
do you think?

Magnus Damm Oct. 4, 2013, 8:55 a.m. UTC | #2

On Fri, Oct 4, 2013 at 5:25 PM, Simon Horman <[e-mail]> wrote:
> On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
>> Hi Magnus,
>>
>> Thank you for the patches.
>>
>> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
>> > ARM: shmobile: KZM9D Multiplatform update
>> >
>> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
>> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
>> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
>> > support
>> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
>> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
>>
>> I've reviewed the patches and they look fine to me.
>>
>> Acked-by: Laurent Pinchart <[e-mail]>
>>
>> Does this call for the following patch on top of 05/05 ?
>>
>> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
>> From: Laurent Pinchart <[e-mail]>
>> Date: Fri, 4 Oct 2013 09:44:34 +0200
>> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
>>  string
>>
>> The only system compatible string used for the KZM9D board is
>> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
>> compatible string.
>>
>> Signed-off-by: Laurent Pinchart <[e-mail]>
>> ---
>>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
>>  1 file changed, 1 deletion(-)
>>
>> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> index 054d8d5..d2c6466 100644
>> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
>> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
>>
>>  static const char *kzm9d_boards_compat_dt[] __initdata = {
>>       "renesas,kzm9d",
>> -     "renesas,kzm9d-reference",
>>       NULL,
>>  };
>
> In theory no because someone might be using a DTS with
> renesas,kzm9d-reference in the wild. In practice I don't think
> that is the case so I feel ok about this patch. Magnus, what
> do you think?

Hi Simon and Laurent,

Thanks for the patch and the comments. I agree with Laurent that this
patch series isn't complete without that patch, but at the same time I
agree with Simon about current state. =) So I propose that this patch
should be merged later on - in say half a year or so.

Perhaps we should aim that the kernel used for the LTSI after
LTSI-3.10 should include this fix?

Another activity we need to deal with in the future is to depreciate
the non-multiplatform board support. It's probably good to hear from
the ARM SoC guys what kind of schedule they have in mind for the
common ARM architecture bits.

Cheers,

/ magnus

Simon Horman Oct. 8, 2013, 1:25 a.m. UTC | #3

On Fri, Oct 04, 2013 at 05:55:47PM +0900, Magnus Damm wrote:
> On Fri, Oct 4, 2013 at 5:25 PM, Simon Horman <[e-mail]> wrote:
> > On Fri, Oct 04, 2013 at 09:47:34AM +0200, Laurent Pinchart wrote:
> >> Hi Magnus,
> >>
> >> Thank you for the patches.
> >>
> >> On Tuesday 01 October 2013 19:32:55 Magnus Damm wrote:
> >> > ARM: shmobile: KZM9D Multiplatform update
> >> >
> >> > [PATCH 01/05] ARM: shmobile: Sync KZM9D DTS with KZM9D reference DTS
> >> > [PATCH 02/05] ARM: shmobile: Use KZM9D without reference for multiplatform
> >> > [PATCH 03/05] ARM: shmobile: Remove non-multiplatform KZM9D reference
> >> > support
> >> > [PATCH 04/05] ARM: shmobile: Let KZM9D multiplatform boot with KZM9D DTB
> >> > [PATCH 05/05] ARM: shmobile: Remove KDM9D reference DTS
> >>
> >> I've reviewed the patches and they look fine to me.
> >>
> >> Acked-by: Laurent Pinchart <[e-mail]>
> >>
> >> Does this call for the following patch on top of 05/05 ?
> >>
> >> >From b167bcd3182f0310b91e502672547e58addf17ef Mon Sep 17 00:00:00 2001
> >> From: Laurent Pinchart <[e-mail]>
> >> Date: Fri, 4 Oct 2013 09:44:34 +0200
> >> Subject: [PATCH] ARM: shmobile: kzm9d-reference: Drop -reference compatible
> >>  string
> >>
> >> The only system compatible string used for the KZM9D board is
> >> "renesas,kzm9d". Drop support for the old "renesas,kzm9d-reference"
> >> compatible string.
> >>
> >> Signed-off-by: Laurent Pinchart <[e-mail]>
> >> ---
> >>  arch/arm/mach-shmobile/board-kzm9d-reference.c | 1 -
> >>  1 file changed, 1 deletion(-)
> >>
> >> diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> index 054d8d5..d2c6466 100644
> >> --- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> +++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
> >> @@ -34,7 +34,6 @@ static void __init kzm9d_add_standard_devices(void)
> >>
> >>  static const char *kzm9d_boards_compat_dt[] __initdata = {
> >>       "renesas,kzm9d",
> >> -     "renesas,kzm9d-reference",
> >>       NULL,
> >>  };
> >
> > In theory no because someone might be using a DTS with
> > renesas,kzm9d-reference in the wild. In practice I don't think
> > that is the case so I feel ok about this patch. Magnus, what
> > do you think?
> 
> Hi Simon and Laurent,
> 
> Thanks for the patch and the comments. I agree with Laurent that this
> patch series isn't complete without that patch, but at the same time I
> agree with Simon about current state. =) So I propose that this patch
> should be merged later on - in say half a year or so.

Sure. I will leave it hanging around in patchwork to try
and remind us (me) to do something with it later.

> Perhaps we should aim that the kernel used for the LTSI after
> LTSI-3.10 should include this fix?

Sounds reasonable.

> Another activity we need to deal with in the future is to depreciate
> the non-multiplatform board support. It's probably good to hear from
> the ARM SoC guys what kind of schedule they have in mind for the
> common ARM architecture bits.

Perhaps a discussion for another thread?

Patch

diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
index 054d8d5..d2c6466 100644
--- a/arch/arm/mach-shmobile/board-kzm9d-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -34,7 +34,6 @@  static void __init kzm9d_add_standard_devices(void)
 
 static const char *kzm9d_boards_compat_dt[] __initdata = {
 	"renesas,kzm9d",
-	"renesas,kzm9d-reference",
 	NULL,
 };