From: Lad Prabhakar commit 135e7a156ae2c1a7a1f0c1d44bf2b3daece04bbf upstream. Add minimal support for the RZ/G1H (R8A7742) SoC. Signed-off-by: Lad Prabhakar Reviewed-by: Marian-Cristian Rotariu Link: https://lore.kernel.org/r/1587678050-23468-10-git-send-email-prabhakar.mahadev-lad.rj@bp.renesas.com Signed-off-by: Geert Uytterhoeven [biju: removed compatible string renesas,r8a7742-cpg-mssr, added config option for rz/g1h] Signed-off-by: Biju Das --- arch/arm/mach-shmobile/pm-rcar-gen2.c | 2 ++ arch/arm/mach-shmobile/setup-rcar-gen2.c | 1 + 2 files changed, 3 insertions(+) diff --git a/arch/arm/mach-shmobile/pm-rcar-gen2.c b/arch/arm/mach-shmobile/pm-rcar-gen2.c index dd1c9e08f3ea..c0c52458d9c9 100644 --- a/arch/arm/mach-shmobile/pm-rcar-gen2.c +++ b/arch/arm/mach-shmobile/pm-rcar-gen2.c @@ -97,6 +97,8 @@ void __init rcar_gen2_pm_init(void) syscier = 0x013111ef; else if (of_machine_is_compatible("renesas,r8a7791")) syscier = 0x00111003; + else if (of_machine_is_compatible("renesas,r8a7742")) + syscier = 0x013111ef; else if (of_machine_is_compatible("renesas,r8a7743")) syscier = 0x00101003; else if (of_machine_is_compatible("renesas,r8a7744")) diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 50c57c8c4f40..bd9985459651 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -207,6 +207,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", -- 2.17.1