@@ -67,19 +67,17 @@ config ARCH_R7S9210
select RENESAS_OSTM
select RENESAS_RZA1_IRQC
-config ARCH_R8A73A4
- bool "SoC Platform support for R-Mobile APE6" if ARM && ARCH_RENESAS
- select ARCH_RMOBILE
- select ARM_ERRATA_798181 if SMP
+config ARCH_R8A77470
+ bool "SoC Platform support for RZ/G1C" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN2
select ARM_ERRATA_814220
- select HAVE_ARM_ARCH_TIMER
- select RENESAS_IRQC
+ select SYSC_R8A77470
-config ARCH_R8A7740
- bool "SoC Platform support for R-Mobile A1" if ARM && ARCH_RENESAS
- select ARCH_RMOBILE
- select ARM_ERRATA_754322
- select RENESAS_INTC_IRQPIN
+config ARCH_R8A7745
+ bool "SoC Platform support for RZ/G1E" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN2
+ select ARM_ERRATA_814220
+ select SYSC_R8A7745
config ARCH_R8A7742
bool "SoC Platform support for RZ/G1H" if ARM && ARCH_RENESAS
@@ -100,22 +98,58 @@ config ARCH_R8A7744
select ARM_ERRATA_798181 if SMP
select SYSC_R8A7743
-config ARCH_R8A7745
- bool "SoC Platform support for RZ/G1E" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN2
+config ARCH_R8A774C0
+ bool "SoC Platform support for RZ/G2E" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A774C0
+ help
+ This enables support for the Renesas RZ/G2E SoC.
+
+config ARCH_R8A774E1
+ bool "SoC Platform support for RZ/G2H" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A774E1
+ help
+ This enables support for the Renesas RZ/G2H SoC.
+
+config ARCH_R8A774A1
+ bool "SoC Platform support for RZ/G2M" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A774A1
+ help
+ This enables support for the Renesas RZ/G2M SoC.
+
+config ARCH_R8A774B1
+ bool "SoC Platform support for RZ/G2N" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A774B1
+ help
+ This enables support for the Renesas RZ/G2N SoC.
+
+config ARCH_R9A06G032
+ bool "SoC Platform support for RZ/N1D" if ARM && ARCH_RENESAS
+ select ARCH_RZN1
select ARM_ERRATA_814220
- select SYSC_R8A7745
-config ARCH_R8A77470
- bool "SoC Platform support for RZ/G1C" if ARM && ARCH_RENESAS
+config ARCH_R8A77995
+ bool "SoC Platform support for R-Car D3" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A77995
+ help
+ This enables support for the Renesas R-Car D3 SoC.
+
+config ARCH_R8A7794
+ bool "SoC Platform support for R-Car E2" if ARM && ARCH_RENESAS
select ARCH_RCAR_GEN2
select ARM_ERRATA_814220
- select SYSC_R8A77470
+ select SYSC_R8A7794
-config ARCH_R8A7778
- bool "SoC Platform support for R-Car M1A" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN1
- select ARM_ERRATA_754322
+config ARCH_R8A77990
+ bool "SoC Platform support for R-Car E3" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A77990
+ help
+ This enables support for the Renesas R-Car E3 SoC.
config ARCH_R8A7779
bool "SoC Platform support for R-Car H1" if ARM && ARCH_RENESAS
@@ -134,74 +168,6 @@ config ARCH_R8A7790
select I2C
select SYSC_R8A7790
-config ARCH_R8A7791
- bool "SoC Platform support for R-Car M2-W" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN2
- select ARM_ERRATA_798181 if SMP
- select I2C
- select SYSC_R8A7791
-
-config ARCH_R8A7792
- bool "SoC Platform support for R-Car V2H" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN2
- select ARM_ERRATA_798181 if SMP
- select SYSC_R8A7792
-
-config ARCH_R8A7793
- bool "SoC Platform support for R-Car M2-N" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN2
- select ARM_ERRATA_798181 if SMP
- select I2C
- select SYSC_R8A7791
-
-config ARCH_R8A7794
- bool "SoC Platform support for R-Car E2" if ARM && ARCH_RENESAS
- select ARCH_RCAR_GEN2
- select ARM_ERRATA_814220
- select SYSC_R8A7794
-
-config ARCH_R9A06G032
- bool "SoC Platform support for RZ/N1D" if ARM && ARCH_RENESAS
- select ARCH_RZN1
- select ARM_ERRATA_814220
-
-config ARCH_SH73A0
- bool "SoC Platform support for SH-Mobile AG5" if ARM && ARCH_RENESAS
- select ARCH_RMOBILE
- select ARM_ERRATA_754322
- select ARM_GLOBAL_TIMER
- select HAVE_ARM_SCU if SMP
- select HAVE_ARM_TWD if SMP
- select RENESAS_INTC_IRQPIN
-
-config ARCH_R8A774A1
- bool "SoC Platform support for RZ/G2M" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A774A1
- help
- This enables support for the Renesas RZ/G2M SoC.
-
-config ARCH_R8A774B1
- bool "SoC Platform support for RZ/G2N" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A774B1
- help
- This enables support for the Renesas RZ/G2N SoC.
-
-config ARCH_R8A774C0
- bool "SoC Platform support for RZ/G2E" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A774C0
- help
- This enables support for the Renesas RZ/G2E SoC.
-
-config ARCH_R8A774E1
- bool "SoC Platform support for RZ/G2H" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A774E1
- help
- This enables support for the Renesas RZ/G2H SoC.
-
config ARCH_R8A77950
bool "SoC Platform support for R-Car H3 ES1.x" if ARM64
select ARCH_RCAR_GEN3
@@ -217,6 +183,32 @@ config ARCH_R8A77951
This enables support for the Renesas R-Car H3 SoC (revisions 2.0 and
later).
+config ARCH_R8A7778
+ bool "SoC Platform support for R-Car M1A" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN1
+ select ARM_ERRATA_754322
+
+config ARCH_R8A7793
+ bool "SoC Platform support for R-Car M2-N" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN2
+ select ARM_ERRATA_798181 if SMP
+ select I2C
+ select SYSC_R8A7791
+
+config ARCH_R8A7791
+ bool "SoC Platform support for R-Car M2-W" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN2
+ select ARM_ERRATA_798181 if SMP
+ select I2C
+ select SYSC_R8A7791
+
+config ARCH_R8A77965
+ bool "SoC Platform support for R-Car M3-N" if ARM64
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A77965
+ help
+ This enables support for the Renesas R-Car M3-N SoC.
+
config ARCH_R8A77960
bool "SoC Platform support for R-Car M3-W" if ARM64
select ARCH_RCAR_GEN3
@@ -231,12 +223,18 @@ config ARCH_R8A77961
help
This enables support for the Renesas R-Car M3-W+ SoC.
-config ARCH_R8A77965
- bool "SoC Platform support for R-Car M3-N" if ARM64
+config ARCH_R8A7792
+ bool "SoC Platform support for R-Car V2H" if ARM && ARCH_RENESAS
+ select ARCH_RCAR_GEN2
+ select ARM_ERRATA_798181 if SMP
+ select SYSC_R8A7792
+
+config ARCH_R8A77980
+ bool "SoC Platform support for R-Car V3H" if ARM64
select ARCH_RCAR_GEN3
- select SYSC_R8A77965
+ select SYSC_R8A77980
help
- This enables support for the Renesas R-Car M3-N SoC.
+ This enables support for the Renesas R-Car V3H SoC.
config ARCH_R8A77970
bool "SoC Platform support for R-Car V3M" if ARM64
@@ -245,28 +243,39 @@ config ARCH_R8A77970
help
This enables support for the Renesas R-Car V3M SoC.
-config ARCH_R8A77980
- bool "SoC Platform support for R-Car V3H" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A77980
- help
- This enables support for the Renesas R-Car V3H SoC.
+config ARCH_R8A7740
+ bool "SoC Platform support for R-Mobile A1" if ARM && ARCH_RENESAS
+ select ARCH_RMOBILE
+ select ARM_ERRATA_754322
+ select RENESAS_INTC_IRQPIN
-config ARCH_R8A77990
- bool "SoC Platform support for R-Car E3" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A77990
- help
- This enables support for the Renesas R-Car E3 SoC.
+config ARCH_R8A73A4
+ bool "SoC Platform support for R-Mobile APE6" if ARM && ARCH_RENESAS
+ select ARCH_RMOBILE
+ select ARM_ERRATA_798181 if SMP
+ select ARM_ERRATA_814220
+ select HAVE_ARM_ARCH_TIMER
+ select RENESAS_IRQC
+
+config ARCH_SH73A0
+ bool "SoC Platform support for SH-Mobile AG5" if ARM && ARCH_RENESAS
+ select ARCH_RMOBILE
+ select ARM_ERRATA_754322
+ select ARM_GLOBAL_TIMER
+ select HAVE_ARM_SCU if SMP
+ select HAVE_ARM_TWD if SMP
+ select RENESAS_INTC_IRQPIN
-config ARCH_R8A77995
- bool "SoC Platform support for R-Car D3" if ARM64
- select ARCH_RCAR_GEN3
- select SYSC_R8A77995
- help
- This enables support for the Renesas R-Car D3 SoC.
# SoC
+config SYSC_R8A77470
+ bool "System Controller support for RZ/G1C" if COMPILE_TEST
+ select SYSC_RCAR
+
+config SYSC_R8A7745
+ bool "System Controller support for RZ/G1E" if COMPILE_TEST
+ select SYSC_RCAR
+
config SYSC_R8A7742
bool "System Controller support for RZ/G1H" if COMPILE_TEST
select SYSC_RCAR
@@ -275,12 +284,12 @@ config SYSC_R8A7743
bool "System Controller support for RZ/G1M" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A7745
- bool "System Controller support for RZ/G1E" if COMPILE_TEST
+config SYSC_R8A774C0
+ bool "System Controller support for RZ/G2E" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A77470
- bool "System Controller support for RZ/G1C" if COMPILE_TEST
+config SYSC_R8A774E1
+ bool "System Controller support for RZ/G2H" if COMPILE_TEST
select SYSC_RCAR
config SYSC_R8A774A1
@@ -291,12 +300,19 @@ config SYSC_R8A774B1
bool "System Controller support for RZ/G2N" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A774C0
- bool "System Controller support for RZ/G2E" if COMPILE_TEST
+config SYSC_RCAR
+ bool "System Controller support for R-Car" if COMPILE_TEST
+
+config SYSC_R8A77995
+ bool "System Controller support for R-Car D3" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A774E1
- bool "System Controller support for RZ/G2H" if COMPILE_TEST
+config SYSC_R8A7794
+ bool "System Controller support for R-Car E2" if COMPILE_TEST
+ select SYSC_RCAR
+
+config SYSC_R8A77990
+ bool "System Controller support for R-Car E3" if COMPILE_TEST
select SYSC_RCAR
config SYSC_R8A7779
@@ -307,20 +323,16 @@ config SYSC_R8A7790
bool "System Controller support for R-Car H2" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A7791
- bool "System Controller support for 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
+config SYSC_R8A7795
+ bool "System Controller support for R-Car H3" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A7794
- bool "System Controller support for R-Car E2" if COMPILE_TEST
+config SYSC_R8A7791
+ bool "System Controller support for R-Car M2-W/N" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A7795
- bool "System Controller support for R-Car H3" if COMPILE_TEST
+config SYSC_R8A77965
+ bool "System Controller support for R-Car M3-N" if COMPILE_TEST
select SYSC_RCAR
config SYSC_R8A77960
@@ -331,34 +343,23 @@ config SYSC_R8A77961
bool "System Controller support for R-Car M3-W+" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A77965
- bool "System Controller support for R-Car M3-N" if COMPILE_TEST
- select SYSC_RCAR
-
-config SYSC_R8A77970
- bool "System Controller support for R-Car V3M" if COMPILE_TEST
+config SYSC_R8A7792
+ bool "System Controller support for R-Car V2H" if COMPILE_TEST
select SYSC_RCAR
config SYSC_R8A77980
bool "System Controller support for R-Car V3H" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A77990
- bool "System Controller support for R-Car E3" if COMPILE_TEST
+config SYSC_R8A77970
+ bool "System Controller support for R-Car V3M" if COMPILE_TEST
select SYSC_RCAR
-config SYSC_R8A77995
- bool "System Controller support for R-Car D3" if COMPILE_TEST
- select SYSC_RCAR
+config SYSC_RMOBILE
+ bool "System Controller support for R-Mobile" if COMPILE_TEST
-# Family
config RST_RCAR
bool "Reset Controller support for R-Car" if COMPILE_TEST
-config SYSC_RCAR
- bool "System Controller support for R-Car" if COMPILE_TEST
-
-config SYSC_RMOBILE
- bool "System Controller support for R-Mobile" if COMPILE_TEST
endif # SOC_RENESAS