Merge tag 'renesas-drivers-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel...

Renesas ARM Based SoC Drivers Updates for v4.12

* Identify RZ/G1N and RZ/G1H

* tag 'renesas-drivers-for-v4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
  soc: renesas: Identify RZ/G1N
  soc: renesas: Identify RZ/G1H

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 330960312296f603075fbcd0296f2693df8889aa..b894cf64225b31ac89693b5b04f0301be3aaf10f 100644 (file)
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -80,11 +80,21 @@ static const struct renesas_soc soc_rmobile_a1 __initconst __maybe_unused = {
        .id     = 0x40,
 };
 
+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,
 };
 
+static const struct renesas_soc soc_rz_g1n __initconst __maybe_unused = {
+       .family = &fam_rzg,
+       .id     = 0x4b,
+};
+
 static const struct renesas_soc soc_rz_g1e __initconst __maybe_unused = {
        .family = &fam_rzg,
        .id     = 0x4c,
@@ -150,9 +160,15 @@ static const struct of_device_id renesas_socs[] __initconst = {
 #ifdef CONFIG_ARCH_R8A7740
        { .compatible = "renesas,r8a7740",      .data = &soc_rmobile_a1 },
 #endif
+#ifdef CONFIG_ARCH_R8A7742
+       { .compatible = "renesas,r8a7742",      .data = &soc_rz_g1h },
+#endif
 #ifdef CONFIG_ARCH_R8A7743
        { .compatible = "renesas,r8a7743",      .data = &soc_rz_g1m },
 #endif
+#ifdef CONFIG_ARCH_R8A7744
+       { .compatible = "renesas,r8a7744",      .data = &soc_rz_g1n },
+#endif
 #ifdef CONFIG_ARCH_R8A7745
        { .compatible = "renesas,r8a7745",      .data = &soc_rz_g1e },
 #endif