Commit 802b26b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-drivers-for-v5.10-tag2' of... 

Merge tag 'renesas-drivers-for-v5.10-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/drivers

Renesas driver updates for v5.10 (take two)

  - Add core support for the R-Car V3U (R8A779A0) SoC, including System
    Controller (SYSC) and Reset (RST) support,
  - Various Kconfig cleanups.

* tag 'renesas-drivers-for-v5.10-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: r8a779a0-sysc: Add r8a779a0 support
  soc: renesas: rcar-rst: Add support for R-Car V3U
  soc: renesas: Identify R-Car V3U
  soc: renesas: Sort driver description title
  soc: renesas: Use ARM32/ARM64 for menu description
  dt-bindings: clock: Add r8a779a0 CPG Core Clock Definitions
  dt-bindings: power: Add r8a779a0 SYSC power domain definitions

Link: https://lore.kernel.org/r/20200918124800.15555-4-geert+renesas@glider.be


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 8119f4b9 1b4298f0

drivers/soc/renesas/Kconfig

+177 −169
Original line number Diff line number Diff line
@@ -49,126 +49,126 @@ if ARM && ARCH_RENESAS 
#comment "Renesas ARM SoCs System Type"



config ARCH_EMEV2

	bool "SoC Platform support for Emma Mobile EV2"

	bool "ARM32 Platform support for Emma Mobile EV2"

	select HAVE_ARM_SCU if SMP

	select SYS_SUPPORTS_EM_STI



config ARCH_R7S72100

	bool "SoC Platform support for RZ/A1H"

	select ARM_ERRATA_754322

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC

	select SYS_SUPPORTS_SH_MTU2

config ARCH_R8A7794

	bool "ARM32 Platform support for R-Car E2"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A7794



config ARCH_R7S9210

	bool "SoC Platform support for RZ/A2"

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC

config ARCH_R8A7779

	bool "ARM32 Platform support for R-Car H1"

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select SYSC_R8A7779



config ARCH_R8A73A4

	bool "SoC Platform support for R-Mobile APE6"

	select ARCH_RMOBILE

config ARCH_R8A7790

	bool "ARM32 Platform support for R-Car H2"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220

	select HAVE_ARM_ARCH_TIMER

	select RENESAS_IRQC

	select I2C

	select SYSC_R8A7790



config ARCH_R8A7740

	bool "SoC Platform support for R-Mobile A1"

	select ARCH_RMOBILE

config ARCH_R8A7778

	bool "ARM32 Platform support for R-Car M1A"

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322

	select RENESAS_INTC_IRQPIN



config ARCH_R8A7742

	bool "SoC Platform support for RZ/G1H"

config ARCH_R8A7793

	bool "ARM32 Platform support for R-Car M2-N"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220

	select SYSC_R8A7742

	select I2C

	select SYSC_R8A7791



config ARCH_R8A7743

	bool "SoC Platform support for RZ/G1M"

config ARCH_R8A7791

	bool "ARM32 Platform support for R-Car M2-W"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7743

	select I2C

	select SYSC_R8A7791



config ARCH_R8A7744

	bool "SoC Platform support for RZ/G1N"

config ARCH_R8A7792

	bool "ARM32 Platform support for R-Car V2H"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7743

	select SYSC_R8A7792



config ARCH_R8A7745

	bool "SoC Platform support for RZ/G1E"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A7745

config ARCH_R8A7740

	bool "ARM32 Platform support for R-Mobile A1"

	select ARCH_RMOBILE

	select ARM_ERRATA_754322

	select RENESAS_INTC_IRQPIN



config ARCH_R8A77470

	bool "SoC Platform support for RZ/G1C"

	select ARCH_RCAR_GEN2

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 SYSC_R8A77470

	select HAVE_ARM_ARCH_TIMER

	select RENESAS_IRQC



config ARCH_R8A7778

	bool "SoC Platform support for R-Car M1A"

	select ARCH_RCAR_GEN1

config ARCH_R7S72100

	bool "ARM32 Platform support for RZ/A1H"

	select ARM_ERRATA_754322

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC

	select SYS_SUPPORTS_SH_MTU2



config ARCH_R8A7779

	bool "SoC Platform support for R-Car H1"

	select ARCH_RCAR_GEN1

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER

	select HAVE_ARM_SCU if SMP

	select HAVE_ARM_TWD if SMP

	select SYSC_R8A7779

config ARCH_R7S9210

	bool "ARM32 Platform support for RZ/A2"

	select PM

	select PM_GENERIC_DOMAINS

	select RENESAS_OSTM

	select RENESAS_RZA1_IRQC



config ARCH_R8A7790

	bool "SoC Platform support for R-Car H2"

config ARCH_R8A77470

	bool "ARM32 Platform support for RZ/G1C"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select ARM_ERRATA_814220

	select I2C

	select SYSC_R8A7790

	select SYSC_R8A77470



config ARCH_R8A7791

	bool "SoC Platform support for R-Car M2-W"

config ARCH_R8A7745

	bool "ARM32 Platform support for RZ/G1E"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C

	select SYSC_R8A7791

	select ARM_ERRATA_814220

	select SYSC_R8A7745



config ARCH_R8A7792

	bool "SoC Platform support for R-Car V2H"

config ARCH_R8A7742

	bool "ARM32 Platform support for RZ/G1H"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7792

	select ARM_ERRATA_814220

	select SYSC_R8A7742



config ARCH_R8A7793

	bool "SoC Platform support for R-Car M2-N"

config ARCH_R8A7743

	bool "ARM32 Platform support for RZ/G1M"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_798181 if SMP

	select I2C

	select SYSC_R8A7791

	select SYSC_R8A7743



config ARCH_R8A7794

	bool "SoC Platform support for R-Car E2"

config ARCH_R8A7744

	bool "ARM32 Platform support for RZ/G1N"

	select ARCH_RCAR_GEN2

	select ARM_ERRATA_814220

	select SYSC_R8A7794

	select ARM_ERRATA_798181 if SMP

	select SYSC_R8A7743



config ARCH_R9A06G032

	bool "SoC Platform support for RZ/N1D"

	bool "ARM32 Platform support for RZ/N1D"

	select ARCH_RZN1

	select ARM_ERRATA_814220



config ARCH_SH73A0

	bool "SoC Platform support for SH-Mobile AG5"

	bool "ARM32 Platform support for SH-Mobile AG5"

	select ARCH_RMOBILE

	select ARM_ERRATA_754322

	select ARM_GLOBAL_TIMER
@@ -180,131 +180,123 @@ endif # ARM 


if ARM64



config ARCH_R8A774A1

	bool "SoC Platform support for RZ/G2M"

	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"

	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"

config ARCH_R8A77995

	bool "ARM64 Platform support for R-Car D3"

	select ARCH_RCAR_GEN3

	select SYSC_R8A774C0

	select SYSC_R8A77995

	help

	  This enables support for the Renesas RZ/G2E SoC.

	  This enables support for the Renesas R-Car D3 SoC.



config ARCH_R8A774E1

	bool "SoC Platform support for RZ/G2H"

config ARCH_R8A77990

	bool "ARM64 Platform support for R-Car E3"

	select ARCH_RCAR_GEN3

	select SYSC_R8A774E1

	select SYSC_R8A77990

	help

	  This enables support for the Renesas RZ/G2H SoC.

	  This enables support for the Renesas R-Car E3 SoC.



config ARCH_R8A77950

	bool "SoC Platform support for R-Car H3 ES1.x"

	bool "ARM64 Platform support for R-Car H3 ES1.x"

	select ARCH_RCAR_GEN3

	select SYSC_R8A7795

	help

	  This enables support for the Renesas R-Car H3 SoC (revision 1.x).



config ARCH_R8A77951

	bool "SoC Platform support for R-Car H3 ES2.0+"

	bool "ARM64 Platform support for R-Car H3 ES2.0+"

	select ARCH_RCAR_GEN3

	select SYSC_R8A7795

	help

	  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 "SoC Platform support for R-Car M3-W"

	bool "ARM64 Platform support for R-Car M3-W"

	select ARCH_RCAR_GEN3

	select SYSC_R8A77960

	help

	  This enables support for the Renesas R-Car M3-W SoC.



config ARCH_R8A77961

	bool "SoC Platform support for R-Car M3-W+"

	bool "ARM64 Platform support for R-Car M3-W+"

	select ARCH_RCAR_GEN3

	select SYSC_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"

config ARCH_R8A77980

	bool "ARM64 Platform support for R-Car V3H"

	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"

	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 "SoC Platform support for R-Car V3H"

config ARCH_R8A779A0

	bool "ARM64 Platform support for R-Car V3U"

	select ARCH_RCAR_GEN3

	select SYSC_R8A77980

	select SYSC_R8A779A0

	help

	  This enables support for the Renesas R-Car V3H SoC.

	  This enables support for the Renesas R-Car V3U SoC.



config ARCH_R8A77990

	bool "SoC Platform support for R-Car E3"

config ARCH_R8A774C0

	bool "ARM64 Platform support for RZ/G2E"

	select ARCH_RCAR_GEN3

	select SYSC_R8A77990

	select SYSC_R8A774C0

	help

	  This enables support for the Renesas R-Car E3 SoC.

	  This enables support for the Renesas RZ/G2E SoC.



config ARCH_R8A77995

	bool "SoC Platform support for R-Car D3"

config ARCH_R8A774E1

	bool "ARM64 Platform support for RZ/G2H"

	select ARCH_RCAR_GEN3

	select SYSC_R8A77995

	select SYSC_R8A774E1

	help

	  This enables support for the Renesas R-Car D3 SoC.



endif # ARM64

	  This enables support for the Renesas RZ/G2H SoC.



# SoC

config SYSC_R8A7742

	bool "System Controller support for RZ/G1H" if COMPILE_TEST

	select SYSC_RCAR

config ARCH_R8A774A1

	bool "ARM64 Platform support for RZ/G2M"

	select ARCH_RCAR_GEN3

	select SYSC_R8A774A1

	help

	  This enables support for the Renesas RZ/G2M SoC.



config SYSC_R8A7743

	bool "System Controller support for RZ/G1M" if COMPILE_TEST

	select SYSC_RCAR

config ARCH_R8A774B1

	bool "ARM64 Platform support for RZ/G2N"

	select ARCH_RCAR_GEN3

	select SYSC_R8A774B1

	help

	  This enables support for the Renesas RZ/G2N SoC.



config SYSC_R8A7745

	bool "System Controller support for RZ/G1E" if COMPILE_TEST

	select SYSC_RCAR

endif # ARM64



config SYSC_R8A77470

	bool "System Controller support for RZ/G1C" if COMPILE_TEST

	select SYSC_RCAR

config RST_RCAR

	bool "Reset Controller support for R-Car" if COMPILE_TEST



config SYSC_R8A774A1

	bool "System Controller support for RZ/G2M" if COMPILE_TEST

	select SYSC_RCAR

config SYSC_RCAR

	bool "System Controller support for R-Car" if COMPILE_TEST



config SYSC_R8A774B1

	bool "System Controller support for RZ/G2N" if COMPILE_TEST

config SYSC_R8A77995

	bool "System Controller support for R-Car D3" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A774C0

	bool "System Controller support for RZ/G2E" if COMPILE_TEST

config SYSC_R8A7794

	bool "System Controller support for R-Car E2" 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 R-Car E3" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A7779
@@ -315,20 +307,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 +327,54 @@ 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

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_R8A77970

	bool "System Controller support for R-Car V3M" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A77980

	bool "System Controller support for R-Car V3H" if COMPILE_TEST

config SYSC_R8A779A0

	bool "System Controller support for R-Car V3U" if COMPILE_TEST



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

	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 RZ/G1E" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A77995

	bool "System Controller support for R-Car D3" if COMPILE_TEST

config SYSC_R8A7742

	bool "System Controller support for RZ/G1H" if COMPILE_TEST

	select SYSC_RCAR



# Family

config RST_RCAR

	bool "Reset Controller support for R-Car" if COMPILE_TEST

config SYSC_R8A7743

	bool "System Controller support for RZ/G1M" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_RCAR

	bool "System Controller support for R-Car" if COMPILE_TEST

config SYSC_R8A774C0

	bool "System Controller support for RZ/G2E" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_RMOBILE

	bool "System Controller support for R-Mobile" if COMPILE_TEST

config SYSC_R8A774E1

	bool "System Controller support for RZ/G2H" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A774A1

	bool "System Controller support for RZ/G2M" if COMPILE_TEST

	select SYSC_RCAR



config SYSC_R8A774B1

	bool "System Controller support for RZ/G2N" if COMPILE_TEST

	select SYSC_RCAR



endif # SOC_RENESAS

drivers/soc/renesas/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ obj-$(CONFIG_SYSC_R8A77970) += r8a77970-sysc.o 
obj-$(CONFIG_SYSC_R8A77980)	+= r8a77980-sysc.o

obj-$(CONFIG_SYSC_R8A77990)	+= r8a77990-sysc.o

obj-$(CONFIG_SYSC_R8A77995)	+= r8a77995-sysc.o

obj-$(CONFIG_SYSC_R8A779A0)	+= r8a779a0-sysc.o

ifdef CONFIG_SMP

obj-$(CONFIG_ARCH_R9A06G032)	+= r9a06g032-smp.o

endif

drivers/soc/renesas/r8a779a0-sysc.c

0 → 100644
+448 −0

File added.

Preview size limit exceeded, changes collapsed.

drivers/soc/renesas/rcar-rst.c

+6 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ static const struct rst_config rcar_rst_gen3 __initconst = { 
	.modemr = 0x60,

};



static const struct rst_config rcar_rst_r8a779a0 __initconst = {

	.modemr = 0x00,		/* MODEMR0 and it has CPG related bits */

};



static const struct of_device_id rcar_rst_matches[] __initconst = {

	/* RZ/G1 is handled like R-Car Gen2 */

	{ .compatible = "renesas,r8a7742-rst", .data = &rcar_rst_gen2 },
@@ -67,6 +71,8 @@ static const struct of_device_id rcar_rst_matches[] __initconst = { 
	{ .compatible = "renesas,r8a77980-rst", .data = &rcar_rst_gen3 },

	{ .compatible = "renesas,r8a77990-rst", .data = &rcar_rst_gen3 },

	{ .compatible = "renesas,r8a77995-rst", .data = &rcar_rst_gen3 },

	/* R-Car V3U */

	{ .compatible = "renesas,r8a779a0-rst", .data = &rcar_rst_r8a779a0 },

	{ /* sentinel */ }

};

drivers/soc/renesas/renesas-soc.c

+8 −0
Original line number Diff line number Diff line
@@ -200,6 +200,11 @@ static const struct renesas_soc soc_rcar_d3 __initconst __maybe_unused = { 
	.id	= 0x58,

};



static const struct renesas_soc soc_rcar_v3u __initconst __maybe_unused = {

	.family	= &fam_rcar_gen3,

	.id	= 0x59,

};



static const struct renesas_soc soc_shmobile_ag5 __initconst __maybe_unused = {

	.family	= &fam_shmobile,

	.id	= 0x37,
@@ -291,6 +296,9 @@ static const struct of_device_id renesas_socs[] __initconst = { 
#ifdef CONFIG_ARCH_R8A77995

	{ .compatible = "renesas,r8a77995",	.data = &soc_rcar_d3 },

#endif

#ifdef CONFIG_ARCH_R8A779A0

	{ .compatible = "renesas,r8a779a0",	.data = &soc_rcar_v3u },

#endif

#ifdef CONFIG_ARCH_SH73A0

	{ .compatible = "renesas,sh73a0",	.data = &soc_shmobile_ag5 },

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE