Commit 37d03aa5 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v5.8-tag1' of... 

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

Renesas ARM SoC updates for v5.8

  - Add Basic support for the new RZ/G1H SoC.

* tag 'renesas-arm-soc-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: shmobile: r8a7742: Basic SoC support

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


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 7adb2781 135e7a15

arch/arm/mach-shmobile/setup-rcar-gen2.c

+2 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 
#include "rcar-gen2.h"



static const struct of_device_id cpg_matches[] __initconst = {

	{ .compatible = "renesas,r8a7742-cpg-mssr", .data = "extal" },

	{ .compatible = "renesas,r8a7743-cpg-mssr", .data = "extal" },

	{ .compatible = "renesas,r8a7744-cpg-mssr", .data = "extal" },

	{ .compatible = "renesas,r8a7790-cpg-mssr", .data = "extal" },
@@ -209,6 +210,7 @@ DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)") 
MACHINE_END



static const char * const rz_g1_boards_compat_dt[] __initconst = {

	"renesas,r8a7742",

	"renesas,r8a7743",

	"renesas,r8a7744",

	"renesas,r8a7745",