Merge pull request #6971 from jernejsk/defer

[LE11] Allwinner: H6: set deferred probe timeout to 0
This commit is contained in:
Rudi Heitbaum 2022-10-08 08:02:57 +11:00 committed by GitHub
commit 0af4c55849
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 37 deletions

View File

@ -35,3 +35,6 @@
# set the addon project
ADDON_PROJECT="ARMv8"
# additional kernel parameters
EXTRA_CMDLINE="$EXTRA_CMDLINE deferred_probe_timeout=0"

View File

@ -1,37 +0,0 @@
From 708274855501cfb1cf4ed01d4e68758d94a4c506 Mon Sep 17 00:00:00 2001
From: Jernej Skrabec <jernej.skrabec@gmail.com>
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 <jernej.skrabec@gmail.com>
---
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 = <GIC_SPI 89 IRQ_TYPE_LEVEL_HIGH>;
allwinner,sram = <&ve_sram 1>;
- iommus = <&iommu 3>;
};
gpu: gpu@1800000 {
--
2.37.3