From df48e6d5674b0925b0d471e0d387af2b0a133202 Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Mon, 28 Nov 2022 07:21:33 +0000 Subject: [PATCH] linux (Allwinner): drop upstreamed patches in 6.1-rc7 --- ...inner-h6-Add-Hantro-G2-IOMMU-phandle.patch | 24 ------------------- 1 file changed, 24 deletions(-) delete mode 100644 projects/Allwinner/patches/linux/0067-arm64-dts-allwinner-h6-Add-Hantro-G2-IOMMU-phandle.patch diff --git a/projects/Allwinner/patches/linux/0067-arm64-dts-allwinner-h6-Add-Hantro-G2-IOMMU-phandle.patch b/projects/Allwinner/patches/linux/0067-arm64-dts-allwinner-h6-Add-Hantro-G2-IOMMU-phandle.patch deleted file mode 100644 index 0486641fcd..0000000000 --- a/projects/Allwinner/patches/linux/0067-arm64-dts-allwinner-h6-Add-Hantro-G2-IOMMU-phandle.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Wed, 12 Oct 2022 22:59:29 +0200 -Subject: [PATCH] arm64: dts: allwinner: h6: Add Hantro G2 IOMMU phandle - -Hantro G2 is connected to IOMMU. Add a phandle to it. - -Signed-off-by: Jernej Skrabec ---- - arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index 436cc2a02d1a..d189ce4ebe37 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -161,6 +161,7 @@ video-codec-g2@1c00000 { - clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>; - clock-names = "bus", "mod"; - resets = <&ccu RST_BUS_VP9>; -+ iommus = <&iommu 5>; - }; - - video-codec@1c0e000 {