diff options
author | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 22:16:47 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2018-09-28 22:16:58 +0200 |
commit | 86e762d96713aeafac2dc582bbd38075d421c20a (patch) | |
tree | ea53fff11b286ed85afede77013d61e063670fa1 /arch/arm | |
parent | Merge tag 'tegra-for-4.20-soc' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
parent | dt-bindings: apmu: Document r8a7744 support (diff) | |
download | linux-86e762d96713aeafac2dc582bbd38075d421c20a.tar.xz linux-86e762d96713aeafac2dc582bbd38075d421c20a.zip |
Merge tag 'renesas-drivers-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/drivers
Renesas ARM Based SoC Drivers Updates for v4.20
* Convert to SPDX identifiers
* R-Car V3M (r8a77970) and V3H (r8a77980): Document Timer Unit (TMU) bindings
* RZ/G1N (r8a7744) and RZ/G1C (r8a77470) SoCs:
- Document APMU and SMP enable method
* RZ/G2M (r8a74a1), RZ/G1N (r8a7744) and RZ/G2E (r8a774c0) SoCs:
- Add reset support
- Add sysc support
* RZ/G2M (r8a774a1), RZ/G2E (r8a774c0) and RZ/A2M (r7s9210) SoCs:
- Add support for identifying SoC
* RZ/A2M (r7s9210) SoC:
- Add basic SoC setup support
* tag 'renesas-drivers-for-v4.20' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas: (21 commits)
dt-bindings: apmu: Document r8a7744 support
dt-bindings: timer: renesas: tmu: document R8A779{7|8}0 bindings
dt-bindings: apmu: Document r8a77470 support
soc: renesas: rcar-rst: Add support for RZ/G1N
dt-bindings: reset: rcar-rst: Document r8a7744 reset module
soc: renesas: rcar-sysc: Add r8a7744 support
dt-bindings: power: rcar-sysc: Add r8a7744 power domain index macros
dt-bindings: power: rcar-sysc: Document r8a7744 SYSC binding
soc: renesas: rcar-rst: Add support for RZ/G2E
dt-bindings: reset: rcar-rst: Document r8a774c0 rst
soc: renesas: rcar-sysc: Add r8a774c0 support
dt-bindings: power: rcar-sysc: Document r8a774c0 sysc
dt-bindings: power: Add r8a774c0 SYSC power domain definitions
soc: renesas: Identify RZ/G2E
soc: renesas: convert to SPDX identifiers
soc: renesas: rcar-rst: Add support for RZ/G2M
soc: renesas: rcar-sysc: Add r8a774a1 support
dt-bindings: power: Add r8a774a1 SYSC power domain definitions
soc: renesas: identify RZ/A2
ARM: shmobile: Add basic RZ/A2 SoC support
...
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/Makefile | 1 | ||||
-rw-r--r-- | arch/arm/mach-shmobile/setup-r7s9210.c | 27 |
3 files changed, 34 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index aeb2eed08598..94e9431d92b8 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -55,6 +55,12 @@ config ARCH_R7S72100 select SYS_SUPPORTS_SH_MTU2 select RENESAS_OSTM +config ARCH_R7S9210 + bool "RZ/A2 (R7S9210)" + select PM + select PM_GENERIC_DOMAINS + select RENESAS_OSTM + config ARCH_R8A73A4 bool "R-Mobile APE6 (R8A73A40)" select ARCH_RMOBILE diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile index b33dc59d8698..5591646cb9bb 100644 --- a/arch/arm/mach-shmobile/Makefile +++ b/arch/arm/mach-shmobile/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_ARCH_R8A7778) += setup-r8a7778.o obj-$(CONFIG_ARCH_R8A7779) += setup-r8a7779.o obj-$(CONFIG_ARCH_EMEV2) += setup-emev2.o obj-$(CONFIG_ARCH_R7S72100) += setup-r7s72100.o +obj-$(CONFIG_ARCH_R7S9210) += setup-r7s9210.o # CPU reset vector handling objects cpu-y := platsmp.o headsmp.o diff --git a/arch/arm/mach-shmobile/setup-r7s9210.c b/arch/arm/mach-shmobile/setup-r7s9210.c new file mode 100644 index 000000000000..573fb9955e7e --- /dev/null +++ b/arch/arm/mach-shmobile/setup-r7s9210.c @@ -0,0 +1,27 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * r7s9210 processor support + * + * Copyright (C) 2018 Renesas Electronics Corporation + * Copyright (C) 2018 Chris Brandt + * + */ + +#include <linux/kernel.h> + +#include <asm/mach/arch.h> + +#include "common.h" + +static const char *const r7s9210_boards_compat_dt[] __initconst = { + "renesas,r7s9210", + NULL, +}; + +DT_MACHINE_START(R7S72100_DT, "Generic R7S9210 (Flattened Device Tree)") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, + .init_early = shmobile_init_delay, + .init_late = shmobile_init_late, + .dt_compat = r7s9210_boards_compat_dt, +MACHINE_END |