| Message ID | 4f4a2dbdb6ba51e151cbdc128da377083b0d850d.1704726960.git.geert+renesas@glider.be |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arm64: renesas: Add R-Car V4M and Gray Hawk Single support | expand |
On Mon, Jan 08, 2024 at 04:33:49PM +0100, Geert Uytterhoeven wrote: > Currently, all Kconfig symbols for R-Car Gen4 SoCs select the > ARCH_RCAR_GEN3 SoC family symbol, which might confuse the casual reader. > > Fix this by introducing a new SoC family symbol for R-Car Gen4 SoCs. > For now this just selects ARCH_RCAR_GEN3, to avoid duplication, and to > relax dependencies. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> > --- Reviewed-by: Wolfram Sang <wsa+renesas@sang-engineering.com> > Once "[PATCH] i2c: rcar: Prepare for the advent of ARCH_RCAR_GEN4"[1] > has been applied, ARCH_RCAR_GEN4 can stop selecting ARCH_RCAR_GEN3. Oh, that's me :) > I'm open for suggestions how to improve this. > Perhaps factor out common parts into ARCH_RCAR? I kinda like the situation after this patch. I'd think using ARCH_RCAR might hurt readability. Also, if Gen5 needs to modify ARCH_RCAR, then we need to fix up old archs. Potential regressions ahead.
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index 0986672f63757663..784a2b50561d5a97 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -34,6 +34,10 @@ config ARCH_RCAR_GEN3 select SYS_SUPPORTS_SH_CMT select SYS_SUPPORTS_SH_TMU +config ARCH_RCAR_GEN4 + bool + select ARCH_RCAR_GEN3 + config ARCH_RMOBILE bool select PM @@ -240,7 +244,7 @@ config ARCH_R8A77961 config ARCH_R8A779F0 bool "ARM64 Platform support for R-Car S4-8" - select ARCH_RCAR_GEN3 + select ARCH_RCAR_GEN4 select SYSC_R8A779F0 help This enables support for the Renesas R-Car S4-8 SoC. @@ -261,14 +265,14 @@ config ARCH_R8A77970 config ARCH_R8A779A0 bool "ARM64 Platform support for R-Car V3U" - select ARCH_RCAR_GEN3 + select ARCH_RCAR_GEN4 select SYSC_R8A779A0 help This enables support for the Renesas R-Car V3U SoC. config ARCH_R8A779G0 bool "ARM64 Platform support for R-Car V4H" - select ARCH_RCAR_GEN3 + select ARCH_RCAR_GEN4 select SYSC_R8A779G0 help This enables support for the Renesas R-Car V4H SoC.
Currently, all Kconfig symbols for R-Car Gen4 SoCs select the ARCH_RCAR_GEN3 SoC family symbol, which might confuse the casual reader. Fix this by introducing a new SoC family symbol for R-Car Gen4 SoCs. For now this just selects ARCH_RCAR_GEN3, to avoid duplication, and to relax dependencies. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Once "[PATCH] i2c: rcar: Prepare for the advent of ARCH_RCAR_GEN4"[1] has been applied, ARCH_RCAR_GEN4 can stop selecting ARCH_RCAR_GEN3. I'm open for suggestions how to improve this. Perhaps factor out common parts into ARCH_RCAR? [1] https://lore.kernel.org/r/bf7b105f7d9728ae5cd9fa99d1cdd278d71e7df2.1704723713.git.geert+renesas@glider.be --- drivers/soc/renesas/Kconfig | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)