diff options
| author | Olof Johansson <olof@lixom.net> | 2016-11-19 02:22:54 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2016-11-19 02:22:54 +0100 |
| commit | bd7623dd612b5cb05fb614994faccc6823bea9f8 (patch) | |
| tree | 87a6a0aa56d85dd79e74a0c710b69301152e43f5 /arch | |
| parent | Merge tag 'omap-for-v4.10/legacy-signed' of git://git.kernel.org/pub/scm/linu... (diff) | |
| parent | ARM: shmobile: document SK-RZG1E board (diff) | |
| download | linux-bd7623dd612b5cb05fb614994faccc6823bea9f8.tar.xz linux-bd7623dd612b5cb05fb614994faccc6823bea9f8.zip | |
Merge tag 'renesas-soc2-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas into next/soc
Second Round of Renesas ARM Based SoC Updates for v4.10
* Basic support for r8a7745 SoC
* tag 'renesas-soc2-for-v4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
ARM: shmobile: document SK-RZG1E board
ARM: shmobile: r8a7745: basic SoC support
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 4 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 6fbd9b7d2d67..f0b5e7dfa6d0 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -73,6 +73,10 @@ config ARCH_R8A7743 select ARCH_RCAR_GEN2 select ARM_ERRATA_798181 if SMP +config ARCH_R8A7745 + bool "RZ/G1E (R8A77450)" + select ARCH_RCAR_GEN2 + config ARCH_R8A7778 bool "R-Car M1A (R8A77781)" select ARCH_RCAR_GEN1 diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index d6b4841e51a9..14c1f0ed2ecb 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -235,6 +235,7 @@ MACHINE_END static const char * const rz_g1_boards_compat_dt[] __initconst = { "renesas,r8a7743", + "renesas,r8a7745", NULL, }; |