diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 04d3b2ab1e22..518ae9378a32 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -69,19 +69,17 @@ config ARCH_R7S9210
 	select RENESAS_OSTM
 	select RENESAS_RZA1_IRQC
 
-config ARCH_R8A73A4
-	bool "ARM32 Platform support for R-Mobile APE6"
-	select ARCH_RMOBILE
-	select ARM_ERRATA_798181 if SMP
+config ARCH_R8A77470
+	bool "ARM32 Platform support for RZ/G1C"
+	select ARCH_RCAR_GEN2
 	select ARM_ERRATA_814220
-	select HAVE_ARM_ARCH_TIMER
-	select RENESAS_IRQC
+	select SYSC_R8A77470
 
-config ARCH_R8A7740
-	bool "ARM32 Platform support for R-Mobile A1"
-	select ARCH_RMOBILE
-	select ARM_ERRATA_754322
-	select RENESAS_INTC_IRQPIN
+config ARCH_R8A7745
+	bool "ARM32 Platform support for RZ/G1E"
+	select ARCH_RCAR_GEN2
+	select ARM_ERRATA_814220
+	select SYSC_R8A7745
 
 config ARCH_R8A7742
 	bool "ARM32 Platform support for RZ/G1H"
@@ -102,22 +100,16 @@ config ARCH_R8A7744
 	select ARM_ERRATA_798181 if SMP
 	select SYSC_R8A7743
 
-config ARCH_R8A7745
-	bool "ARM32 Platform support for RZ/G1E"
-	select ARCH_RCAR_GEN2
+config ARCH_R9A06G032
+	bool "ARM32 Platform support for RZ/N1D"
+	select ARCH_RZN1
 	select ARM_ERRATA_814220
-	select SYSC_R8A7745
 
-config ARCH_R8A77470
-	bool "ARM32 Platform support for RZ/G1C"
+config ARCH_R8A7794
+	bool "ARM32 Platform support for R-Car E2"
 	select ARCH_RCAR_GEN2
 	select ARM_ERRATA_814220
-	select SYSC_R8A77470
-
-config ARCH_R8A7778
-	bool "ARM32 Platform support for R-Car M1A"
-	select ARCH_RCAR_GEN1
-	select ARM_ERRATA_754322
+	select SYSC_R8A7794
 
 config ARCH_R8A7779
 	bool "ARM32 Platform support for R-Car H1"
@@ -136,6 +128,18 @@ config ARCH_R8A7790
 	select I2C
 	select SYSC_R8A7790
 
+config ARCH_R8A7778
+	bool "ARM32 Platform support for R-Car M1A"
+	select ARCH_RCAR_GEN1
+	select ARM_ERRATA_754322
+
+config ARCH_R8A7793
+	bool "ARM32 Platform support for R-Car M2-N"
+	select ARCH_RCAR_GEN2
+	select ARM_ERRATA_798181 if SMP
+	select I2C
+	select SYSC_R8A7791
+
 config ARCH_R8A7791
 	bool "ARM32 Platform support for R-Car M2-W"
 	select ARCH_RCAR_GEN2
@@ -149,23 +153,19 @@ config ARCH_R8A7792
 	select ARM_ERRATA_798181 if SMP
 	select SYSC_R8A7792
 
-config ARCH_R8A7793
-	bool "ARM32 Platform support for R-Car M2-N"
-	select ARCH_RCAR_GEN2
-	select ARM_ERRATA_798181 if SMP
-	select I2C
-	select SYSC_R8A7791
-
-config ARCH_R8A7794
-	bool "ARM32 Platform support for R-Car E2"
-	select ARCH_RCAR_GEN2
-	select ARM_ERRATA_814220
-	select SYSC_R8A7794
+config ARCH_R8A7740
+	bool "ARM32 Platform support for R-Mobile A1"
+	select ARCH_RMOBILE
+	select ARM_ERRATA_754322
+	select RENESAS_INTC_IRQPIN
 
-config ARCH_R9A06G032
-	bool "ARM32 Platform support for RZ/N1D"
-	select ARCH_RZN1
+config ARCH_R8A73A4
+	bool "ARM32 Platform support for R-Mobile APE6"
+	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 "ARM32 Platform support for SH-Mobile AG5"
@@ -180,6 +180,20 @@ endif # ARM
 
 if ARM64
 
+config ARCH_R8A774C0
+	bool "ARM64 Platform support for RZ/G2E"
+	select ARCH_RCAR_GEN3
+	select SYSC_R8A774C0
+	help
+	  This enables support for the Renesas RZ/G2E SoC.
+
+config ARCH_R8A774E1
+	bool "ARM64 Platform support for RZ/G2H"
+	select ARCH_RCAR_GEN3
+	select SYSC_R8A774E1
+	help
+	  This enables support for the Renesas RZ/G2H SoC.
+
 config ARCH_R8A774A1
 	bool "ARM64 Platform support for RZ/G2M"
 	select ARCH_RCAR_GEN3
@@ -194,19 +208,19 @@ config ARCH_R8A774B1
 	help
 	  This enables support for the Renesas RZ/G2N SoC.
 
-config ARCH_R8A774C0
-	bool "ARM64 Platform support for RZ/G2E"
+config ARCH_R8A77990
+	bool "ARM64 Platform support for R-Car E3"
 	select ARCH_RCAR_GEN3
-	select SYSC_R8A774C0
+	select SYSC_R8A77990
 	help
-	  This enables support for the Renesas RZ/G2E SoC.
+	  This enables support for the Renesas R-Car E3 SoC.
 
-config ARCH_R8A774E1
-	bool "ARM64 Platform support for RZ/G2H"
+config ARCH_R8A77995
+	bool "ARM64 Platform support for R-Car D3"
 	select ARCH_RCAR_GEN3
-	select SYSC_R8A774E1
+	select SYSC_R8A77995
 	help
-	  This enables support for the Renesas RZ/G2H SoC.
+	  This enables support for the Renesas R-Car D3 SoC.
 
 config ARCH_R8A77950
 	bool "ARM64 Platform support for R-Car H3 ES1.x"
@@ -223,6 +237,13 @@ config ARCH_R8A77951
 	  This enables support for the Renesas R-Car H3 SoC (revisions 2.0 and
 	  later).
 
+config ARCH_R8A77965
+	bool "ARM64 Platform support for R-Car M3-N"
+	select ARCH_RCAR_GEN3
+	select SYSC_R8A77965
+	help
+	  This enables support for the Renesas R-Car M3-N SoC.
+
 config ARCH_R8A77960
 	bool "ARM64 Platform support for R-Car M3-W"
 	select ARCH_RCAR_GEN3
@@ -237,20 +258,6 @@ config ARCH_R8A77961
 	help
 	  This enables support for the Renesas R-Car M3-W+ SoC.
 
-config ARCH_R8A77965
-	bool "ARM64 Platform support for R-Car M3-N"
-	select ARCH_RCAR_GEN3
-	select SYSC_R8A77965
-	help
-	  This enables support for the Renesas R-Car M3-N SoC.
-
-config ARCH_R8A77970
-	bool "ARM64 Platform support for R-Car V3M"
-	select ARCH_RCAR_GEN3
-	select SYSC_R8A77970
-	help
-	  This enables support for the Renesas R-Car V3M SoC.
-
 config ARCH_R8A77980
 	bool "ARM64 Platform support for R-Car V3H"
 	select ARCH_RCAR_GEN3
@@ -258,23 +265,24 @@ config ARCH_R8A77980
 	help
 	  This enables support for the Renesas R-Car V3H SoC.
 
-config ARCH_R8A77990
-	bool "ARM64 Platform support for R-Car E3"
-	select ARCH_RCAR_GEN3
-	select SYSC_R8A77990
-	help
-	  This enables support for the Renesas R-Car E3 SoC.
-
-config ARCH_R8A77995
-	bool "ARM64 Platform support for R-Car D3"
+config ARCH_R8A77970
+	bool "ARM64 Platform support for R-Car V3M"
 	select ARCH_RCAR_GEN3
-	select SYSC_R8A77995
+	select SYSC_R8A77970
 	help
-	  This enables support for the Renesas R-Car D3 SoC.
+	  This enables support for the Renesas R-Car V3M SoC.
 
 endif # ARM64
 
 # SoC
+config SYSC_R8A7745
+	bool "System Controller support for RZ/G1E" if COMPILE_TEST
+	select SYSC_RCAR
+
+config SYSC_R8A77470
+	bool "System Controller support for RZ/G1C" if COMPILE_TEST
+	select SYSC_RCAR
+
 config SYSC_R8A7742
 	bool "System Controller support for RZ/G1H" if COMPILE_TEST
 	select SYSC_RCAR
@@ -283,12 +291,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
@@ -299,12 +307,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
@@ -315,20 +330,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
@@ -339,34 +350,22 @@ 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
