[PATCH v2 0/3] pmdomain: renesas: sort Kconfig again

[PATCH v2 0/3] pmdomain: renesas: sort Kconfig again

[Kuninori Morimoto]

Hi Ulf, Geert

Renesas Kconfig is using "SoC chip number" for CONFIG symbol, but is
using "SoC chip name" for menu description. Because of it, it looks
random order when we run "make menuconfig".
    
We have sorted it by "menu description title order" (= SoC chip name),
but it makes confuse, because developer usually checks CONFIG symbols
(= SoC chip number).
    
Let's indicate both "SoC chip number" and "SoC chip name" in description
and sort it again.

v1 -> v2
	- tidyup git-log [2/3]
	- tidyup comment [2/3]
	- separate R8A7791 and R8A7793 [3/3]

Kuninori Morimoto (3):
  pmdomain: renesas: use menu for Renesas
  pmdomain: renesas: sort Renesas Kconfig configs
  pmdomain: renesas: separate R8A7791/R8A7793

 drivers/pmdomain/renesas/Kconfig     | 126 ++++++++++++++-------------
 drivers/pmdomain/renesas/Makefile    |   1 +
 drivers/pmdomain/renesas/rcar-sysc.c |   5 +-
 drivers/soc/renesas/Kconfig          |   2 +-
 4 files changed, 72 insertions(+), 62 deletions(-)

-- 
2.43.0

[PATCH v2 1/3] pmdomain: renesas: use menu for Renesas

[Kuninori Morimoto]

Current Renesas PM Domains appears on top page. Let's create new
menu for Renesas.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pmdomain/renesas/Kconfig | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pmdomain/renesas/Kconfig b/drivers/pmdomain/renesas/Kconfig
index 54acb4b1ec7c..70bd6605a97c 100644
--- a/drivers/pmdomain/renesas/Kconfig
+++ b/drivers/pmdomain/renesas/Kconfig
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 if SOC_RENESAS
+menu "Renesas PM Domains"
 
 config SYSC_RCAR
 	bool "System Controller support for R-Car" if COMPILE_TEST
@@ -110,4 +111,5 @@ config SYSC_R8A774B1
 	bool "System Controller support for RZ/G2N" if COMPILE_TEST
 	select SYSC_RCAR
 
+endmenu
 endif
-- 
2.43.0

[PATCH v2 2/3] pmdomain: renesas: sort Renesas Kconfig configs

[Kuninori Morimoto]

Renesas Kconfig is using "SoC chip number" for CONFIG symbol, but is
using "SoC chip name" for menu description. Because of it, it looks
random order when we run "make menuconfig".

commit 6d5aded8d57f ("soc: renesas: Sort driver description title")
sorted Renesas Kconfig by "menu description title order" (= SoC chip
name), but it makes confusable to add new config, because developer
usually checks CONFIG symbols (= SoC chip number).

Let's indicate both "SoC chip number" and "SoC chip name" in description
and sort it again.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/pmdomain/renesas/Kconfig | 122 ++++++++++++++++---------------
 1 file changed, 62 insertions(+), 60 deletions(-)

diff --git a/drivers/pmdomain/renesas/Kconfig b/drivers/pmdomain/renesas/Kconfig
index 70bd6605a97c..b507c3e0d723 100644
--- a/drivers/pmdomain/renesas/Kconfig
+++ b/drivers/pmdomain/renesas/Kconfig
@@ -2,114 +2,116 @@
 if SOC_RENESAS
 menu "Renesas PM Domains"
 
+# SoC Family
 config SYSC_RCAR
 	bool "System Controller support for R-Car" if COMPILE_TEST
 
 config SYSC_RCAR_GEN4
 	bool "System Controller support for R-Car Gen4" if COMPILE_TEST
 
-config SYSC_R8A77995
-	bool "System Controller support for R-Car D3" if COMPILE_TEST
+config SYSC_RMOBILE
+	bool "System Controller support for R-Mobile" if COMPILE_TEST
+
+# SoC
+config SYSC_R8A7742
+	bool "System Controller support for R8A7742 (RZ/G1H)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7794
-	bool "System Controller support for R-Car E2" if COMPILE_TEST
+config SYSC_R8A7743
+	bool "System Controller support for R8A7743 (RZ/G1M)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77990
-	bool "System Controller support for R-Car E3" if COMPILE_TEST
+config SYSC_R8A7745
+	bool "System Controller support for R8A7745 (RZ/G1E)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7779
-	bool "System Controller support for R-Car H1" if COMPILE_TEST
+config SYSC_R8A77470
+	bool "System Controller support for R8A77470 (RZ/G1C)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7790
-	bool "System Controller support for R-Car H2" if COMPILE_TEST
+config SYSC_R8A774A1
+	bool "System Controller support for R8A774A1 (RZ/G2M)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7795
-	bool "System Controller support for R-Car H3" if COMPILE_TEST
+config SYSC_R8A774B1
+	bool "System Controller support for R8A774B1 (RZ/G2N)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7791
-	bool "System Controller support for R-Car M2-W/N" if COMPILE_TEST
+config SYSC_R8A774C0
+	bool "System Controller support for R8A774C0 (RZ/G2E)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77965
-	bool "System Controller support for R-Car M3-N" if COMPILE_TEST
+config SYSC_R8A774E1
+	bool "System Controller support for R8A774E1 (RZ/G2H)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77960
-	bool "System Controller support for R-Car M3-W" if COMPILE_TEST
+config SYSC_R8A7779
+	bool "System Controller support for R8A7779 (R-Car H1)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77961
-	bool "System Controller support for R-Car M3-W+" if COMPILE_TEST
+config SYSC_R8A7790
+	bool "System Controller support for R8A7790 (R-Car H2)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A779F0
-	bool "System Controller support for R-Car S4-8" if COMPILE_TEST
-	select SYSC_RCAR_GEN4
+config SYSC_R8A7791
+	bool "System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)" if COMPILE_TEST
+	select SYSC_RCAR
 
 config SYSC_R8A7792
-	bool "System Controller support for R-Car V2H" if COMPILE_TEST
+	bool "System Controller support for R8A7792 (R-Car V2H)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77980
-	bool "System Controller support for R-Car V3H" if COMPILE_TEST
+config SYSC_R8A7794
+	bool "System Controller support for R8A7794 (R-Car E2)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A77970
-	bool "System Controller support for R-Car V3M" if COMPILE_TEST
+config SYSC_R8A7795
+	bool "System Controller support for R8A7795 (R-Car H3)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A779A0
-	bool "System Controller support for R-Car V3U" if COMPILE_TEST
-	select SYSC_RCAR_GEN4
-
-config SYSC_R8A779G0
-	bool "System Controller support for R-Car V4H" if COMPILE_TEST
-	select SYSC_RCAR_GEN4
-
-config SYSC_R8A779H0
-	bool "System Controller support for R-Car V4M" if COMPILE_TEST
-	select SYSC_RCAR_GEN4
-
-config SYSC_RMOBILE
-	bool "System Controller support for R-Mobile" if COMPILE_TEST
-
-config SYSC_R8A77470
-	bool "System Controller support for RZ/G1C" if COMPILE_TEST
+config SYSC_R8A77960
+	bool "System Controller support for R8A77960 (R-Car M3-W)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7745
-	bool "System Controller support for RZ/G1E" if COMPILE_TEST
+config SYSC_R8A77961
+	bool "System Controller support for R8A77961 (R-Car M3-W+)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7742
-	bool "System Controller support for RZ/G1H" if COMPILE_TEST
+config SYSC_R8A77965
+	bool "System Controller support for R8A77965 (R-Car M3-N)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A7743
-	bool "System Controller support for RZ/G1M" if COMPILE_TEST
+config SYSC_R8A77970
+	bool "System Controller support for R8A77970 (R-Car V3M)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A774C0
-	bool "System Controller support for RZ/G2E" if COMPILE_TEST
+config SYSC_R8A77980
+	bool "System Controller support for R8A77980 (R-Car V3H)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A774E1
-	bool "System Controller support for RZ/G2H" if COMPILE_TEST
+config SYSC_R8A77990
+	bool "System Controller support for R8A77990 (R-Car E3)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A774A1
-	bool "System Controller support for RZ/G2M" if COMPILE_TEST
+config SYSC_R8A77995
+	bool "System Controller support for R8A77995 (R-Car D3)" if COMPILE_TEST
 	select SYSC_RCAR
 
-config SYSC_R8A774B1
-	bool "System Controller support for RZ/G2N" if COMPILE_TEST
-	select SYSC_RCAR
+config SYSC_R8A779A0
+	bool "System Controller support for R8A779A0 (R-Car V3U)" if COMPILE_TEST
+	select SYSC_RCAR_GEN4
+
+config SYSC_R8A779F0
+	bool "System Controller support for R8A779F0 (R-Car S4-8)" if COMPILE_TEST
+	select SYSC_RCAR_GEN4
+
+config SYSC_R8A779G0
+	bool "System Controller support for R8A779G0 (R-Car V4H)" if COMPILE_TEST
+	select SYSC_RCAR_GEN4
+
+config SYSC_R8A779H0
+	bool "System Controller support for R8A779H0 (R-Car V4M)" if COMPILE_TEST
+	select SYSC_RCAR_GEN4
 
 endmenu
 endif
-- 
2.43.0

[PATCH v2 3/3] pmdomain: renesas: separate R8A7791/R8A7793

[Kuninori Morimoto]

R8A7791/R8A7793 are sharing same code, but because of it, Kconfig
settings is a little bit confusable. Let's separete these.

Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
 drivers/pmdomain/renesas/Kconfig     | 6 +++++-
 drivers/pmdomain/renesas/Makefile    | 1 +
 drivers/pmdomain/renesas/rcar-sysc.c | 5 +++--
 drivers/soc/renesas/Kconfig          | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/pmdomain/renesas/Kconfig b/drivers/pmdomain/renesas/Kconfig
index b507c3e0d723..d8a2fed2fd26 100644
--- a/drivers/pmdomain/renesas/Kconfig
+++ b/drivers/pmdomain/renesas/Kconfig
@@ -54,13 +54,17 @@ config SYSC_R8A7790
 	select SYSC_RCAR
 
 config SYSC_R8A7791
-	bool "System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)" if COMPILE_TEST
+	bool "System Controller support for R8A7791 (R-Car M2-W)" if COMPILE_TEST
 	select SYSC_RCAR
 
 config SYSC_R8A7792
 	bool "System Controller support for R8A7792 (R-Car V2H)" if COMPILE_TEST
 	select SYSC_RCAR
 
+config SYSC_R8A7793
+	bool "System Controller support for R8A7793 (R-Car M2-N)" if COMPILE_TEST
+	select SYSC_RCAR
+
 config SYSC_R8A7794
 	bool "System Controller support for R8A7794 (R-Car E2)" if COMPILE_TEST
 	select SYSC_RCAR
diff --git a/drivers/pmdomain/renesas/Makefile b/drivers/pmdomain/renesas/Makefile
index 0391e6e67440..0ea5798519e0 100644
--- a/drivers/pmdomain/renesas/Makefile
+++ b/drivers/pmdomain/renesas/Makefile
@@ -12,6 +12,7 @@ obj-$(CONFIG_SYSC_R8A7779)	+= r8a7779-sysc.o
 obj-$(CONFIG_SYSC_R8A7790)	+= r8a7790-sysc.o
 obj-$(CONFIG_SYSC_R8A7791)	+= r8a7791-sysc.o
 obj-$(CONFIG_SYSC_R8A7792)	+= r8a7792-sysc.o
+obj-$(CONFIG_SYSC_R8A7793)	+= r8a7791-sysc.o # same as r8a7791
 obj-$(CONFIG_SYSC_R8A7794)	+= r8a7794-sysc.o
 obj-$(CONFIG_SYSC_R8A7795)	+= r8a7795-sysc.o
 obj-$(CONFIG_SYSC_R8A77960)	+= r8a77960-sysc.o
diff --git a/drivers/pmdomain/renesas/rcar-sysc.c b/drivers/pmdomain/renesas/rcar-sysc.c
index 047495f54e8a..ea6e15865f14 100644
--- a/drivers/pmdomain/renesas/rcar-sysc.c
+++ b/drivers/pmdomain/renesas/rcar-sysc.c
@@ -300,12 +300,13 @@ static const struct of_device_id rcar_sysc_matches[] __initconst = {
 #endif
 #ifdef CONFIG_SYSC_R8A7791
 	{ .compatible = "renesas,r8a7791-sysc", .data = &r8a7791_sysc_info },
-	/* R-Car M2-N is identical to R-Car M2-W w.r.t. power domains. */
-	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info },
 #endif
 #ifdef CONFIG_SYSC_R8A7792
 	{ .compatible = "renesas,r8a7792-sysc", .data = &r8a7792_sysc_info },
 #endif
+#ifdef CONFIG_SYSC_R8A7793
+	{ .compatible = "renesas,r8a7793-sysc", .data = &r8a7791_sysc_info }, /* same as r8a7791 */
+#endif
 #ifdef CONFIG_SYSC_R8A7794
 	{ .compatible = "renesas,r8a7794-sysc", .data = &r8a7794_sysc_info },
 #endif
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 5213eb485a05..da677cbb156c 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -188,7 +188,7 @@ config ARCH_R8A7793
 	select ARCH_RCAR_GEN2
 	select ARM_ERRATA_798181 if SMP
 	select I2C
-	select SYSC_R8A7791
+	select SYSC_R8A7793
 
 config ARCH_R8A7794
 	bool "ARM32 Platform support for R8A7794 (R-Car E2)"
-- 
2.43.0

Re: [PATCH v2 3/3] pmdomain: renesas: separate R8A7791/R8A7793

[Geert Uytterhoeven]

Hi Morimoto-san,

On Thu, 3 Jul 2025 at 03:49, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> R8A7791/R8A7793 are sharing same code, but because of it, Kconfig
> settings is a little bit confusable. Let's separete these.
>
> Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

Thanks for your patch!

> --- a/drivers/pmdomain/renesas/Kconfig
> +++ b/drivers/pmdomain/renesas/Kconfig
> @@ -54,13 +54,17 @@ config SYSC_R8A7790
>         select SYSC_RCAR
>
>  config SYSC_R8A7791
> -       bool "System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)" if COMPILE_TEST
> +       bool "System Controller support for R8A7791 (R-Car M2-W)" if COMPILE_TEST
>         select SYSC_RCAR
>
>  config SYSC_R8A7792
>         bool "System Controller support for R8A7792 (R-Car V2H)" if COMPILE_TEST
>         select SYSC_RCAR
>
> +config SYSC_R8A7793
> +       bool "System Controller support for R8A7793 (R-Car M2-N)" if COMPILE_TEST
> +       select SYSC_RCAR
> +
>  config SYSC_R8A7794
>         bool "System Controller support for R8A7794 (R-Car E2)" if COMPILE_TEST
>         select SYSC_RCAR

When configuring the kernel for a Renesas platform, all SYSC_* symbols
are invisible symbols, which are auto-selected when needed.  So I see
no need to complicate this internal invisible logic.

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: [PATCH v2 3/3] pmdomain: renesas: separate R8A7791/R8A7793

[Kuninori Morimoto]

Hi Geert

> >  config SYSC_R8A7791
> > -       bool "System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)" if COMPILE_TEST
> > +       bool "System Controller support for R8A7791 (R-Car M2-W)" if COMPILE_TEST
> >         select SYSC_RCAR
> >
> >  config SYSC_R8A7792
> >         bool "System Controller support for R8A7792 (R-Car V2H)" if COMPILE_TEST
> >         select SYSC_RCAR
> >
> > +config SYSC_R8A7793
> > +       bool "System Controller support for R8A7793 (R-Car M2-N)" if COMPILE_TEST
> > +       select SYSC_RCAR
> > +
> >  config SYSC_R8A7794
> >         bool "System Controller support for R8A7794 (R-Car E2)" if COMPILE_TEST
> >         select SYSC_RCAR
> 
> When configuring the kernel for a Renesas platform, all SYSC_* symbols
> are invisible symbols, which are auto-selected when needed.  So I see
> no need to complicate this internal invisible logic.

Hmm ? Yes, but it is for Renesas case.
non-Renesas can select it, because it has "if COMPILE_TEST" ?

I can see like this (via x86)

	...
	[*] System Controller support for R8A7779 (R-Car H1)
	[*] System Controller support for R8A7790 (R-Car H2)
=>	[*] System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)
	[*] System Controller support for R8A7792 (R-Car V2H)
	[*] System Controller support for R8A7794 (R-Car E2)
	...



Thank you for your help !!

Best regards
---
Kuninori Morimoto

Re: [PATCH v2 3/3] pmdomain: renesas: separate R8A7791/R8A7793

[Geert Uytterhoeven]

Hi Morimoto-san,

On Fri, 4 Jul 2025 at 01:03, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
> > >  config SYSC_R8A7791
> > > -       bool "System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)" if COMPILE_TEST
> > > +       bool "System Controller support for R8A7791 (R-Car M2-W)" if COMPILE_TEST
> > >         select SYSC_RCAR
> > >
> > >  config SYSC_R8A7792
> > >         bool "System Controller support for R8A7792 (R-Car V2H)" if COMPILE_TEST
> > >         select SYSC_RCAR
> > >
> > > +config SYSC_R8A7793
> > > +       bool "System Controller support for R8A7793 (R-Car M2-N)" if COMPILE_TEST
> > > +       select SYSC_RCAR
> > > +
> > >  config SYSC_R8A7794
> > >         bool "System Controller support for R8A7794 (R-Car E2)" if COMPILE_TEST
> > >         select SYSC_RCAR
> >
> > When configuring the kernel for a Renesas platform, all SYSC_* symbols
> > are invisible symbols, which are auto-selected when needed.  So I see
> > no need to complicate this internal invisible logic.
>
> Hmm ? Yes, but it is for Renesas case.
> non-Renesas can select it, because it has "if COMPILE_TEST" ?
>
> I can see like this (via x86)
>
>         ...
>         [*] System Controller support for R8A7779 (R-Car H1)
>         [*] System Controller support for R8A7790 (R-Car H2)
> =>      [*] System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)
>         [*] System Controller support for R8A7792 (R-Car V2H)
>         [*] System Controller support for R8A7794 (R-Car E2)
>         ...

Is that really a problem? This is shown only when compile-testing.

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: [PATCH v2 3/3] pmdomain: renesas: separate R8A7791/R8A7793

[Kuninori Morimoto]

Hi Geert

> >         [*] System Controller support for R8A7779 (R-Car H1)
> >         [*] System Controller support for R8A7790 (R-Car H2)
> > =>      [*] System Controller support for R8A7791/R8A7793 (R-Car M2-W/N)
> >         [*] System Controller support for R8A7792 (R-Car V2H)
> >         [*] System Controller support for R8A7794 (R-Car E2)
> >         ...
> 
> Is that really a problem? This is shown only when compile-testing.

Not a problem, just a clean up.
It is confusable.

Thank you for your help !!

Best regards
---
Kuninori Morimoto

Re: [PATCH v2 0/3] pmdomain: renesas: sort Kconfig again

[Ulf Hansson]

On Thu, 3 Jul 2025 at 03:48, Kuninori Morimoto
<kuninori.morimoto.gx@renesas.com> wrote:
>
>
> Hi Ulf, Geert
>
> Renesas Kconfig is using "SoC chip number" for CONFIG symbol, but is
> using "SoC chip name" for menu description. Because of it, it looks
> random order when we run "make menuconfig".
>
> We have sorted it by "menu description title order" (= SoC chip name),
> but it makes confuse, because developer usually checks CONFIG symbols
> (= SoC chip number).
>
> Let's indicate both "SoC chip number" and "SoC chip name" in description
> and sort it again.
>
> v1 -> v2
>         - tidyup git-log [2/3]
>         - tidyup comment [2/3]
>         - separate R8A7791 and R8A7793 [3/3]
>
> Kuninori Morimoto (3):
>   pmdomain: renesas: use menu for Renesas
>   pmdomain: renesas: sort Renesas Kconfig configs
>   pmdomain: renesas: separate R8A7791/R8A7793
>
>  drivers/pmdomain/renesas/Kconfig     | 126 ++++++++++++++-------------
>  drivers/pmdomain/renesas/Makefile    |   1 +
>  drivers/pmdomain/renesas/rcar-sysc.c |   5 +-
>  drivers/soc/renesas/Kconfig          |   2 +-
>  4 files changed, 72 insertions(+), 62 deletions(-)
>
> --
> 2.43.0
>

Patch 1->2 applied for next and leaving patch3 for you to conclude on
the next step, if any.

Kind regards
Uffe