diff --git a/projects/Allwinner/devices/H6/options b/projects/Allwinner/devices/H6/options index d4c8c18c79..e88c52b12e 100644 --- a/projects/Allwinner/devices/H6/options +++ b/projects/Allwinner/devices/H6/options @@ -35,3 +35,6 @@ # set the addon project ADDON_PROJECT="ARMv8" + + # additional kernel parameters + EXTRA_CMDLINE="$EXTRA_CMDLINE deferred_probe_timeout=0" diff --git a/projects/Allwinner/patches/linux/0066-temporary-disable-iommu-on-H6.patch b/projects/Allwinner/patches/linux/0066-temporary-disable-iommu-on-H6.patch deleted file mode 100644 index 8096bf6b2a..0000000000 --- a/projects/Allwinner/patches/linux/0066-temporary-disable-iommu-on-H6.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 708274855501cfb1cf4ed01d4e68758d94a4c506 Mon Sep 17 00:00:00 2001 -From: Jernej Skrabec -Date: Wed, 28 Sep 2022 22:23:34 +0200 -Subject: [PATCH] HACK: temporary disable iommu on H6 - -Since driver is not enabled, peripherals with iommu phandle are probed -very late. Workaround that by removing iommu phandles until driver is -enabled. - -Signed-off-by: Jernej Skrabec ---- - arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -index fbe94abbb1f9..4a8abc3ace16 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi -@@ -136,7 +136,6 @@ mixer0: mixer@100000 { - clock-names = "bus", - "mod"; - resets = <&display_clocks RST_MIXER0>; -- iommus = <&iommu 0>; - - ports { - #address-cells = <1>; -@@ -171,7 +170,6 @@ video-codec@1c0e000 { - resets = <&ccu RST_BUS_VE>; - interrupts = ; - allwinner,sram = <&ve_sram 1>; -- iommus = <&iommu 3>; - }; - - gpu: gpu@1800000 { --- -2.37.3 -