Skip to contentSkip to conversation

Basic SoC support for r8a7743/r8a7745

PATCH New Biju Das 2 participants 13 messages Jul 12, 2017 – Jul 19, 2017

Subsystems (11)
lore
Share & tools
lore

Biju Das

author
#0 lore raw

cover Basic SoC support for r8a7743/r8a7745

This series aims to add basic SoC support for
r8a7743/r8a7745. All the patches in this series
are cherry-picked from the upstream kernel.

This series has been tested against linux-cip tag v4.4.75-cip6.

Laurent Pinchart (1):
ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions

Sergei Shtylyov (5):
sh_eth: add R8A7743/5 support
DT: irqchip: renesas-irqc: document R8A7743/5 support
sh-sci: document R8A7743/5 support
ARM: shmobile: r8a7743: basic SoC support
ARM: shmobile: r8a7745: basic SoC support

 Documentation/devicetree/bindings/arm/shmobile.txt |  4 +++
 .../bindings/interrupt-controller/renesas,irqc.txt |  4 ++-
 Documentation/devicetree/bindings/net/sh_eth.txt   |  2 ++
 .../bindings/serial/renesas,sci-serial.txt         |  8 ++++++
 arch/arm/mach-shmobile/Kconfig                     |  8 ++++++
 arch/arm/mach-shmobile/Makefile                    |  2 --
 arch/arm/mach-shmobile/setup-r8a7793.c             | 33 ----------------------
 arch/arm/mach-shmobile/setup-r8a7794.c             | 33 ----------------------
 arch/arm/mach-shmobile/setup-rcar-gen2.c           | 33 ++++++++++++++++++++++
 drivers/net/ethernet/renesas/Kconfig               |  2 +-
 drivers/net/ethernet/renesas/sh_eth.c              |  2 ++
 11 files changed, 61 insertions(+), 70 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
Signature · 1 line
1.9.1
author
#1 lore raw

PATCH 1/6 sh_eth: add R8A7743/5 support

From: Sergei Shtylyov <[email protected]>

Add support for the first two members of the Renesas RZ/G family, RZ/G1M/E (also known as R8A7743/5). The Ether core is the same as in the R-Car gen2 SoCs, so will share the code/data with them...

(cherry picked from commit c099ff3cdb9dd2281dee3dc4ef89fec1c516df22)
---
 Documentation/devicetree/bindings/net/sh_eth.txt | 2 ++
 drivers/net/ethernet/renesas/Kconfig             | 2 +-
 drivers/net/ethernet/renesas/sh_eth.c            | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/net/sh_eth.txt +2 -0
index 2f6ec85..0115c85 100644
@@ -5,6 +5,8 @@ interface contains.
 
 Required properties:
 - compatible: "renesas,gether-r8a7740" if the device is a part of R8A7740 SoC.
+	      "renesas,ether-r8a7743"  if the device is a part of R8A7743 SoC.
+	      "renesas,ether-r8a7745"  if the device is a part of R8A7745 SoC.
 	      "renesas,ether-r8a7778"  if the device is a part of R8A7778 SoC.
 	      "renesas,ether-r8a7779"  if the device is a part of R8A7779 SoC.
 	      "renesas,ether-r8a7790"  if the device is a part of R8A7790 SoC.
drivers/net/ethernet/renesas/Kconfig +1 -1
index 270c4c9..0f86521 100644
@@ -27,7 +27,7 @@ config SH_ETH
 	  Renesas SuperH Ethernet device driver.
 	  This driver supporting CPUs are:
 		- SH7619, SH7710, SH7712, SH7724, SH7734, SH7763, SH7757,
-		  R8A7740, R8A777x and R8A779x.
+		  R8A7740, R8A774x, R8A777x and R8A779x.
 
 config RAVB
 	tristate "Renesas Ethernet AVB support"
drivers/net/ethernet/renesas/sh_eth.c +2 -0
index 480f3da..c04b4ea 100644
@@ -3055,6 +3055,8 @@ static struct sh_eth_plat_data *sh_eth_parse_dt(struct device *dev)
 
 static const struct of_device_id sh_eth_match_table[] = {
 	{ .compatible = "renesas,gether-r8a7740", .data = &r8a7740_data },
+	{ .compatible = "renesas,ether-r8a7743", .data = &r8a779x_data },
+	{ .compatible = "renesas,ether-r8a7745", .data = &r8a779x_data },
 	{ .compatible = "renesas,ether-r8a7778", .data = &r8a777x_data },
 	{ .compatible = "renesas,ether-r8a7779", .data = &r8a777x_data },
 	{ .compatible = "renesas,ether-r8a7790", .data = &r8a779x_data },
Signature · 1 line
1.9.1
author
#2 lore raw

PATCH 2/6 DT: irqchip: renesas-irqc: document R8A7743/5 support

In reply to Biju Das

From: Sergei Shtylyov <[email protected]>

Renesas RZ/G SoC have the R-Car gen2 compatible IRQC interrupt controllers. Document RZ/G1[ME] (also known as R8A774[35]) SoC bindings.

(cherry picked from commit 87e5fc99b0280b492724cc7f2d8d9ad37b980087)
---
 .../devicetree/bindings/interrupt-controller/renesas,irqc.txt         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt +3 -1
index ae5054c..e3f052d 100644
@@ -1,10 +1,12 @@
-DT bindings for the R-Mobile/R-Car interrupt controller
+DT bindings for the R-Mobile/R-Car/RZ/G interrupt controller
 
 Required properties:
 
 - compatible: has to be "renesas,irqc-<soctype>", "renesas,irqc" as fallback.
   Examples with soctypes are:
     - "renesas,irqc-r8a73a4" (R-Mobile APE6)
+    - "renesas,irqc-r8a7743" (RZ/G1M)
+    - "renesas,irqc-r8a7745" (RZ/G1E)
     - "renesas,irqc-r8a7790" (R-Car H2)
     - "renesas,irqc-r8a7791" (R-Car M2-W)
     - "renesas,irqc-r8a7792" (R-Car V2H)
Signature · 1 line
1.9.1
author
#3 lore raw

PATCH 3/6 sh-sci: document R8A7743/5 support

In reply to Biju Das

From: Sergei Shtylyov <[email protected]>

Renesas RZ/G SoC also have the SCIF, SCIFA, SCIFB, and HSCIF ports and they seem compatible with the R-Car gen2 SoC in this respect... Document RZ/G1[ME] (also known as R8A774[35]) SoC bindings.

(cherry picked from commit c03e1b8703a4a0c8bac7f6b65d8fcb539ec62d82)
---
 Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 8 ++++++++
 1 file changed, 8 insertions(+)
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt +8 -0
index 73f825e..cbcfdc0 100644
@@ -9,6 +9,14 @@ Required properties:
     - "renesas,scifb-r8a73a4" for R8A73A4 (R-Mobile APE6) SCIFB compatible UART.
     - "renesas,scifa-r8a7740" for R8A7740 (R-Mobile A1) SCIFA compatible UART.
     - "renesas,scifb-r8a7740" for R8A7740 (R-Mobile A1) SCIFB compatible UART.
+    - "renesas,scif-r8a7743" for R8A7743 (RZ/G1M) SCIF compatible UART.
+    - "renesas,scifa-r8a7743" for R8A7743 (RZ/G1M) SCIFA compatible UART.
+    - "renesas,scifb-r8a7743" for R8A7743 (RZ/G1M) SCIFB compatible UART.
+    - "renesas,hscif-r8a7743" for R8A7743 (RZ/G1M) HSCIF compatible UART.
+    - "renesas,scif-r8a7745" for R8A7745 (RZ/G1E) SCIF compatible UART.
+    - "renesas,scifa-r8a7745" for R8A7745 (RZ/G1E) SCIFA compatible UART.
+    - "renesas,scifb-r8a7745" for R8A7745 (RZ/G1E) SCIFB compatible UART.
+    - "renesas,hscif-r8a7745" for R8A7745 (RZ/G1E) HSCIF compatible UART.
     - "renesas,scif-r8a7778" for R8A7778 (R-Car M1) SCIF compatible UART.
     - "renesas,scif-r8a7779" for R8A7779 (R-Car H1) SCIF compatible UART.
     - "renesas,scif-r8a7790" for R8A7790 (R-Car H2) SCIF compatible UART.
Signature · 1 line
1.9.1
author
#4 lore raw

PATCH 4/6 ARM: shmobile: r8a7743: basic SoC support

In reply to Biju Das

From: Sergei Shtylyov <[email protected]>

Add minimal support for the RZ/G1M (R8A7743) SoC.

Based on the original (and large) patch by Dmitry Shifrin <[email protected]>.

(cherry picked from commit e920565a1cc4a352719b42ba5e83d952a9a26507)
---
 Documentation/devicetree/bindings/arm/shmobile.txt |  2 ++
 arch/arm/mach-shmobile/Kconfig                     |  4 +++
 arch/arm/mach-shmobile/Makefile                    |  1 +
 arch/arm/mach-shmobile/setup-r8a7743.c             | 34 ++++++++++++++++++++++
 4 files changed, 41 insertions(+)
 create mode 100644 arch/arm/mach-shmobile/setup-r8a7743.c
Documentation/devicetree/bindings/arm/shmobile.txt +2 -0
index 40bb9007..07b5818 100644
@@ -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)
arch/arm/mach-shmobile/Kconfig +4 -0
index 88734a5..09929a3 100644
@@ -64,6 +64,10 @@ config ARCH_R8A7740
 	select ARCH_RMOBILE
 	select RENESAS_INTC_IRQPIN
 
+config ARCH_R8A7743
+	bool "RZ/G1M (R8A77430)"
+	select ARCH_RCAR_GEN2
+
 config ARCH_R8A7778
 	bool "R-Car M1A (R8A77781)"
 	select ARCH_RCAR_GEN1
arch/arm/mach-shmobile/Makefile +1 -0
index a65c80ac..2db5912 100644
@@ -9,6 +9,7 @@ obj-y				:= timer.o
 obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
 obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7743)	+= setup-r8a7743.o
 obj-$(CONFIG_ARCH_R8A7778)	+= setup-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)	+= setup-r8a7779.o pm-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)	+= setup-r8a7790.o
arch/arm/mach-shmobile/setup-r8a7743.c new file +34 -0
new file mode 100644
index 0000000..a7ecb82
@@ -0,0 +1,34 @@
+/*
+ * r8a7743 processor support
+ *
+ * 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 version 2 as
+ *  published by the Free Software Foundation; 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 r8a7743_boards_compat_dt[] __initconst = {
+	"renesas,r8a7743",
+	NULL,
+};
+
+DT_MACHINE_START(R8A7743_DT, "Generic R8A7743 (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	= r8a7743_boards_compat_dt,
+MACHINE_END
Signature · 1 line
1.9.1
author
#5 lore raw

PATCH 5/6 ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions

In reply to Biju Das

From: Laurent Pinchart <[email protected]>

The four SoCs use identical machine operations, consolidate them into two machine definitions in a single file.

(cherry picked from commit a0c4e2ccb31540f8972d8f36d32ace6b30e88e0f)

Conflicts:
arch/arm/mach-shmobile/Makefile
[modified]:arch/arm/mach-shmobile/setup-rcar-gen2.c

---
 arch/arm/mach-shmobile/Makefile          |  3 ---
 arch/arm/mach-shmobile/setup-r8a7743.c   | 34 --------------------------------
 arch/arm/mach-shmobile/setup-r8a7793.c   | 33 -------------------------------
 arch/arm/mach-shmobile/setup-r8a7794.c   | 33 -------------------------------
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 32 ++++++++++++++++++++++++++++++
 5 files changed, 32 insertions(+), 103 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7743.c
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
arch/arm/mach-shmobile/Makefile +0 -3
index 2db5912..4620202 100644
@@ -9,13 +9,10 @@ obj-y				:= timer.o
 obj-$(CONFIG_ARCH_SH73A0)	+= setup-sh73a0.o
 obj-$(CONFIG_ARCH_R8A73A4)	+= setup-r8a73a4.o
 obj-$(CONFIG_ARCH_R8A7740)	+= setup-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7743)	+= setup-r8a7743.o
 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_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
 
arch/arm/mach-shmobile/setup-r8a7743.c deleted +0 -34
deleted file mode 100644
index a7ecb82..0000000
@@ -1,34 +0,0 @@
-/*
- * r8a7743 processor support
- *
- * 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 version 2 as
- *  published by the Free Software Foundation; 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 r8a7743_boards_compat_dt[] __initconst = {
-	"renesas,r8a7743",
-	NULL,
-};
-
-DT_MACHINE_START(R8A7743_DT, "Generic R8A7743 (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	= r8a7743_boards_compat_dt,
-MACHINE_END
arch/arm/mach-shmobile/setup-r8a7793.c deleted +0 -33
deleted file mode 100644
index 5fce87f..0000000
@@ -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
arch/arm/mach-shmobile/setup-r8a7794.c deleted +0 -33
deleted file mode 100644
index d2b0930..0000000
@@ -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
arch/arm/mach-shmobile/setup-rcar-gen2.c +32 -0
index 9eccde3..3b5f6ac 100644
@@ -24,6 +24,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"
@@ -199,3 +200,34 @@ void __init rcar_gen2_reserve(void)
 					    &rcar_gen2_dma_contiguous, true);
 #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,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
Signature · 1 line
1.9.1
author
#6 lore raw

PATCH 6/6 ARM: shmobile: r8a7745: basic SoC support

In reply to Biju Das

From: Sergei Shtylyov <[email protected]>

Add minimal support for the RZ/G1E (R8A7745) SoC.

(cherry picked from commit 47802fd7c7c4735ddaf004e0f61371dcaa86f4ad)
---
 Documentation/devicetree/bindings/arm/shmobile.txt | 2 ++
 arch/arm/mach-shmobile/Kconfig                     | 4 ++++
 arch/arm/mach-shmobile/setup-rcar-gen2.c           | 1 +
 3 files changed, 7 insertions(+)
Documentation/devicetree/bindings/arm/shmobile.txt +2 -0
index 07b5818..b29d9c7 100644
@@ -15,6 +15,8 @@ SoCs:
     compatible = "renesas,r8a7740"
   - RZ/G1M (R8A77430)
     compatible = "renesas,r8a7743"
+  - RZ/G1E (R8A77450)
+    compatible = "renesas,r8a7745"
   - R-Car M1A (R8A77781)
     compatible = "renesas,r8a7778"
   - R-Car H1 (R8A77790)
arch/arm/mach-shmobile/Kconfig +4 -0
index 09929a3..602fc2d 100644
@@ -68,6 +68,10 @@ config ARCH_R8A7743
 	bool "RZ/G1M (R8A77430)"
 	select ARCH_RCAR_GEN2
 
+config ARCH_R8A7745
+	bool "RZ/G1E (R8A77450)"
+	select ARCH_RCAR_GEN2
+
 config ARCH_R8A7778
 	bool "R-Car M1A (R8A77781)"
 	select ARCH_RCAR_GEN1
arch/arm/mach-shmobile/setup-rcar-gen2.c +1 -0
index 3b5f6ac..3911716 100644
@@ -221,6 +221,7 @@ MACHINE_END
 
 static const char * const rz_g1_boards_compat_dt[] __initconst = {
 	"renesas,r8a7743",
+	"renesas,r8a7745",
 	NULL,
 };
 
Signature · 1 line
1.9.1
#7 lore raw

cover Basic SoC support for r8a7743/r8a7745

In reply to Biju Das
Quoted 5 lines · Biju Das

This series aims to add basic SoC support for
r8a7743/r8a7745. All the patches in this series
are cherry-picked from the upstream kernel.

This series has been tested against linux-cip tag v4.4.75-cip6.

These all look good to me, so I've applied these to the linux-4.4.y-cip branch. Are you going to add more driver support (e.g. ravb, xhci-rcar) and device tree sources?

Ben.

Quoted 25 lines

Laurent Pinchart (1):
ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions

Sergei Shtylyov (5):
sh_eth: add R8A7743/5 support
DT: irqchip: renesas-irqc: document R8A7743/5 support
sh-sci: document R8A7743/5 support
ARM: shmobile: r8a7743: basic SoC support
ARM: shmobile: r8a7745: basic SoC support

 Documentation/devicetree/bindings/arm/shmobile.txt |  4 +++
 .../bindings/interrupt-controller/renesas,irqc.txt |  4 ++-
 Documentation/devicetree/bindings/net/sh_eth.txt   |  2 ++
 .../bindings/serial/renesas,sci-serial.txt         |  8 ++++++
 arch/arm/mach-shmobile/Kconfig                     |  8 ++++++
 arch/arm/mach-shmobile/Makefile                    |  2 --
 arch/arm/mach-shmobile/setup-r8a7793.c             | 33 ----------------------
 arch/arm/mach-shmobile/setup-r8a7794.c             | 33 ----------------------
 arch/arm/mach-shmobile/setup-rcar-gen2.c           | 33 ++++++++++++++++++++++
 drivers/net/ethernet/renesas/Kconfig               |  2 +-
 drivers/net/ethernet/renesas/sh_eth.c              |  2 ++
 11 files changed, 61 insertions(+), 70 deletions(-)
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7793.c
 delete mode 100644 arch/arm/mach-shmobile/setup-r8a7794.c
Signature · 2 lines
Ben Hutchings
Software Developer, Codethink Ltd.
#8 lore raw

cover Basic SoC support for r8a7743/r8a7745

Quoted 10 lines · Ben Hutchings
Quoted 5 lines · Biju Das

This series aims to add basic SoC support for
r8a7743/r8a7745. All the patches in this series
are cherry-picked from the upstream kernel.

This series has been tested against linux-cip tag v4.4.75-cip6.

These all look good to me, so I've applied these to the linux-4.4.y-cip branch. Are you going to add more driver support (e.g. ravb, xhci-rcar) and device tree sources?

Actually, there's something not quite right here. With just CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745 enabled (but no other R-Car platforms) I get:

arch/arm/mach-shmobile/built-in.o: In function `rcar_gen2_timer_init':
/home/bwh/ln001-cip/kernel/arch/arm/mach-shmobile/setup-rcar-gen2.c:131: undefined reference to `rcar_gen2_clocks_init'

There seems to have been a lot of refactoring of drivers/clk/{shmobile,renesas} since 4.4 so I'm not sure how this should be fixed.

Ben.

Signature · 2 lines
Ben Hutchings
Software Developer, Codethink Ltd.
author
#9 lore raw

cover Basic SoC support for r8a7743/r8a7745

Quoted 18 lines

-----Original Message-----
From: Ben Hutchings [mailto:ben.hutchings at codethink.co.uk]
Sent: 18 July 2017 16:58
To: Biju Das <[email protected]>
Cc: Chris Paterson <[email protected]>; cip-dev at lists.cip- project.org
Subject: Re: [PATCH 0/6] Basic SoC support for r8a7743/r8a7745

Quoted 7 lines · Ben Hutchings
Quoted 5 lines · Biju Das

This series aims to add basic SoC support for r8a7743/r8a7745. All the patches in this series are cherry-picked from the upstream kernel.

This series has been tested against linux-cip tag v4.4.75-cip6.

Quoted 8 lines
Quoted 3 lines

These all look good to me, so I've applied these to the linux-4.4.y-cip branch. Are you going to add more driver support (e.g. ravb, xhci-rcar) and device tree sources?

Actually, there's something not quite right here. With just CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745 enabled (but no other R- Car
platforms) I get:

The patches are for Basic SoC support. Next I am planning Clock driver, then DT support for SoC, then Board DTS and then Enabling the config option(CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745) .

Quoted 7 lines

arch/arm/mach-shmobile/built-in.o: In function `rcar_gen2_timer_init':
/home/bwh/ln001-cip/kernel/arch/arm/mach-shmobile/setup-rcar-gen2.c:131:
undefined reference to `rcar_gen2_clocks_init'

There seems to have been a lot of refactoring of drivers/clk/{shmobile,renesas} since 4.4 so I'm not sure how this should be fixed.

Current upstreamed RZ/G1M clock driver uses the new Renesas CPG/MSSR clock driver frame work. Backporting requires lot of refactoring of drivers/clk/{shmobile,renesas}.
So I don't think backporting the RZ/G1M clock driver is the right choice.

However r8a7743( RZ/G1M) is identical to r8a7791(RCar-M2) platform. We ported r8a7743( RZ/G1M) clk driver based on this. The current patch series, which I submitted is tested with this clk driver.

Quoted 7 lines

Ben.

--
Ben Hutchings
Software Developer, Codethink Ltd.

Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

#10 lore raw

cover Basic SoC support for r8a7743/r8a7745

On Wed, 2017-07-19 at 08:24 +0000, Biju Das wrote:
[...]

Quoted 12 lines
Quoted 4 lines

Actually, there's something not quite right here. With just CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745 enabled (but no other R- Car
platforms) I get:

The patches are for Basic SoC support. Next I am planning Clock driver, then DT support for SoC, then Board DTS and then Enabling the config option(CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745) .

Quoted 5 lines

arch/arm/mach-shmobile/built-in.o: In function `rcar_gen2_timer_init':
/home/bwh/ln001-cip/kernel/arch/arm/mach-shmobile/setup-rcar-gen2.c:131:
undefined reference to `rcar_gen2_clocks_init'

Quoted 6 lines
Quoted 2 lines

There seems to have been a lot of refactoring of drivers/clk/{shmobile,renesas} since 4.4 so I'm not sure how this should be fixed.

Current upstreamed RZ/G1M clock driver uses the new Renesas CPG/MSSR clock driver frame work. Backporting requires lot of refactoring of drivers/clk/{shmobile,renesas}.
So I don't think backporting the RZ/G1M clock driver is the right choice.

OK.

Quoted 2 lines

However r8a7743( RZ/G1M) is identical to r8a7791(RCar-M2) platform. We ported r8a7743( RZ/G1M) clk driver based on this. The current patch series, which I submitted is tested with this clk driver.

Then I think I should just make this change:

Subject: CIP: Build essential clock driver for Renesas RZ/G1 platforms

In mainline, clk-rcar-gen2 is selected by CONFIG_CLK_RCAR_GEN2 but here there is no such common config symbol and we need to select it for each platform.

---
 drivers/clk/shmobile/Makefile | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/shmobile/Makefile +2 -0
index 97c71c885e4f..b339c0b6bb2f 100644
@@ -2,6 +2,8 @@ obj-$(CONFIG_ARCH_EMEV2)		+= clk-emev2.o
 obj-$(CONFIG_ARCH_R7S72100)		+= clk-rz.o
 obj-$(CONFIG_ARCH_R8A73A4)		+= clk-r8a73a4.o
 obj-$(CONFIG_ARCH_R8A7740)		+= clk-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7743)		+= clk-rcar-gen2.o
+obj-$(CONFIG_ARCH_R8A7745)		+= clk-rcar-gen2.o
 obj-$(CONFIG_ARCH_R8A7778)		+= clk-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)		+= clk-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)		+= clk-rcar-gen2.o

--- END ---

Right?

Ben.

Signature · 2 lines
Ben Hutchings
Software Developer, Codethink Ltd.
author
#11 lore raw

cover Basic SoC support for r8a7743/r8a7745

Quoted 71 lines

-----Original Message-----
From: Ben Hutchings [mailto:ben.hutchings at codethink.co.uk]
Sent: 19 July 2017 14:54
To: Biju Das <[email protected]>
Cc: Chris Paterson <[email protected]>; cip-dev at lists.cip- project.org
Subject: Re: [PATCH 0/6] Basic SoC support for r8a7743/r8a7745

On Wed, 2017-07-19 at 08:24 +0000, Biju Das wrote:
[...]

Quoted 2 lines
Quoted 2 lines

Actually, there's something not quite right here. With just CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745 enabled (but no

other R-

Quoted 5 lines
Quoted 2 lines

Car
platforms) I get:

The patches are for Basic SoC support. Next I am planning Clock driver, then DT support for SoC, then Board DTS and then Enabling the config

option(CONFIG_ARCH_R8A7743 and CONFIG_ARCH_R8A7745) .

Quoted 3 lines
Quoted 3 lines

arch/arm/mach-shmobile/built-in.o: In function `rcar_gen2_timer_init':
/home/bwh/ln001-cip/kernel/arch/arm/mach-shmobile/setup-rcar-

gen2.c:131:

Quoted 4 lines
Quoted 4 lines

undefined reference to `rcar_gen2_clocks_init'

There seems to have been a lot of refactoring of drivers/clk/{shmobile,renesas} since 4.4 so I'm not sure how this should be

fixed.

Quoted 2 lines

Current upstreamed RZ/G1M clock driver uses the new Renesas CPG/MSSR

clock driver frame work.

Quoted 2 lines

Backporting requires lot of refactoring of drivers/clk/{shmobile,renesas}. So I don't think backporting the RZ/G1M clock driver is the right choice.

OK.

Quoted 1 line

However r8a7743( RZ/G1M) is identical to r8a7791(RCar-M2) platform. We

ported r8a7743( RZ/G1M) clk driver based on this.

Quoted 1 line

The current patch series, which I submitted is tested with this clk driver.

Then I think I should just make this change:

Subject: CIP: Build essential clock driver for Renesas RZ/G1 platforms

In mainline, clk-rcar-gen2 is selected by CONFIG_CLK_RCAR_GEN2 but here there is no such common config symbol and we need to select it for each platform.

---
 drivers/clk/shmobile/Makefile | 2 ++
 1 file changed, 2 insertions(+)
drivers/clk/shmobile/Makefile +0 -0
index 97c71c885e4f..b339c0b6bb2f 100644
@@ -2,6 +2,8 @@ obj-$(CONFIG_ARCH_EMEV2)+= clk-

emev2.o
obj-$(CONFIG_ARCH_R7S72100)+= clk-rz.o
obj-$(CONFIG_ARCH_R8A73A4)+= clk-r8a73a4.o
obj-$(CONFIG_ARCH_R8A7740)+= clk-r8a7740.o

drivers/clk/shmobile/Makefile +2 -1
+obj-$(CONFIG_ARCH_R8A7743)+= clk-rcar-gen2.o
+obj-$(CONFIG_ARCH_R8A7745)+= clk-rcar-gen2.o
 obj-$(CONFIG_ARCH_R8A7778)+= clk-r8a7778.o
 obj-$(CONFIG_ARCH_R8A7779)+= clk-r8a7779.o
 obj-$(CONFIG_ARCH_R8A7790)+= clk-rcar-gen2.o
--- END ---
Quoted 1 line

Right?

Yes. That is correct.

Quoted 6 lines

Ben.

--
Ben Hutchings
Software Developer, Codethink Ltd.

Renesas Electronics Europe Ltd, Dukes Meadow, Millboard Road, Bourne End, Buckinghamshire, SL8 5FH, UK. Registered in England & Wales under Registered No. 04586709.

#12 lore raw

cover Basic SoC support for r8a7743/r8a7745

On Wed, 2017-07-19 at 13:59 +0000, Biju Das wrote:
[...]

Quoted 3 lines
Quoted 3 lines

Then I think I should just make this change:

Subject: CIP: Build essential clock driver for Renesas RZ/G1 platforms

[...]

Quoted 2 lines
Quoted 1 line

Right?

Yes. That is correct.

I've applied this.

Ben.

Signature · 2 lines
Ben Hutchings
Software Developer, Codethink Ltd.