Commit 1bee7aaa authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'renesas-drivers-for-v5.6-tag1' of... 

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

Renesas driver updates for v5.6

  - Remove now unused ARCH_R8A7796 config symbol,
  - Fix a sparse warning,
  - Add split R-Car H3 ES1.x and ES2.0+ config symbols.

* tag 'renesas-drivers-for-v5.6-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3
  soc: renesas: rcar-rst: Fix __iomem on configure call
  soc: renesas: Remove ARCH_R8A7796

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


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents bcbf0531 b925adfc

drivers/soc/renesas/Kconfig

+9 −5
Original line number Diff line number Diff line
@@ -192,21 +192,25 @@ config ARCH_R8A774C0 
	help

	  This enables support for the Renesas RZ/G2E SoC.



config ARCH_R8A77950

	bool



config ARCH_R8A77951

	bool



config ARCH_R8A7795

	bool "Renesas R-Car H3 SoC Platform"

	select ARCH_R8A77950

	select ARCH_R8A77951

	select ARCH_RCAR_GEN3

	select SYSC_R8A7795

	help

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



config ARCH_R8A77960

	bool

	bool "Renesas R-Car M3-W SoC Platform"

	select ARCH_RCAR_GEN3

	select SYSC_R8A77960



config ARCH_R8A7796

	bool "Renesas R-Car M3-W SoC Platform"

	select ARCH_R8A77960

	help

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

drivers/soc/renesas/rcar-rst.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ static int rcar_rst_enable_wdt_reset(void __iomem *base) 


struct rst_config {

	unsigned int modemr;		/* Mode Monitoring Register Offset */

	int (*configure)(void *base);	/* Platform specific configuration */

	int (*configure)(void __iomem *base);	/* Platform specific config */

};



static const struct rst_config rcar_rst_gen1 __initconst = {