[RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[Ulrich Hecht]

This will do for all Gen2 SoCs that do not need SoC-specific setup.

Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
---
 Documentation/devicetree/bindings/arm/shmobile.txt |  8 ++++++--
 arch/arm/mach-shmobile/setup-rcar-gen2.c           | 13 +++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index c4f19b2..29886ab 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -27,12 +27,16 @@ SoCs:
     compatible = "renesas,r8a7793"
   - R-Car E2 (R8A77940)
     compatible = "renesas,r8a7794"
+  - R-Car Gen2 (Generic R-Car Generation 2 SoC)
+    This applies to Generation 2 R-Car SoCs that do not require SoC-specific
+    setup code.
+    compatible = "renesas,rcar-gen2"
 
 
 Boards:
 
   - Alt
-    compatible = "renesas,alt", "renesas,r8a7794"
+    compatible = "renesas,alt", "renesas,r8a7794", "renesas,rcar-gen2"
   - APE6-EVM
     compatible = "renesas,ape6evm", "renesas,r8a73a4"
   - Atmark Techno Armadillo-800 EVA
@@ -44,7 +48,7 @@ Boards:
   - Genmai (RTK772100BC00000BR)
     compatible = "renesas,genmai", "renesas,r7s72100"
   - Gose
-    compatible = "renesas,gose", "renesas,r8a7793"
+    compatible = "renesas,gose", "renesas,r8a7793", "renesas,rcar-gen2"
   - Henninger
     compatible = "renesas,henninger", "renesas,r8a7791"
   - Koelsch (RTP0RC7791SEB00010S)
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 5d13595..0f6b48b 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -201,3 +201,16 @@ void __init rcar_gen2_reserve(void)
 					    &rcar_gen2_dma_contiguous, true);
 #endif
 }
+
+static const char *rcar_gen2_boards_compat_dt[] __initconst = {
+	"renesas,rcar-gen2",
+	NULL,
+};
+
+DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")
+	.init_early	= shmobile_init_delay,
+	.init_time	= rcar_gen2_timer_init,
+	.init_late	= shmobile_init_late,
+	.reserve	= rcar_gen2_reserve,
+	.dt_compat	= rcar_gen2_boards_compat_dt,
+MACHINE_END
-- 
2.3.5

Re: [RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[Laurent Pinchart]

Hi Ulrich,

Thank you for the patch.

On Thursday 21 May 2015 12:50:11 Ulrich Hecht wrote:
> This will do for all Gen2 SoCs that do not need SoC-specific setup.
> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt |  8 ++++++--
>  arch/arm/mach-shmobile/setup-rcar-gen2.c           | 13 +++++++++++++
>  2 files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt
> b/Documentation/devicetree/bindings/arm/shmobile.txt index c4f19b2..29886ab
> 100644
> --- a/Documentation/devicetree/bindings/arm/shmobile.txt
> +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
> @@ -27,12 +27,16 @@ SoCs:
>      compatible = "renesas,r8a7793"
>    - R-Car E2 (R8A77940)
>      compatible = "renesas,r8a7794"
> +  - R-Car Gen2 (Generic R-Car Generation 2 SoC)
> +    This applies to Generation 2 R-Car SoCs that do not require
> SoC-specific
> +    setup code.

I don't think we should mention code in the DT bindings documentation. 
Furthermore, I think we should target support for all Gen2 SoCs, as the only 
difference between the setup-r8a779*.c files is the SMP ops. This will just 
require adding the enable-method DT properties for SMP to all our Gen2 device 
trees.

> +    compatible = "renesas,rcar-gen2"
> 
> 
>  Boards:
> 
>    - Alt
> -    compatible = "renesas,alt", "renesas,r8a7794"
> +    compatible = "renesas,alt", "renesas,r8a7794", "renesas,rcar-gen2"
>    - APE6-EVM
>      compatible = "renesas,ape6evm", "renesas,r8a73a4"
>    - Atmark Techno Armadillo-800 EVA
> @@ -44,7 +48,7 @@ Boards:
>    - Genmai (RTK772100BC00000BR)
>      compatible = "renesas,genmai", "renesas,r7s72100"
>    - Gose
> -    compatible = "renesas,gose", "renesas,r8a7793"
> +    compatible = "renesas,gose", "renesas,r8a7793", "renesas,rcar-gen2"
>    - Henninger
>      compatible = "renesas,henninger", "renesas,r8a7791"
>    - Koelsch (RTP0RC7791SEB00010S)
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 5d13595..0f6b48b 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -201,3 +201,16 @@ void __init rcar_gen2_reserve(void)
>  					    &rcar_gen2_dma_contiguous, true);
>  #endif
>  }
> +
> +static const char *rcar_gen2_boards_compat_dt[] __initconst = {
> +	"renesas,rcar-gen2",
> +	NULL,
> +};
> +
> +DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device
> Tree)")
> +	.init_early	= shmobile_init_delay,
> +	.init_time	= rcar_gen2_timer_init,
> +	.init_late	= shmobile_init_late,
> +	.reserve	= rcar_gen2_reserve,
> +	.dt_compat	= rcar_gen2_boards_compat_dt,
> +MACHINE_END

-- 
Regards,

Laurent Pinchart

Re: [RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[Simon Horman]

Hi Ulrich,

On Thu, May 21, 2015 at 12:50:11PM +0200, Ulrich Hecht wrote:
> This will do for all Gen2 SoCs that do not need SoC-specific setup.

From my point of view the qualification above implies there is
a problem with this approach.

> 
> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt |  8 ++++++--
>  arch/arm/mach-shmobile/setup-rcar-gen2.c           | 13 +++++++++++++
>  2 files changed, 19 insertions(+), 2 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
> index c4f19b2..29886ab 100644
> --- a/Documentation/devicetree/bindings/arm/shmobile.txt
> +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
> @@ -27,12 +27,16 @@ SoCs:
>      compatible = "renesas,r8a7793"
>    - R-Car E2 (R8A77940)
>      compatible = "renesas,r8a7794"
> +  - R-Car Gen2 (Generic R-Car Generation 2 SoC)
> +    This applies to Generation 2 R-Car SoCs that do not require SoC-specific
> +    setup code.
> +    compatible = "renesas,rcar-gen2"
>  
>  
>  Boards:
>  
>    - Alt
> -    compatible = "renesas,alt", "renesas,r8a7794"
> +    compatible = "renesas,alt", "renesas,r8a7794", "renesas,rcar-gen2"
>    - APE6-EVM
>      compatible = "renesas,ape6evm", "renesas,r8a73a4"
>    - Atmark Techno Armadillo-800 EVA
> @@ -44,7 +48,7 @@ Boards:
>    - Genmai (RTK772100BC00000BR)
>      compatible = "renesas,genmai", "renesas,r7s72100"
>    - Gose
> -    compatible = "renesas,gose", "renesas,r8a7793"
> +    compatible = "renesas,gose", "renesas,r8a7793", "renesas,rcar-gen2"
>    - Henninger
>      compatible = "renesas,henninger", "renesas,r8a7791"
>    - Koelsch (RTP0RC7791SEB00010S)
> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index 5d13595..0f6b48b 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -201,3 +201,16 @@ void __init rcar_gen2_reserve(void)
>  					    &rcar_gen2_dma_contiguous, true);
>  #endif
>  }
> +
> +static const char *rcar_gen2_boards_compat_dt[] __initconst = {
> +	"renesas,rcar-gen2",
> +	NULL,
> +};

I would rather not have renesas,rcar-gen2 above and rather have
each SoC that this covers listed above.

> +
> +DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")
> +	.init_early	= shmobile_init_delay,
> +	.init_time	= rcar_gen2_timer_init,
> +	.init_late	= shmobile_init_late,
> +	.reserve	= rcar_gen2_reserve,
> +	.dt_compat	= rcar_gen2_boards_compat_dt,
> +MACHINE_END
> -- 
> 2.3.5
> 
> --
> 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: [RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[Geert Uytterhoeven]

Hi Ulrich,

On Thu, May 21, 2015 at 12:50 PM, Ulrich Hecht
<ulrich.hecht+renesas@gmail.com> wrote:
> This will do for all Gen2 SoCs that do not need SoC-specific setup.

Thanks for your patch!

> Signed-off-by: Ulrich Hecht <ulrich.hecht+renesas@gmail.com>
> ---
>  Documentation/devicetree/bindings/arm/shmobile.txt |  8 ++++++--
>  arch/arm/mach-shmobile/setup-rcar-gen2.c           | 13 +++++++++++++
>  2 files changed, 19 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
> index c4f19b2..29886ab 100644
> --- a/Documentation/devicetree/bindings/arm/shmobile.txt
> +++ b/Documentation/devicetree/bindings/arm/shmobile.txt
> @@ -27,12 +27,16 @@ SoCs:
>      compatible = "renesas,r8a7793"
>    - R-Car E2 (R8A77940)
>      compatible = "renesas,r8a7794"
> +  - R-Car Gen2 (Generic R-Car Generation 2 SoC)
> +    This applies to Generation 2 R-Car SoCs that do not require SoC-specific
> +    setup code.

As Laurent already commented, please drop the part mentioning code.
DTS describes the hardware, not (Linux) implementation.

Please also add that this should be present as a fallback, like we do for
bindings for on-SoC devices.

> +    compatible = "renesas,rcar-gen2"
>
>
>  Boards:
>
>    - Alt
> -    compatible = "renesas,alt", "renesas,r8a7794"
> +    compatible = "renesas,alt", "renesas,r8a7794", "renesas,rcar-gen2"
>    - APE6-EVM
>      compatible = "renesas,ape6evm", "renesas,r8a73a4"
>    - Atmark Techno Armadillo-800 EVA
> @@ -44,7 +48,7 @@ Boards:
>    - Genmai (RTK772100BC00000BR)
>      compatible = "renesas,genmai", "renesas,r7s72100"
>    - Gose
> -    compatible = "renesas,gose", "renesas,r8a7793"
> +    compatible = "renesas,gose", "renesas,r8a7793", "renesas,rcar-gen2"
>    - Henninger
>      compatible = "renesas,henninger", "renesas,r8a7791"
>    - Koelsch (RTP0RC7791SEB00010S)

All of them should gain "renesas,rcar-gen2".
This should actually work for r8a7790/1, wich must use the SoC-specific
machine_desc, as setup-r8a7790.o and setup-r8a7791.o are linked before
setup-rcar-gen2.o (or does someone do .arch.info.init section order
randomization?).

> diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> index 5d13595..0f6b48b 100644
> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
> @@ -201,3 +201,16 @@ void __init rcar_gen2_reserve(void)
>                                             &rcar_gen2_dma_contiguous, true);
>  #endif
>  }
> +
> +static const char *rcar_gen2_boards_compat_dt[] __initconst = {
> +       "renesas,rcar-gen2",
> +       NULL,
> +};
> +
> +DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")
> +       .init_early     = shmobile_init_delay,
> +       .init_time      = rcar_gen2_timer_init,
> +       .init_late      = shmobile_init_late,
> +       .reserve        = rcar_gen2_reserve,
> +       .dt_compat      = rcar_gen2_boards_compat_dt,

This is yet another order of the fields... Perhaps it's best to use the
definition order in arch/arm/include/asm/mach/arch.h?

> +MACHINE_END

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [RFC 1/3] ARM: shmobile: rcar-gen2: Add generic "renesas,rcar-gen2" machine

[Geert Uytterhoeven]

Hi Simon,

On Mon, May 25, 2015 at 3:17 AM, Simon Horman <horms@verge.net.au> wrote:
>> --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
>> +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
>> @@ -201,3 +201,16 @@ void __init rcar_gen2_reserve(void)
>>                                           &rcar_gen2_dma_contiguous, true);
>>  #endif
>>  }
>> +
>> +static const char *rcar_gen2_boards_compat_dt[] __initconst = {
>> +     "renesas,rcar-gen2",
>> +     NULL,
>> +};
>
> I would rather not have renesas,rcar-gen2 above and rather have
> each SoC that this covers listed above.

If there's no SoC-specific compatible entry needed for differentiation, we
can use the generic compatible entry here fine, just like we do for device
drivers.
The SoC-specific one is still documented in the binding documentation.

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds