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@xxxxxxxxxxx>
---
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
