rk3588: edge: Update RGA patch

Remove vpu nodes from RGA patch since these are already included in the H.264 support patch.
armbian · Jun 13, 2024 · 9fb85f2 · 9fb85f2
1 parent 1bb2fc5
commit 9fb85f2
Showing 1 changed file with 3 additions and 24 deletions.
diff --git a/...chip-rk3588-add-VDPU-and-RGA2-nodes.patch → ...4-dts-rockchip-rk3588-add-RGA2-node.patch b/...chip-rk3588-add-VDPU-and-RGA2-nodes.patch → ...4-dts-rockchip-rk3588-add-RGA2-node.patch
@@ -4,38 +4,17 @@ Date: Mon, 13 May 2024 20:29:49 +0300
 Subject: arm64: dts: rockchip: rk3588: add VDPU and RGA2 nodes
 
 ---
- arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 32 ++++++++++
- 1 file changed, 32 insertions(+)
+ arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 11 ++++++++++
+ 1 file changed, 11 insertions(+)
 
 diff --git a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
 index 111111111111..222222222222 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3588s.dtsi
-@@ -726,6 +726,38 @@ mmu600_php: iommu@fcb00000 {
+@@ -726,6 +726,17 @@ mmu600_php: iommu@fcb00000 {
  		status = "disabled";
  	};
 
-+	vpu: video-codec@fdb50000 {
-+		compatible = "rockchip,rk3568-vpu";
-+		reg = <0x0 0xfdb50000 0x0 0x800>;
-+		interrupts = <GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH 0>;
-+		interrupt-names = "vdpu";
-+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-+		clock-names = "aclk", "hclk";
-+		iommus = <&vdpu_mmu>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+	};
-+
-+	vdpu_mmu: iommu@fdb50800 {
-+		compatible = "rockchip,rk3568-iommu";
-+		reg = <0x0 0xfdb50800 0x0 0x40>;
-+		interrupts = <GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH 0>;
-+		clock-names = "aclk", "iface";
-+		clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
-+		power-domains = <&power RK3588_PD_VDPU>;
-+		#iommu-cells = <0>;
-+	};
-+
 +	rga: rga@fdb80000 {
 +		compatible = "rockchip,rk3568-rga", "rockchip,rk3288-rga";
 +		reg = <0x0 0xfdb80000 0x0 0x1000>;