Skip to contentSkip to conversation

arm64: dts: renesas: r8a77995: Add VSP support

PATCH Applied Kieran Bingham 4 participants 16 messages Feb 14, 2018 – Feb 16, 2018

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover arm64: dts: renesas: r8a77995: Add VSP support

From: Kieran Bingham <[email protected]>

The r8a77995-d3 platform supports 3 VSP instances. One VSPBS can be used as a dual-input image blender, while two VSPD instances can be utilised as part of a display (DU) pipeline.

Add support for these, along with their required FCPV nodes.

During review, Laurent noticed that the r8a7795 and r8a7796 were not mapping enough register space to handle RPFs with CLUT modules.

The last three patches fix this issue.

v2:
- Merge FCPV nodes to a single patch
- Merge VSP nodes to a single patch
- Fix VSP register map size
- Add fixes for r8a7795 and r8a7796

v3:
- Fix VSBB register map size
- Add r8a7795-es1 vspd3

Kieran Bingham (5):
arm64: dts: renesas: r8a77995: add FCPV nodes
arm64: dts: renesas: r8a77995: add VSP instances
arm64: dts: renesas: r8a7795-es1: Fix register mappings on VSPs
arm64: dts: renesas: r8a7795: Fix register mappings on VSPs
arm64: dts: renesas: r8a7796: Fix register mappings on VSPs

 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |  2 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi     |  6 +--
 arch/arm64/boot/dts/renesas/r8a7796.dtsi     |  6 +--
 arch/arm64/boot/dts/renesas/r8a77995.dtsi    | 57 ++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 7 deletions(-)
Signature · 1 line
2.7.4
#1 lore raw

PATCH v3 1/5 arm64: dts: renesas: r8a77995: add FCPV nodes

From: Kieran Bingham <[email protected]>

The FCPVB handles the interface between the VSPB and memory, while the FCPVD handles the interface between the VSPD and memory.

---
 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +27 -0
index cd3c6a30fc47..196a917afea6 100644
@@ -691,6 +691,33 @@
 			#phy-cells = <0>;
 			status = "disabled";
 		};
+
+		fcpvb0: fcp at fe96f000 {
+			compatible = "renesas,fcpv";
+			reg = <0 0xfe96f000 0 0x200>;
+			clocks = <&cpg CPG_MOD 607>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 607>;
+			iommus = <&ipmmu_vp0 5>;
+		};
+
+		fcpvd0: fcp at fea27000 {
+			compatible = "renesas,fcpv";
+			reg = <0 0xfea27000 0 0x200>;
+			clocks = <&cpg CPG_MOD 603>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 603>;
+			iommus = <&ipmmu_vi0 8>;
+		};
+
+		fcpvd1: fcp at fea2f000 {
+			compatible = "renesas,fcpv";
+			reg = <0 0xfea2f000 0 0x200>;
+			clocks = <&cpg CPG_MOD 602>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 602>;
+			iommus = <&ipmmu_vi0 9>;
+		};
 	};
 
 	timer {
Signature · 1 line
2.7.4
#3 lore raw

PATCH v3 2/5 arm64: dts: renesas: r8a77995: add VSP instances

In reply to Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995 has a VSPBS to support image processing such as blending of two input images, and has two VSPDs to handle display pipelines with a DU.

---
v2:
- Fix VSPD register map size
- Squash VSPBS and VSPD patches together

v3:
- Fix VSPBS register map size too :-)

 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +30 -0
index 196a917afea6..0db242114bc5 100644
@@ -692,6 +692,16 @@
 			status = "disabled";
 		};
 
+		vspbs: vsp at fe960000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfe960000 0 0x8000>;
+			interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 627>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 627>;
+			renesas,fcp = <&fcpvb0>;
+		};
+
 		fcpvb0: fcp at fe96f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfe96f000 0 0x200>;
@@ -701,6 +711,16 @@
 			iommus = <&ipmmu_vp0 5>;
 		};
 
+		vspd0: vsp at fea20000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea20000 0 0x8000>;
+			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 623>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 623>;
+			renesas,fcp = <&fcpvd0>;
+		};
+
 		fcpvd0: fcp at fea27000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea27000 0 0x200>;
@@ -710,6 +730,16 @@
 			iommus = <&ipmmu_vi0 8>;
 		};
 
+		vspd1: vsp at fea80000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea28000 0 0x8000>;
+			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 622>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 622>;
+			renesas,fcp = <&fcpvd1>;
+		};
+
 		fcpvd1: fcp at fea2f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea2f000 0 0x200>;
Signature · 1 line
2.7.4
#4 lore raw

Re: [PATCH v3 2/5] arm64: dts: renesas: r8a77995: add VSP instances

Quoted 59 lines · Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995 has a VSPBS to support image processing such as blending of two input images, and has two VSPDs to handle display pipelines with a DU.

---
v2:
- Fix VSPD register map size
- Squash VSPBS and VSPD patches together

v3:
- Fix VSPBS register map size too :-)

 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +20 -0
index 196a917afea6..0db242114bc5 100644
@@ -692,6 +692,16 @@
 			status = "disabled";
 		};
 
+		vspbs: vsp at fe960000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfe960000 0 0x8000>;
+			interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 627>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 627>;
+			renesas,fcp = <&fcpvb0>;
+		};
+
 		fcpvb0: fcp at fe96f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfe96f000 0 0x200>;
@@ -701,6 +711,16 @@
 			iommus = <&ipmmu_vp0 5>;
 		};
 
+		vspd0: vsp at fea20000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea20000 0 0x8000>;
+			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 623>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 623>;
+			renesas,fcp = <&fcpvd0>;
+		};
+
 		fcpvd0: fcp at fea27000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea27000 0 0x200>;

arch/arm64/boot/dts/renesas/r8a77995.dtsi line 733

Quoted 4 lines
arch/arm64/boot/dts/renesas/r8a77995.dtsi +1 -0
@@ -710,6 +730,16 @@
 			iommus = <&ipmmu_vi0 8>;
 		};
 
+		vspd1: vsp at fea80000 {

The above should be:

		vspd1: vsp at fea28000 {
Quoted 15 lines
arch/arm64/boot/dts/renesas/r8a77995.dtsi +9 -0
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea28000 0 0x8000>;
+			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 622>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 622>;
+			renesas,fcp = <&fcpvd1>;
+		};
+
 		fcpvd1: fcp at fea2f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea2f000 0 0x200>;
Signature · 1 line
2.7.4
#5 lore raw

Re: [PATCH v3 2/5] arm64: dts: renesas: r8a77995: add VSP instances

Hi Simon,

Quoted 63 lines · Simon Horman
Quoted 62 lines · Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995 has a VSPBS to support image processing such as blending of two input images, and has two VSPDs to handle display pipelines with a DU.

---
v2:
- Fix VSPD register map size
- Squash VSPBS and VSPD patches together

v3:
- Fix VSPBS register map size too :-)

 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +20 -0
index 196a917afea6..0db242114bc5 100644
@@ -692,6 +692,16 @@
 			status = "disabled";
 		};
 
+		vspbs: vsp at fe960000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfe960000 0 0x8000>;
+			interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 627>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 627>;
+			renesas,fcp = <&fcpvb0>;
+		};
+
 		fcpvb0: fcp at fe96f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfe96f000 0 0x200>;
@@ -701,6 +711,16 @@
 			iommus = <&ipmmu_vp0 5>;
 		};
 
+		vspd0: vsp at fea20000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea20000 0 0x8000>;
+			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 623>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 623>;
+			renesas,fcp = <&fcpvd0>;
+		};
+
 		fcpvd0: fcp at fea27000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea27000 0 0x200>;
@@ -710,6 +730,16 @@
 			iommus = <&ipmmu_vi0 8>;
 		};
 
Quoted 5 lines

arch/arm64/boot/dts/renesas/r8a77995.dtsi line 733

Quoted 1 line
arch/arm64/boot/dts/renesas/r8a77995.dtsi +1 -0
+		vspd1: vsp at fea80000 {

The above should be:

		vspd1: vsp at fea28000 {

Good spot.

</me looks to datasheet> That is correct.

Would you like me to resubmit this patch ? Or will you fix this up locally?

--
Regards

Kieran

Quoted 16 lines
Quoted 16 lines
arch/arm64/boot/dts/renesas/r8a77995.dtsi +9 -0
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea28000 0 0x8000>;
+			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 622>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 622>;
+			renesas,fcp = <&fcpvd1>;
+		};
+
 		fcpvd1: fcp at fea2f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea2f000 0 0x200>;
Signature · 1 line
2.7.4
Reviewed-by Laurent Pinchart
#6 lore raw

Re: [PATCH v3 2/5] arm64: dts: renesas: r8a77995: add VSP instances

Quoted 70 lines · Kieran Bingham

Hi Simon,

Quoted 67 lines · Simon Horman
Quoted 59 lines · Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995 has a VSPBS to support image processing such as blending of two input images, and has two VSPDs to handle display pipelines with a DU.

---
v2:
- Fix VSPD register map size
- Squash VSPBS and VSPD patches together

v3:
- Fix VSPBS register map size too :-)

 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +20 -0
index 196a917afea6..0db242114bc5 100644
@@ -692,6 +692,16 @@
 			status = "disabled";
 		};
 
+		vspbs: vsp at fe960000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfe960000 0 0x8000>;
+			interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 627>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 627>;
+			renesas,fcp = <&fcpvb0>;
+		};
+
 		fcpvb0: fcp at fe96f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfe96f000 0 0x200>;
@@ -701,6 +711,16 @@
 			iommus = <&ipmmu_vp0 5>;
 		};
 
+		vspd0: vsp at fea20000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea20000 0 0x8000>;
+			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 623>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 623>;
+			renesas,fcp = <&fcpvd0>;
+		};
+
 		fcpvd0: fcp at fea27000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea27000 0 0x200>;

arch/arm64/boot/dts/renesas/r8a77995.dtsi line 733

Quoted 4 lines
arch/arm64/boot/dts/renesas/r8a77995.dtsi +1 -0
@@ -710,6 +730,16 @@
 			iommus = <&ipmmu_vi0 8>;
 		};
 
+		vspd1: vsp at fea80000 {

The above should be:

Quoted 7 lines
Quoted 1 line
		vspd1: vsp at fea28000 {

Good spot.

</me looks to datasheet> That is correct.

Would you like me to resubmit this patch ? Or will you fix this up locally?

Thanks for confirming.

I noticed this using make dtbs W=1

I have fixed this up locally and applied your patch. The result is:

From: Kieran Bingham <[email protected]>
Subject: [PATCH] arm64: dts: renesas: r8a77995: add VSP instances

The r8a77995 has a VSPBS to support image processing such as blending of two input images, and has two VSPDs to handle display pipelines with a DU.

[simon: updated base address of vsp node to fea28000]
---
 arch/arm64/boot/dts/renesas/r8a77995.dtsi | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
arch/arm64/boot/dts/renesas/r8a77995.dtsi +30 -0
index 196a917afea6..0db242114bc5 100644
@@ -692,6 +692,16 @@
 			status = "disabled";
 		};
 
+		vspbs: vsp at fe960000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfe960000 0 0x8000>;
+			interrupts = <GIC_SPI 465 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 627>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 627>;
+			renesas,fcp = <&fcpvb0>;
+		};
+
 		fcpvb0: fcp at fe96f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfe96f000 0 0x200>;
@@ -701,6 +711,16 @@
 			iommus = <&ipmmu_vp0 5>;
 		};
 
+		vspd0: vsp at fea20000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea20000 0 0x8000>;
+			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 623>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 623>;
+			renesas,fcp = <&fcpvd0>;
+		};
+
 		fcpvd0: fcp at fea27000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea27000 0 0x200>;
@@ -710,6 +730,16 @@
 			iommus = <&ipmmu_vi0 8>;
 		};
 
+		vspd1: vsp at fea80000 {
+			compatible = "renesas,vsp2";
+			reg = <0 0xfea28000 0 0x8000>;
+			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&cpg CPG_MOD 622>;
+			power-domains = <&sysc R8A77995_PD_ALWAYS_ON>;
+			resets = <&cpg 622>;
+			renesas,fcp = <&fcpvd1>;
+		};
+
 		fcpvd1: fcp at fea2f000 {
 			compatible = "renesas,fcpv";
 			reg = <0 0xfea2f000 0 0x200>;
Signature · 1 line
2.11.0
#7 lore raw

PATCH v3 3/5 arm64: dts: renesas: r8a7795-es1: Fix register mappings on VSPs

In reply to Kieran Bingham

From: Kieran Bingham <[email protected]>

The VSPD includes a CLUT on RPF2. Ensure that the register space is mapped correctly to support this.

---
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +1 -1
index ed553338b4d4..1adfe6cad268 100644
@@ -80,7 +80,7 @@
 
 	vspd3: vsp at fea38000 {
 		compatible = "renesas,vsp2";
-		reg = <0 0xfea38000 0 0x4000>;
+		reg = <0 0xfea38000 0 0x8000>;
 		interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cpg CPG_MOD 620>;
 		power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
Signature · 1 line
2.7.4
Reviewed-by on v3 3/5
#8 lore raw

Re: [PATCH v3 3/5] arm64: dts: renesas: r8a7795-es1: Fix register mappings on VSPs

Hi Kieran,

Thank you for the patch.

Quoted 6 lines · On Wednesday, 14 February 2018 11:55:06 EET Kieran Bingham wrote:

From: Kieran Bingham <[email protected]>

The VSPD includes a CLUT on RPF2. Ensure that the register space is mapped correctly to support this.

Quoted 18 lines
---
 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

b/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi index ed553338b4d4..1adfe6cad268 100644

arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi +1 -1
@@ -80,7 +80,7 @@
 
 	vspd3: vsp@fea38000 {
 		compatible = "renesas,vsp2";
-		reg = <0 0xfea38000 0 0x4000>;
+		reg = <0 0xfea38000 0 0x8000>;
 		interrupts = <GIC_SPI 469 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&cpg CPG_MOD 620>;
 		power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
Signature · 3 lines
Regards,

Laurent Pinchart
Applied
#9 lore raw

Re: [PATCH v3 3/5] arm64: dts: renesas: r8a7795-es1: Fix register mappings on VSPs

Quoted 5 lines · Laurent Pinchart

Hi Kieran,

Thank you for the patch.

On Wednesday, 14 February 2018 11:55:06 EET Kieran Bingham wrote:

Quoted 8 lines
Quoted 6 lines

From: Kieran Bingham <[email protected]>

The VSPD includes a CLUT on RPF2. Ensure that the register space is mapped correctly to support this.

Thanks, applied.

#10 lore raw

PATCH v3 4/5 arm64: dts: renesas: r8a7795: Fix register mappings on VSPs

In reply to Kieran Bingham

From: Kieran Bingham <[email protected]>

The VSPD includes a CLUT on RPF2. Ensure that the register space is mapped correctly to support this.

---
 arch/arm64/boot/dts/renesas/r8a7795.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/renesas/r8a7795.dtsi +3 -3
index 1f32340af2d1..772991db8820 100644
@@ -2607,7 +2607,7 @@
 
 		vspd0: vsp at fea20000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea20000 0 0x4000>;
+			reg = <0 0xfea20000 0 0x8000>;
 			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 623>;
 			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2627,7 +2627,7 @@
 
 		vspd1: vsp at fea28000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea28000 0 0x4000>;
+			reg = <0 0xfea28000 0 0x8000>;
 			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 622>;
 			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
@@ -2647,7 +2647,7 @@
 
 		vspd2: vsp at fea30000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea30000 0 0x4000>;
+			reg = <0 0xfea30000 0 0x8000>;
 			interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 621>;
 			power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
Signature · 1 line
2.7.4
#12 lore raw

PATCH v3 5/5 arm64: dts: renesas: r8a7796: Fix register mappings on VSPs

In reply to Kieran Bingham

From: Kieran Bingham <[email protected]>

The VSPD includes a CLUT on RPF2. Ensure that the register space is mapped correctly to support this.

---
 arch/arm64/boot/dts/renesas/r8a7796.dtsi | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/renesas/r8a7796.dtsi +3 -3
index 60755117cba5..3fe5566e0630 100644
@@ -2285,7 +2285,7 @@
 
 		vspd0: vsp at fea20000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea20000 0 0x4000>;
+			reg = <0 0xfea20000 0 0x8000>;
 			interrupts = <GIC_SPI 466 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 623>;
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -2305,7 +2305,7 @@
 
 		vspd1: vsp at fea28000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea28000 0 0x4000>;
+			reg = <0 0xfea28000 0 0x8000>;
 			interrupts = <GIC_SPI 467 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 622>;
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
@@ -2325,7 +2325,7 @@
 
 		vspd2: vsp at fea30000 {
 			compatible = "renesas,vsp2";
-			reg = <0 0xfea30000 0 0x4000>;
+			reg = <0 0xfea30000 0 0x8000>;
 			interrupts = <GIC_SPI 468 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&cpg CPG_MOD 621>;
 			power-domains = <&sysc R8A7796_PD_ALWAYS_ON>;
Signature · 1 line
2.7.4
#14 lore raw
In reply to Kieran Bingham

Hi Simon,

Quoted 19 lines · Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995-d3 platform supports 3 VSP instances. One VSPBS can be used as a dual-input image blender, while two VSPD instances can be utilised as part of a display (DU) pipeline.

Add support for these, along with their required FCPV nodes.

During review, Laurent noticed that the r8a7795 and r8a7796 were not mapping enough register space to handle RPFs with CLUT modules.

The last three patches fix this issue.

v2:
- Merge FCPV nodes to a single patch
- Merge VSP nodes to a single patch
- Fix VSP register map size
- Add fixes for r8a7795 and r8a7796

Quoted 3 lines

v3:
- Fix VSBB register map size
- Add r8a7795-es1 vspd3

*This* is the correct version of this series.

/me ducks....

--
Regards

Kieran

Quoted 14 lines

Kieran Bingham (5):
arm64: dts: renesas: r8a77995: add FCPV nodes
arm64: dts: renesas: r8a77995: add VSP instances
arm64: dts: renesas: r8a7795-es1: Fix register mappings on VSPs
arm64: dts: renesas: r8a7795: Fix register mappings on VSPs
arm64: dts: renesas: r8a7796: Fix register mappings on VSPs

 arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi |  2 +-
 arch/arm64/boot/dts/renesas/r8a7795.dtsi     |  6 +--
 arch/arm64/boot/dts/renesas/r8a7796.dtsi     |  6 +--
 arch/arm64/boot/dts/renesas/r8a77995.dtsi    | 57 ++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 7 deletions(-)
#15 lore raw
Quoted 22 lines · Kieran Bingham

Hi Simon,

Quoted 19 lines · Kieran Bingham

From: Kieran Bingham <[email protected]>

The r8a77995-d3 platform supports 3 VSP instances. One VSPBS can be used as a dual-input image blender, while two VSPD instances can be utilised as part of a display (DU) pipeline.

Add support for these, along with their required FCPV nodes.

During review, Laurent noticed that the r8a7795 and r8a7796 were not mapping enough register space to handle RPFs with CLUT modules.

The last three patches fix this issue.

v2:
- Merge FCPV nodes to a single patch
- Merge VSP nodes to a single patch
- Fix VSP register map size
- Add fixes for r8a7795 and r8a7796

Quoted 5 lines
Quoted 3 lines

v3:
- Fix VSBB register map size
- Add r8a7795-es1 vspd3

*This* is the correct version of this series.

Sorry about that. I've dropped the patch I had locally queued up from an earlier series.