diff options
| author |  Olof Johansson <olof@lixom.net>
| 2020-01-06 09:29:13 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net>
| 2020-01-06 09:29:14 -0800 |
| commit | 1bee7aaa075b4bac5cfc534f01602e17ec7caee9 (patch) | |
| tree | 7deb88eb62d2433c974d2637ea9b8974f4921ec8 /drivers | |
| parent | Merge tag 'tee-optee-pldrv-for-5.6' of git://git.linaro.org:/people/jens.wikl... (diff) | |
| parent | soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3 (diff) | |
| download | linux-1bee7aaa075b4bac5cfc534f01602e17ec7caee9.tar.gz linux-1bee7aaa075b4bac5cfc534f01602e17ec7caee9.tar.bz2 linux-1bee7aaa075b4bac5cfc534f01602e17ec7caee9.zip | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/soc/renesas/Kconfig | 14 | ||||
| -rw-r--r-- | drivers/soc/renesas/rcar-rst.c | 2 |
2 files changed, 10 insertions, 6 deletions
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index f93492b72c04..ba2b8b51d2d9 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -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. diff --git a/drivers/soc/renesas/rcar-rst.c b/drivers/soc/renesas/rcar-rst.c index 14d05a070dd3..2af2e0dd83fe 100644 --- a/drivers/soc/renesas/rcar-rst.c +++ b/drivers/soc/renesas/rcar-rst.c @@ -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 = { |