summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Eichenberger <stefan.eichenberger@toradex.com>2023-04-28 11:34:02 +0200
committerStefan Eichenberger <eichest@gmail.com>2023-04-28 12:06:29 +0200
commit30d00919db11c8ebdbb7cc199149729914b61b27 (patch)
treea44a7c5e08931a15d4c1223e048ea85424f9ea20
parent0887d33abe7ee5b3ddb92ef5e4eb3d71ac0ff469 (diff)
toradex_imx_v8.config: compile the i.MX SATA driver as module
There are situations when PCIe probes after SATA so that Wifi does not come up. By compiling the SATA driver as a module we workaround this issue. Upstream-Status: Inappropriate [Configuration] Signed-off-by: Stefan Eichenberger <stefan.eichenberger@toradex.com>
-rw-r--r--arch/arm64/configs/toradex_defconfig2
-rw-r--r--arch/arm64/configs/toradex_imx_v8.config5
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm64/configs/toradex_defconfig b/arch/arm64/configs/toradex_defconfig
index 171192d01846..10395b5a3435 100644
--- a/arch/arm64/configs/toradex_defconfig
+++ b/arch/arm64/configs/toradex_defconfig
@@ -227,7 +227,7 @@ CONFIG_SCSI_UFSHCD_PLATFORM=y
CONFIG_ATA=y
CONFIG_SATA_AHCI=y
CONFIG_SATA_AHCI_PLATFORM=y
-CONFIG_AHCI_IMX=y
+CONFIG_AHCI_IMX=m
CONFIG_AHCI_CEVA=y
CONFIG_AHCI_XGENE=y
CONFIG_AHCI_QORIQ=y
diff --git a/arch/arm64/configs/toradex_imx_v8.config b/arch/arm64/configs/toradex_imx_v8.config
index 938fab001ffe..96c068a38ce4 100644
--- a/arch/arm64/configs/toradex_imx_v8.config
+++ b/arch/arm64/configs/toradex_imx_v8.config
@@ -297,3 +297,8 @@ CONFIG_WLAN_VENDOR_ZYDAS=n
# Disable DSP drivers
CONFIG_IMX_DSP_REMOTEPROC=n
CONFIG_DMABUF_HEAPS_DSP=n
+
+# Compile the i.MX SATA driver as module to probe after PCIe. With this we can
+# workaround an issue with Wifi which does not come up in some situations when
+# SATA probes before PCIe.
+CONFIG_AHCI_IMX=m