[PATCH/RFC v2 01/03] ARM: shmobile: External Salvator-X SCIF3/HSCIF3 loop

[PATCH/RFC v2 01/03] ARM: shmobile: External Salvator-X SCIF3/HSCIF3 loop

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Add SCIF3 and HSCIF3 as two new serial ports to the r8a7795
Salvator-X DT file. 

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 Changes since V1:
 - None

 arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts |   28 ++++++++++++++++++++
 1 file changed, 28 insertions(+)

--- 0001/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ work/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts	2015-11-06 14:21:56.640513000 +0900
@@ -41,6 +41,8 @@
 	aliases {
 		serial0 = &scif2;
 		serial1 = &scif1;
+		serial2 = &scif3;
+		serial3 = &hscif3;
 		ethernet0 = &avb;
 	};
 
@@ -135,6 +137,16 @@
 		renesas,groups = "scif2_data_a";
 		renesas,function = "scif2";
 	};
+	
+	scif3_pins: scif3 { /* TX: 1_11, RX: 1_8 */
+		renesas,groups = "scif3_data_b";
+		renesas,function = "scif3";
+	};
+
+	hscif3_pins: hscif3 { /* TX: 2_8, RX: 2_7 */
+		renesas,groups = "hscif3_data_d";
+		renesas,function = "hscif3";
+	};
 
 	i2c2_pins: i2c2 {
 		renesas,groups = "i2c2_a";
@@ -169,6 +181,22 @@
 	pinctrl-names = "default";
 
 	status = "okay";
+};
+
+&scif3 {
+	pinctrl-0 = <&scif3_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
+};
+
+/* SCIF3 TX -> HSCIF3 RX, HSCIF3 TX -> SCIF3 RX */
+
+&hscif3 {
+	pinctrl-0 = <&hscif3_pins>;
+	pinctrl-names = "default";
+
+	status = "okay";
 };
 
 &i2c2 {

[PATCH/RFC v2 02/03] ARM: shmobile: r8a7795: Hack up SYS-DMAC0 support

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

This hooks up SYS-DMAC0 as r8a7795 device node. Note that the
generic compat string is used, this should be replaced by
SoC-specific compat string. Not for upstream merge.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 Changes since V1:
 - The SYS-DMAC error IRQ is updated to match the documentation.

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

--- 0001/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ work/arch/arm64/boot/dts/renesas/r8a7795.dtsi	2016-01-15 17:29:01.860513000 +0900
@@ -350,7 +350,35 @@
 		};
 
 		dmac0: dma-controller@e6700000 {
-			/* Empty node for now */
+			compatible = "renesas,rcar-dmac";
+			reg = <0 0xe6700000 0 0x10000>;
+			interrupts =	<0 199 IRQ_TYPE_LEVEL_HIGH
+					 0 200 IRQ_TYPE_LEVEL_HIGH
+					 0 201 IRQ_TYPE_LEVEL_HIGH
+					 0 202 IRQ_TYPE_LEVEL_HIGH
+					 0 203 IRQ_TYPE_LEVEL_HIGH
+					 0 204 IRQ_TYPE_LEVEL_HIGH
+					 0 205 IRQ_TYPE_LEVEL_HIGH
+					 0 206 IRQ_TYPE_LEVEL_HIGH
+					 0 207 IRQ_TYPE_LEVEL_HIGH
+					 0 208 IRQ_TYPE_LEVEL_HIGH
+					 0 209 IRQ_TYPE_LEVEL_HIGH
+					 0 210 IRQ_TYPE_LEVEL_HIGH
+					 0 211 IRQ_TYPE_LEVEL_HIGH
+					 0 212 IRQ_TYPE_LEVEL_HIGH
+					 0 213 IRQ_TYPE_LEVEL_HIGH
+					 0 214 IRQ_TYPE_LEVEL_HIGH
+					 0 215 IRQ_TYPE_LEVEL_HIGH>;
+			interrupt-names = "error",
+					"ch0", "ch1", "ch2", "ch3",
+					"ch4", "ch5", "ch6", "ch7",
+					"ch8", "ch9", "ch10", "ch11",
+					"ch12", "ch13", "ch14", "ch15";
+			clocks = <&cpg CPG_MOD 219>;
+			clock-names = "fck";
+			power-domains = <&cpg>;
+			#dma-cells = <1>;
+			dma-channels = <16>;
 		};
 
 		dmac1: dma-controller@e7300000 {

[PATCH/RFC v2 03/03] ARM: shmobile: r8a7795: Tie in IPMMU with SYS-DMAC0

[Magnus Damm]

From: Magnus Damm <damm+renesas@opensource.se>

Hook up IPMMU-MM and IPMMU-DS0 to the r8a7795 DTS and
make sure the SYS-DMAC0 is connected to IPMMU-DS0.

The DT binding for the IPMMU will change.

Not for upstream merge.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 Changes since V1:
 - None

 arch/arm64/boot/dts/renesas/r8a7795.dtsi |   24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

--- 0023/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ work/arch/arm64/boot/dts/renesas/r8a7795.dtsi	2015-12-15 15:13:00.300513000 +0900
@@ -312,6 +312,22 @@
 			reg = <0 0xe6060000 0 0x50c>;
 		};
 
+		ipmmu_mm: mmu@e67b0000 {
+			compatible = "renesas,ipmmu-r8a7795";
+			reg = <0 0xe67b0000 0 0x1000>; /* IPMMU-MM */
+			interrupts = <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,
+				     <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;
+			#iommu-cells = <1>;
+			status = "okay";
+		};
+
+		ipmmu_ds0: mmu@e6740000 {
+			compatible = "renesas,ipmmu-r8a7795";
+			reg = <0 0xe6740000 0 0x1000>; /* IPMMU-DS0 */
+			#iommu-cells = <1>;
+			status = "okay";
+		};
+
 		dmac0: dma-controller@e6700000 {
 			compatible = "renesas,rcar-dmac";
 			reg = <0 0xe6700000 0 0x10000>;
@@ -342,6 +358,14 @@
 			power-domains = <&cpg>;
 			#dma-cells = <1>;
 			dma-channels = <16>;
+			iommus = <&ipmmu_ds0 0>, <&ipmmu_ds0 1>,
+			       <&ipmmu_ds0 2>, <&ipmmu_ds0 3>,
+			       <&ipmmu_ds0 4>, <&ipmmu_ds0 5>,
+			       <&ipmmu_ds0 6>, <&ipmmu_ds0 7>,
+			       <&ipmmu_ds0 8>, <&ipmmu_ds0 9>,
+			       <&ipmmu_ds0 10>, <&ipmmu_ds0 11>,
+			       <&ipmmu_ds0 12>, <&ipmmu_ds0 13>,
+			       <&ipmmu_ds0 14>, <&ipmmu_ds0 15>;
 		};
 
 		dmac1: dma-controller@e7300000 {