leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renesas driver updates for v5.6

Browse Source 
- Remove now unused ARCH_R8A7796 config symbol,
   - Fix a sparse warning,
   - Add split R-Car H3 ES1.x and ES2.0+ config symbols.
 -----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQQ9qaHoIs/1I4cXmEiKwlD9ZEnxcAUCXhMKkwAKCRCKwlD9ZEnx
 cAcXAQCmFyxf/XBOVnW0xRqb+E9aoSyWhQXz+xnoD9zIkWyZDgEAtsMXZau61Xj8
 WuGr01WPUHtTYVSVaK00EsFbNRbiPwE=
 =trFP
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-01-06 09:29:13 -08:00
commit 1bee7aaa07
2 changed files with 10 additions and 6 deletions
drivers/soc/renesas
Kconfigrcar-rst.c

14
drivers/soc/renesas/Kconfig
View File

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

2
drivers/soc/renesas/rcar-rst.c
View File

@ -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 = {