* [cip-dev] [PATCH 1/6] sh_eth: add R8A7743/5 support
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 2/6] DT: irqchip: renesas-irqc: document " Biju Das
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
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...
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit c099ff3cdb9dd2281dee3dc4ef89fec1c516df22)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
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(-)
diff --git a/Documentation/devicetree/bindings/net/sh_eth.txt b/Documentation/devicetree/bindings/net/sh_eth.txt
index 2f6ec85..0115c85 100644
--- a/Documentation/devicetree/bindings/net/sh_eth.txt
+++ b/Documentation/devicetree/bindings/net/sh_eth.txt
@@ -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.
diff --git a/drivers/net/ethernet/renesas/Kconfig b/drivers/net/ethernet/renesas/Kconfig
index 270c4c9..0f86521 100644
--- a/drivers/net/ethernet/renesas/Kconfig
+++ b/drivers/net/ethernet/renesas/Kconfig
@@ -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"
diff --git a/drivers/net/ethernet/renesas/sh_eth.c b/drivers/net/ethernet/renesas/sh_eth.c
index 480f3da..c04b4ea 100644
--- a/drivers/net/ethernet/renesas/sh_eth.c
+++ b/drivers/net/ethernet/renesas/sh_eth.c
@@ -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 },
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 2/6] DT: irqchip: renesas-irqc: document R8A7743/5 support
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 1/6] sh_eth: add R8A7743/5 support Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 3/6] sh-sci: " Biju Das
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Renesas RZ/G SoC have the R-Car gen2 compatible IRQC interrupt controllers.
Document RZ/G1[ME] (also known as R8A774[35]) SoC bindings.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Rob Herring <robh@kernel.org>
(cherry picked from commit 87e5fc99b0280b492724cc7f2d8d9ad37b980087)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
.../devicetree/bindings/interrupt-controller/renesas,irqc.txt | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
index ae5054c..e3f052d 100644
--- a/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt
@@ -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)
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 3/6] sh-sci: document R8A7743/5 support
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 1/6] sh_eth: add R8A7743/5 support Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 2/6] DT: irqchip: renesas-irqc: document " Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 4/6] ARM: shmobile: r8a7743: basic SoC support Biju Das
` (3 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
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.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Acked-by: Simon Horman <horms+renesas@verge.net.au>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit c03e1b8703a4a0c8bac7f6b65d8fcb539ec62d82)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
Documentation/devicetree/bindings/serial/renesas,sci-serial.txt | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
index 73f825e..cbcfdc0 100644
--- a/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
+++ b/Documentation/devicetree/bindings/serial/renesas,sci-serial.txt
@@ -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.
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 4/6] ARM: shmobile: r8a7743: basic SoC support
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
` (2 preceding siblings ...)
2017-07-12 9:21 ` [cip-dev] [PATCH 3/6] sh-sci: " Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 5/6] ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions Biju Das
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add minimal support for the RZ/G1M (R8A7743) SoC.
Based on the original (and large) patch by Dmitry Shifrin
<dmitry.shifrin@cogentembedded.com>.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit e920565a1cc4a352719b42ba5e83d952a9a26507)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
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
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 40bb9007..07b5818 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)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 88734a5..09929a3 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index a65c80ac..2db5912 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
diff --git a/arch/arm/mach-shmobile/setup-r8a7743.c b/arch/arm/mach-shmobile/setup-r8a7743.c
new file mode 100644
index 0000000..a7ecb82
--- /dev/null
+++ b/arch/arm/mach-shmobile/setup-r8a7743.c
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 5/6] ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
` (3 preceding siblings ...)
2017-07-12 9:21 ` [cip-dev] [PATCH 4/6] ARM: shmobile: r8a7743: basic SoC support Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-12 9:21 ` [cip-dev] [PATCH 6/6] ARM: shmobile: r8a7745: basic SoC support Biju Das
2017-07-18 15:30 ` [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Ben Hutchings
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
The four SoCs use identical machine operations, consolidate them into
two machine definitions in a single file.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Tested-by: Simon Horman <horms+renesas@verge.net.au>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit a0c4e2ccb31540f8972d8f36d32ace6b30e88e0f)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
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
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 2db5912..4620202 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -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
diff --git a/arch/arm/mach-shmobile/setup-r8a7743.c b/arch/arm/mach-shmobile/setup-r8a7743.c
deleted file mode 100644
index a7ecb82..0000000
--- a/arch/arm/mach-shmobile/setup-r8a7743.c
+++ /dev/null
@@ -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
diff --git a/arch/arm/mach-shmobile/setup-r8a7793.c b/arch/arm/mach-shmobile/setup-r8a7793.c
deleted file mode 100644
index 5fce87f..0000000
--- 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 d2b0930..0000000
--- 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 9eccde3..3b5f6ac 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -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
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 6/6] ARM: shmobile: r8a7745: basic SoC support
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
` (4 preceding siblings ...)
2017-07-12 9:21 ` [cip-dev] [PATCH 5/6] ARM: shmobile: Consolidate R8A7743 and R8A779[234] machine definitions Biju Das
@ 2017-07-12 9:21 ` Biju Das
2017-07-18 15:30 ` [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Ben Hutchings
6 siblings, 0 replies; 13+ messages in thread
From: Biju Das @ 2017-07-12 9:21 UTC (permalink / raw)
To: cip-dev
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Add minimal support for the RZ/G1E (R8A7745) SoC.
Signed-off-by: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
(cherry picked from commit 47802fd7c7c4735ddaf004e0f61371dcaa86f4ad)
Signed-off-by: Biju Das <biju.das@bp.renesas.com>
---
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(+)
diff --git a/Documentation/devicetree/bindings/arm/shmobile.txt b/Documentation/devicetree/bindings/arm/shmobile.txt
index 07b5818..b29d9c7 100644
--- a/Documentation/devicetree/bindings/arm/shmobile.txt
+++ b/Documentation/devicetree/bindings/arm/shmobile.txt
@@ -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)
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 09929a3..602fc2d 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -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
diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c
index 3b5f6ac..3911716 100644
--- a/arch/arm/mach-shmobile/setup-rcar-gen2.c
+++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c
@@ -221,6 +221,7 @@ MACHINE_END
static const char * const rz_g1_boards_compat_dt[] __initconst = {
"renesas,r8a7743",
+ "renesas,r8a7745",
NULL,
};
--
1.9.1
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-12 9:21 [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Biju Das
` (5 preceding siblings ...)
2017-07-12 9:21 ` [cip-dev] [PATCH 6/6] ARM: shmobile: r8a7745: basic SoC support Biju Das
@ 2017-07-18 15:30 ` Ben Hutchings
2017-07-18 15:58 ` Ben Hutchings
6 siblings, 1 reply; 13+ messages in thread
From: Ben Hutchings @ 2017-07-18 15:30 UTC (permalink / raw)
To: cip-dev
On Wed, 2017-07-12 at 10:21 +0100, Biju Das wrote:
> 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.
> 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
>
--
Ben Hutchings
Software Developer, Codethink Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-18 15:30 ` [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745 Ben Hutchings
@ 2017-07-18 15:58 ` Ben Hutchings
2017-07-19 8:24 ` Biju Das
0 siblings, 1 reply; 13+ messages in thread
From: Ben Hutchings @ 2017-07-18 15:58 UTC (permalink / raw)
To: cip-dev
On Tue, 2017-07-18 at 16:30 +0100, Ben Hutchings wrote:
> On Wed, 2017-07-12 at 10:21 +0100, Biju Das wrote:
> > 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.
--
Ben Hutchings
Software Developer, Codethink Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-18 15:58 ` Ben Hutchings
@ 2017-07-19 8:24 ` Biju Das
2017-07-19 13:54 ` Ben Hutchings
0 siblings, 1 reply; 13+ messages in thread
From: Biju Das @ 2017-07-19 8:24 UTC (permalink / raw)
To: cip-dev
> -----Original Message-----
> From: Ben Hutchings [mailto:ben.hutchings at codethink.co.uk]
> Sent: 18 July 2017 16:58
> To: Biju Das <biju.das@bp.renesas.com>
> Cc: Chris Paterson <Chris.Paterson2@renesas.com>; cip-dev at lists.cip-
> project.org
> Subject: Re: [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
>
> On Tue, 2017-07-18 at 16:30 +0100, Ben Hutchings wrote:
> > On Wed, 2017-07-12 at 10:21 +0100, Biju Das wrote:
> > > 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:
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) .
>
> 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.
>
> 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.
^ permalink raw reply [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-19 8:24 ` Biju Das
@ 2017-07-19 13:54 ` Ben Hutchings
2017-07-19 13:59 ` Biju Das
0 siblings, 1 reply; 13+ messages in thread
From: Ben Hutchings @ 2017-07-19 13:54 UTC (permalink / raw)
To: cip-dev
On Wed, 2017-07-19 at 08:24 +0000, Biju Das wrote:
[...]
> > 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) .
> >
> > 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.
OK.
> 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.
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
---
drivers/clk/shmobile/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile
index 97c71c885e4f..b339c0b6bb2f 100644
--- a/drivers/clk/shmobile/Makefile
+++ b/drivers/clk/shmobile/Makefile
@@ -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.
--
Ben Hutchings
Software Developer, Codethink Ltd.
^ permalink raw reply related [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-19 13:54 ` Ben Hutchings
@ 2017-07-19 13:59 ` Biju Das
2017-07-19 14:23 ` Ben Hutchings
0 siblings, 1 reply; 13+ messages in thread
From: Biju Das @ 2017-07-19 13:59 UTC (permalink / raw)
To: cip-dev
> -----Original Message-----
> From: Ben Hutchings [mailto:ben.hutchings at codethink.co.uk]
> Sent: 19 July 2017 14:54
> To: Biju Das <biju.das@bp.renesas.com>
> Cc: Chris Paterson <Chris.Paterson2@renesas.com>; 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:
> [...]
> > > 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) .
> > >
> > > 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.
>
> OK.
>
> > 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.
>
> Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
> ---
> drivers/clk/shmobile/Makefile | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/drivers/clk/shmobile/Makefile b/drivers/clk/shmobile/Makefile
> index 97c71c885e4f..b339c0b6bb2f 100644
> --- a/drivers/clk/shmobile/Makefile
> +++ b/drivers/clk/shmobile/Makefile
> @@ -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?
Yes. That is correct.
> 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.
^ permalink raw reply [flat|nested] 13+ messages in thread* [cip-dev] [PATCH 0/6] Basic SoC support for r8a7743/r8a7745
2017-07-19 13:59 ` Biju Das
@ 2017-07-19 14:23 ` Ben Hutchings
0 siblings, 0 replies; 13+ messages in thread
From: Ben Hutchings @ 2017-07-19 14:23 UTC (permalink / raw)
To: cip-dev
On Wed, 2017-07-19 at 13:59 +0000, Biju Das wrote:
[...]
> > Then I think I should just make this change:
> >
> > Subject: CIP: Build essential clock driver for Renesas RZ/G1 platforms
[...]
> > Right?
> Yes. That is correct.
I've applied this.
Ben.
--
Ben Hutchings
Software Developer, Codethink Ltd.
^ permalink raw reply [flat|nested] 13+ messages in thread