summaryrefslogtreecommitdiffstats
path: root/arch/arm/configs/imx_v6_v7_defconfig
diff options
context:
space:
mode:
authorFabio Estevam <festevam@denx.de>2023-04-04 14:13:03 +0200
committerShawn Guo <shawnguo@kernel.org>2023-04-06 03:49:34 +0200
commit86d5b27b379256cd5d48974b4cd7ad03091eea6b (patch)
tree5ee9466c574c0eebb201f2bb9a0ac96f40c8e318 /arch/arm/configs/imx_v6_v7_defconfig
parentARM: dts: imx6ull-colibri: Remove unnecessary #address-cells/#size-cells (diff)
downloadlinux-86d5b27b379256cd5d48974b4cd7ad03091eea6b.tar.xz
linux-86d5b27b379256cd5d48974b4cd7ad03091eea6b.zip
ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI
Since commit 75c2f26da03f ("PCI: imx6: Add i.MX PCIe EP mode support") the i.MX6 PCI driver is no longer selected by default. The existing PCI_IMX6 was made a hidden option, selected by new options PCI_IMX6_HOST (for the existing support) and PCI_IMX6_EP (for the endpoint mode), but there has been no corresponding update to imx_v6_v7_defconfig so the PCI_IMX6 ends up getting disabled. Switch imx_v6_v7_defconfig to PCI_IMX6_HOST to preserve the existing functionality. This is based on the same fix done in commit 0cd5780eb625 ("arm64: defconfig: Fix unintentional disablement of PCI on i.MX"). Fixes: 75c2f26da03f ("PCI: imx6: Add i.MX PCIe EP mode support") Reported-by: Mattias Barthel <mattiasbarthel@gmail.com> Signed-off-by: Fabio Estevam <festevam@denx.de> Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch/arm/configs/imx_v6_v7_defconfig')
-rw-r--r--arch/arm/configs/imx_v6_v7_defconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 6dc6fed12af8..8d002c6e6cb3 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y
CONFIG_RFKILL_INPUT=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
-CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set