From: Geert Uytterhoeven commit 8848e1b14231a40ed66229fb3ee98519b32f2ae7 upstream. Add support for identifying the RZ/G1H (r8a7742) SoC. Signed-off-by: Geert Uytterhoeven Signed-off-by: Simon Horman [PL: manually applied the changes, enabled SOC_BUS config for RZ/G1N] Signed-off-by: Lad Prabhakar --- arch/arm/mach-shmobile/Kconfig | 1 + drivers/soc/renesas/renesas-soc.c | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 8b84eb630dee..6812b3e19ba3 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -68,6 +68,7 @@ config ARCH_R8A7742 bool "RZ/G1H (R8A77420)" select ARCH_RCAR_GEN2 select ARM_ERRATA_798181 if SMP + select SOC_BUS config ARCH_R8A7743 bool "RZ/G1M (R8A77430)" diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c index 2cf62855cc45..eaa540bfc9bd 100644 --- a/drivers/soc/renesas/renesas-soc.c +++ b/drivers/soc/renesas/renesas-soc.c @@ -35,6 +35,11 @@ struct renesas_soc { u8 id; }; +static const struct renesas_soc soc_rz_g1h __initconst __maybe_unused = { + .family = &fam_rzg, + .id = 0x45, +}; + static const struct renesas_soc soc_rz_g1m __initconst __maybe_unused = { .family = &fam_rzg, .id = 0x47, @@ -51,6 +56,9 @@ static const struct renesas_soc soc_rz_g1e __initconst __maybe_unused = { }; static const struct of_device_id renesas_socs[] __initconst = { +#ifdef CONFIG_ARCH_R8A7742 + { .compatible = "renesas,r8a7742", .data = &soc_rz_g1h }, +#endif #ifdef CONFIG_ARCH_R8A7743 { .compatible = "renesas,r8a7743", .data = &soc_rz_g1m }, #endif -- 2.17.1