Skip to contentSkip to conversation

RZ/G1 and R-Car VSP related changes

PATCH New Fabrizio Castro 2 participants 5 messages Jul 27, 2018 – Aug 24, 2018 Device tree bindings

lore
Share & tools
lore

Fabrizio Castro

author
#0 lore raw

cover RZ/G1 and R-Car VSP related changes

Hello Ben,

this series backports VSP support for r8a7745 and fixes wrong definitions in r8a7743 and r8a7791 related device trees.

There is a dependency with series:
https://lists.cip-project.org/pipermail/cip-dev/2018-July/001423.html

This work is based on top of linux-4.4.y-cip, commit 4d769b2b8749e89dfc7ea179a44f652dcfbedb37 ("PM / OPP: Move error message to debug level").

Thanks,
Fab

Biju Das (1):
ARM: dts: r8a7745: Add VSP support

Fabrizio Castro (2):
ARM: dts: r8a7743: Fix vsp1 properties
ARM: dts: r8a7791: Fix vsp1 properties

 arch/arm/boot/dts/r8a7743.dtsi |  6 +++---
 arch/arm/boot/dts/r8a7745.dtsi | 28 ++++++++++++++++++++++++++++
 arch/arm/boot/dts/r8a7791.dtsi |  6 +++---
 3 files changed, 34 insertions(+), 6 deletions(-)
Signature · 1 line
2.7.4
author
#1 lore raw

PATCH 1/3 ARM: dts: r8a7745: Add VSP support

From: Biju Das <[email protected]>

Add VSP support to SoC DT.

Signed-off-by Biju Das <[email protected]>
Reviewed-by Chris Paterson <[email protected]>
Signed-off-by Simon Horman <[email protected]>
(cherry picked from commit 76a2577d97f0b221245e56a17a70bb10a3a97419)

(dropped resets property. changed clocks and power-domains properties. added vsp device configuration)

Signed-off-by Fabrizio Castro <[email protected]>
Reviewed-by Biju Das <[email protected]>
---
 arch/arm/boot/dts/r8a7745.dtsi | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)
arch/arm/boot/dts/r8a7745.dtsi +28 -0
index 5cafc3060..023d69c 100644
@@ -1071,6 +1071,34 @@
 			status = "disabled";
 		};
 
+		vsp at fe928000 {
+			compatible = "renesas,vsp1";
+			reg = <0 0xfe928000 0 0x8000>;
+			interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A7745_CLK_VSP1_SY>;
+			power-domains = <&cpg_clocks>;
+
+			renesas,has-lut;
+			renesas,has-sru;
+			renesas,#rpf = <5>;
+			renesas,#uds = <1>;
+			renesas,#wpf = <4>;
+		};
+
+		vsp at fe930000 {
+			compatible = "renesas,vsp1";
+			reg = <0 0xfe930000 0 0x8000>;
+			interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&mstp1_clks R8A7745_CLK_VSP1DU0>;
+			power-domains = <&cpg_clocks>;
+
+			renesas,has-lif;
+			renesas,has-lut;
+			renesas,#rpf = <4>;
+			renesas,#uds = <1>;
+			renesas,#wpf = <1>;
+		};
+
 		du: display at feb00000 {
 			compatible = "renesas,du-r8a7745";
 			reg = <0 0xfeb00000 0 0x40000>;
Signature · 1 line
2.7.4
author
#2 lore raw

PATCH 2/3 ARM: dts: r8a7743: Fix vsp1 properties

In reply to Fabrizio Castro

According to the RZ/G Series HW User's Manual (tables 28.1 and 28.3), VSP1S has 1 UDS and VSP1D has 1 WPF, therefore fix the DT properties accordingly and similarly to what done by commit 398e3d4f1e0baecb926315673a6740f2573b07ae ("[media] v4l: vsp1: Fix descriptions of Gen2 VSP instances") upstream.

Signed-off-by Fabrizio Castro <[email protected]>
Reviewed-by Biju Das <[email protected]>
---
 arch/arm/boot/dts/r8a7743.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7743.dtsi +3 -3
index bb507a1..c78de96 100644
@@ -1632,7 +1632,7 @@
 			renesas,has-lut;
 			renesas,has-sru;
 			renesas,#rpf = <5>;
-			renesas,#uds = <3>;
+			renesas,#uds = <1>;
 			renesas,#wpf = <4>;
 		};
 

@@ -1647,7 +1647,7 @@
 			renesas,has-lut;
 			renesas,#rpf = <4>;
 			renesas,#uds = <1>;
-			renesas,#wpf = <4>;
+			renesas,#wpf = <1>;
 		};
 
 		vsp at fe938000 {

@@ -1661,7 +1661,7 @@
 			renesas,has-lut;
 			renesas,#rpf = <4>;
 			renesas,#uds = <1>;
-			renesas,#wpf = <4>;
+			renesas,#wpf = <1>;
 		};
 
 		pci0: pci at ee090000 {
Signature · 1 line
2.7.4
author
#3 lore raw

PATCH 3/3 ARM: dts: r8a7791: Fix vsp1 properties

In reply to Fabrizio Castro

According to the HW manual, VSP1S has 1 UDS and VSP1D has 1 WPF, therefore fix the DT properties accordingly and similarly to what done by commit 398e3d4f1e0baecb926315673a6740f2573b07ae ("[media]
v4l: vsp1: Fix descriptions of Gen2 VSP instances") upstream.

Signed-off-by Fabrizio Castro <[email protected]>
Reviewed-by Biju Das <[email protected]>
---
 arch/arm/boot/dts/r8a7791.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm/boot/dts/r8a7791.dtsi +3 -3
index d2585a4..df9ab4d 100644
@@ -876,7 +876,7 @@
 		renesas,has-lut;
 		renesas,has-sru;
 		renesas,#rpf = <5>;
-		renesas,#uds = <3>;
+		renesas,#uds = <1>;
 		renesas,#wpf = <4>;
 	};
 

@@ -891,7 +891,7 @@
 		renesas,has-lut;
 		renesas,#rpf = <4>;
 		renesas,#uds = <1>;
-		renesas,#wpf = <4>;
+		renesas,#wpf = <1>;
 	};
 
 	vsp1 at fe938000 {

@@ -905,7 +905,7 @@
 		renesas,has-lut;
 		renesas,#rpf = <4>;
 		renesas,#uds = <1>;
-		renesas,#wpf = <4>;
+		renesas,#wpf = <1>;
 	};
 
 	du: display at feb00000 {
Signature · 1 line
2.7.4
Applied
#4 lore raw

cover RZ/G1 and R-Car VSP related changes

In reply to Fabrizio Castro
Quoted 11 lines · Fabrizio Castro

Hello Ben,

this series backports VSP support for r8a7745 and fixes wrong definitions in r8a7743 and r8a7791 related device trees.

There is a dependency with series:
https://lists.cip-project.org/pipermail/cip-dev/2018-July/001423.html

This work is based on top of linux-4.4.y-cip, commit 4d769b2b8749e89dfc7ea179a44f652dcfbedb37 ("PM / OPP: Move error message to debug level").

Applied, thanks.

Ben.

Signature · 3 lines
Ben Hutchings, Software Developer                ?        Codethink Ltd
https://www.codethink.co.uk/                 Dale House, 35 Dale Street
                                     Manchester, M1 2HF, United Kingdom