Skip to content

Commit 86d5b27

Browse files
Fabio EstevamShawn Guo
authored andcommitted
ARM: imx_v6_v7_defconfig: Fix unintentional disablement of PCI
Since commit 75c2f26 ("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 0cd5780 ("arm64: defconfig: Fix unintentional disablement of PCI on i.MX"). Fixes: 75c2f26 ("PCI: imx6: Add i.MX PCIe EP mode support") Reported-by: Mattias Barthel <[email protected]> Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent 3847e71 commit 86d5b27

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/arm/configs/imx_v6_v7_defconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ CONFIG_RFKILL=y
7676
CONFIG_RFKILL_INPUT=y
7777
CONFIG_PCI=y
7878
CONFIG_PCI_MSI=y
79-
CONFIG_PCI_IMX6=y
79+
CONFIG_PCI_IMX6_HOST=y
8080
CONFIG_DEVTMPFS=y
8181
CONFIG_DEVTMPFS_MOUNT=y
8282
# CONFIG_STANDALONE is not set

0 commit comments

Comments
 (0)