7 files changed, 63 insertions, 111 deletions

diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 2f0b7169f132..9a60cb38cf56 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -13,6 +13,8 @@ SoCs:
     compatible = "renesas,r8a73a4"
   - R-Mobile A1 (R8A77400)
     compatible = "renesas,r8a7740"
+  - RZ/G1M (R8A77430)
+    compatible = "renesas,r8a7743"
   - R-Car M1A (R8A77781)
     compatible = "renesas,r8a7778"
   - R-Car H1 (R8A77790)
@@ -35,7 +37,7 @@ SoCs:
 
 Boards:
 
-  - Alt
+  - Alt (RTP0RC7794SEB00010S)
     compatible = "renesas,alt", "renesas,r8a7794"
   - APE6-EVM
     compatible = "renesas,ape6evm", "renesas,r8a73a4"
@@ -47,7 +49,7 @@ Boards:
     compatible = "renesas,bockw", "renesas,r8a7778"
   - Genmai (RTK772100BC00000BR)
     compatible = "renesas,genmai", "renesas,r7s72100"
-  - Gose
+  - Gose (RTP0RC7793SEB00010S)
     compatible = "renesas,gose", "renesas,r8a7793"
   - H3ULCB (RTP0RC7795SKB00010S)
     compatible = "renesas,h3ulcb", "renesas,r8a7795";
@@ -61,7 +63,7 @@ Boards:
     compatible = "renesas,kzm9g", "renesas,sh73a0"
   - Lager (RTP0RC7790SEB00010S)
     compatible = "renesas,lager", "renesas,r8a7790"
-  - Marzen
+  - Marzen (R0P7779A00010S)
     compatible = "renesas,marzen", "renesas,r8a7779"
   - Porter (M2-LCDP)
     compatible = "renesas,porter", "renesas,r8a7791"
@@ -73,5 +75,7 @@ Boards:
     compatible = "renesas,salvator-x", "renesas,r8a7796";
   - SILK (RTP0RC7794LCB00011S)
     compatible = "renesas,silk", "renesas,r8a7794"
+  - SK-RZG1M (YR8A77430S000BE)
+    compatible = "renesas,sk-rzg1m", "renesas,r8a7743"
   - Wheat
     compatible = "renesas,wheat", "renesas,r8a7792"
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 09817bae4558..6fbd9b7d2d67 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -32,15 +32,15 @@ config ARCH_RMOBILE
 menuconfig ARCH_RENESAS
         bool "Renesas ARM SoCs"
         depends on ARCH_MULTI_V7 && MMU
+        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ARCH_SHMOBILE
         select ARCH_SHMOBILE_MULTI
+        select ARM_GIC
+        select GPIOLIB
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
-        select ARM_GIC
-        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select NO_IOPORT_MAP
         select PINCTRL
-        select GPIOLIB
         select ZONE_DMA if ARM_LPAE
 
 if ARCH_RENESAS
@@ -60,6 +60,7 @@ config ARCH_R7S72100
 config ARCH_R8A73A4
         bool "R-Mobile APE6 (R8A73A40)"
         select ARCH_RMOBILE
+        select ARM_ERRATA_798181 if SMP
         select RENESAS_IRQC
 
 config ARCH_R8A7740
@@ -67,6 +68,11 @@ config ARCH_R8A7740
         select ARCH_RMOBILE
         select RENESAS_INTC_IRQPIN
 
+config ARCH_R8A7743
+        bool "RZ/G1M (R8A77430)"
+        select ARCH_RCAR_GEN2
+        select ARM_ERRATA_798181 if SMP
+
 config ARCH_R8A7778
         bool "R-Car M1A (R8A77781)"
         select ARCH_RCAR_GEN1
@@ -78,20 +84,24 @@ config ARCH_R8A7779
 config ARCH_R8A7790
         bool "R-Car H2 (R8A77900)"
         select ARCH_RCAR_GEN2
+        select ARM_ERRATA_798181 if SMP
         select I2C
 
 config ARCH_R8A7791
         bool "R-Car M2-W (R8A77910)"
         select ARCH_RCAR_GEN2
+        select ARM_ERRATA_798181 if SMP
         select I2C
 
 config ARCH_R8A7792
         bool "R-Car V2H (R8A77920)"
         select ARCH_RCAR_GEN2
+        select ARM_ERRATA_798181 if SMP
 
 config ARCH_R8A7793
         bool "R-Car M2-N (R8A7793)"
         select ARCH_RCAR_GEN2
+        select ARM_ERRATA_798181 if SMP
         select I2C
 
 config ARCH_R8A7794
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 3fc48b02eb4f..64611a1b4276 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -13,9 +13,6 @@ obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)      += setup-r8a7779.o pm-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)      += setup-r8a7790.o
 obj-$(CONFIG_ARCH_R8A7791)      += setup-r8a7791.o
-obj-$(CONFIG_ARCH_R8A7792)      += setup-r8a7792.o
-obj-$(CONFIG_ARCH_R8A7793)      += setup-r8a7793.o
-obj-$(CONFIG_ARCH_R8A7794)      += setup-r8a7794.o
 obj-$(CONFIG_ARCH_EMEV2)        += setup-emev2.o
 obj-$(CONFIG_ARCH_R7S72100)     += setup-r7s72100.o
 
diff --git a/arch/arm/mach-shmobile/setup-r8a7792.c b/arch/arm/mach-shmobile/setup-r8a7792.c
deleted file mode 100644
index a0910395da09..000000000000
--- a/arch/arm/mach-shmobile/setup-r8a7792.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * r8a7792 processor support
- *
- * Copyright (C) 2014 Renesas Electronics Corporation
- * Copyright (C) 2016 Cogent  Embedded, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/of_platform.h>
-
-#include <asm/mach/arch.h>
-
-#include "common.h"
-#include "rcar-gen2.h"
-
-static const char * const r8a7792_boards_compat_dt[] __initconst = {
-        "renesas,r8a7792",
-        NULL,
-};
-
-DT_MACHINE_START(R8A7792_DT, "Generic R8A7792 (Flattened Device Tree)")
-        .init_early     = shmobile_init_delay,
-        .init_late      = shmobile_init_late,
-        .init_time      = rcar_gen2_timer_init,
-        .reserve        = rcar_gen2_reserve,
-        .dt_compat      = r8a7792_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7793.c b/arch/arm/mach-shmobile/setup-r8a7793.c
deleted file mode 100644
index 5fce87f7f254..000000000000
--- a/arch/arm/mach-shmobile/setup-r8a7793.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * r8a7793 processor support
- *
- * Copyright (C) 2015  Ulrich Hecht
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/init.h>
-#include <asm/mach/arch.h>
-
-#include "common.h"
-#include "rcar-gen2.h"
-
-static const char * const r8a7793_boards_compat_dt[] __initconst = {
-        "renesas,r8a7793",
-        NULL,
-};
-
-DT_MACHINE_START(R8A7793_DT, "Generic R8A7793 (Flattened Device Tree)")
-        .init_early     = shmobile_init_delay,
-        .init_time      = rcar_gen2_timer_init,
-        .init_late      = shmobile_init_late,
-        .reserve        = rcar_gen2_reserve,
-        .dt_compat      = r8a7793_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7794.c b/arch/arm/mach-shmobile/setup-r8a7794.c
deleted file mode 100644
index d2b093033132..000000000000
--- a/arch/arm/mach-shmobile/setup-r8a7794.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * r8a7794 processor support
- *
- * Copyright (C) 2014  Renesas Electronics Corporation
- * Copyright (C) 2014  Ulrich Hecht
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#include <linux/of_platform.h>
-#include "common.h"
-#include "rcar-gen2.h"
-#include <asm/mach/arch.h>
-
-static const char * const r8a7794_boards_compat_dt[] __initconst = {
-        "renesas,r8a7794",
-        NULL,
-};
-
-DT_MACHINE_START(R8A7794_DT, "Generic R8A7794 (Flattened Device Tree)")
-        .init_early     = shmobile_init_delay,
-        .init_late      = shmobile_init_late,
-        .init_time      = rcar_gen2_timer_init,
-        .reserve        = rcar_gen2_reserve,
-        .dt_compat      = r8a7794_boards_compat_dt,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index afb9fdcd3d90..d6b4841e51a9 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -15,6 +15,7 @@
  * GNU General Public License for more details.
  */
 
+#include <linux/clk-provider.h>
 #include <linux/clk/renesas.h>
 #include <linux/clocksource.h>
 #include <linux/device.h>
@@ -24,6 +25,7 @@
 #include <linux/memblock.h>
 #include <linux/of.h>
 #include <linux/of_fdt.h>
+#include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include "common.h"
 #include "rcar-gen2.h"
@@ -130,7 +132,15 @@ void __init rcar_gen2_timer_init(void)
         iounmap(base);
 #endif /* CONFIG_ARM_ARCH_TIMER */
 
-        rcar_gen2_clocks_init(mode);
+        if (IS_ENABLED(CONFIG_ARCH_R8A7790) ||
+            IS_ENABLED(CONFIG_ARCH_R8A7791) ||
+            IS_ENABLED(CONFIG_ARCH_R8A7792) ||
+            IS_ENABLED(CONFIG_ARCH_R8A7793) ||
+            IS_ENABLED(CONFIG_ARCH_R8A7794))
+                rcar_gen2_clocks_init(mode);
+        else
+                of_clk_init(NULL);
+
         clocksource_probe();
 }
 
@@ -203,3 +213,35 @@ void __init rcar_gen2_reserve(void)
         }
 #endif
 }
+
+static const char * const rcar_gen2_boards_compat_dt[] __initconst = {
+        /*
+         * R8A7790 and R8A7791 can't be handled here as long as they need SMP
+         * initialization fallback.
+         */
+        "renesas,r8a7792",
+        "renesas,r8a7793",
+        "renesas,r8a7794",
+        NULL,
+};
+
+DT_MACHINE_START(RCAR_GEN2_DT, "Generic R-Car Gen2 (Flattened Device Tree)")
+        .init_early     = shmobile_init_delay,
+        .init_late      = shmobile_init_late,
+        .init_time      = rcar_gen2_timer_init,
+        .reserve        = rcar_gen2_reserve,
+        .dt_compat      = rcar_gen2_boards_compat_dt,
+MACHINE_END
+
+static const char * const rz_g1_boards_compat_dt[] __initconst = {
+        "renesas,r8a7743",
+        NULL,
+};
+
+DT_MACHINE_START(RZ_G1_DT, "Generic RZ/G1 (Flattened Device Tree)")
+        .init_early     = shmobile_init_delay,
+        .init_late      = shmobile_init_late,
+        .init_time      = rcar_gen2_timer_init,
+        .reserve        = rcar_gen2_reserve,
+        .dt_compat      = rz_g1_boards_compat_dt,
+MACHINE_END