| Message ID | 20170217130228.132428-1-andriy.shevchenko@linux.intel.com |
|---|---|
| State | Accepted |
| Commit | ac9c4912c07e0aba1f8b1c993f2fc8051a34fea2 |
| Delegated to: | Jaehoon Chung |
| Headers | show |
On Fri, Feb 17, 2017 at 9:02 PM, Andy Shevchenko <andriy.shevchenko@linux.intel.com> wrote: > From: Felipe Balbi <felipe.balbi@linux.intel.com> > > We don't want pci_mmc to compile every time x86 compiles, only when > there's a platform that needs it. For that reason, we're adding a new > CONFIG_MMC_PCI which platforms can choose to enable. > > Suggested-by: Jaehoon Chung <jh80.chung@samsung.com> > Signed-off-by: Felipe Balbi <felipe.balbi@linux.intel.com> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> > --- > configs/bayleybay_defconfig | 1 + > configs/conga-qeval20-qa3-e3845-internal-uart_defconfig | 1 + > configs/conga-qeval20-qa3-e3845_defconfig | 1 + > configs/crownbay_defconfig | 1 + > configs/dfi-bt700-q7x-151_defconfig | 1 + > configs/galileo_defconfig | 1 + > configs/minnowmax_defconfig | 1 + > configs/theadorable-x86-dfi-bt700_defconfig | 1 + > drivers/mmc/Kconfig | 8 ++++++++ > drivers/mmc/Makefile | 2 +- > 10 files changed, 17 insertions(+), 1 deletion(-) > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
diff --git a/configs/bayleybay_defconfig b/configs/bayleybay_defconfig index c6aa24f9be..d2f9f24a19 100644 --- a/configs/bayleybay_defconfig +++ b/configs/bayleybay_defconfig @@ -48,6 +48,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig index 890d28ce69..d96bfcbe14 100644 --- a/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig +++ b/configs/conga-qeval20-qa3-e3845-internal-uart_defconfig @@ -50,6 +50,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/conga-qeval20-qa3-e3845_defconfig b/configs/conga-qeval20-qa3-e3845_defconfig index 6e4cd843d9..1642bf2926 100644 --- a/configs/conga-qeval20-qa3-e3845_defconfig +++ b/configs/conga-qeval20-qa3-e3845_defconfig @@ -49,6 +49,7 @@ CONFIG_DM_I2C=y CONFIG_SYS_I2C_INTEL=y CONFIG_WINBOND_W83627=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/crownbay_defconfig b/configs/crownbay_defconfig index 13a00c2a17..4a88f5f3c5 100644 --- a/configs/crownbay_defconfig +++ b/configs/crownbay_defconfig @@ -37,6 +37,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/dfi-bt700-q7x-151_defconfig b/configs/dfi-bt700-q7x-151_defconfig index ce447f540a..d5bd66f83c 100644 --- a/configs/dfi-bt700-q7x-151_defconfig +++ b/configs/dfi-bt700-q7x-151_defconfig @@ -47,6 +47,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/galileo_defconfig b/configs/galileo_defconfig index 570f9ea810..f60abc3422 100644 --- a/configs/galileo_defconfig +++ b/configs/galileo_defconfig @@ -42,6 +42,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/minnowmax_defconfig b/configs/minnowmax_defconfig index 5f61f2a19c..8dac1d72fb 100644 --- a/configs/minnowmax_defconfig +++ b/configs/minnowmax_defconfig @@ -47,6 +47,7 @@ CONFIG_REGMAP=y CONFIG_SYSCON=y CONFIG_CPU=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/configs/theadorable-x86-dfi-bt700_defconfig b/configs/theadorable-x86-dfi-bt700_defconfig index cde33bbfe1..1703cee841 100644 --- a/configs/theadorable-x86-dfi-bt700_defconfig +++ b/configs/theadorable-x86-dfi-bt700_defconfig @@ -47,6 +47,7 @@ CONFIG_CPU=y CONFIG_DM_I2C=y CONFIG_NUVOTON_NCT6102D=y CONFIG_MMC=y +CONFIG_MMC_PCI=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_SDMA=y CONFIG_SPI_FLASH=y diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index 01d1dbfb1b..af8436f337 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -122,6 +122,14 @@ config MMC_MXS If unsure, say N. +config MMC_PCI + bool "Support for MMC controllers on PCI" + help + This selects PCI-based MMC controllers. + If you have an MMC controller on a PCI bus, say Y here. + + If unsure, say N. + config MMC_OMAP_HS bool "TI OMAP High Speed Multimedia Card Interface support" help diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index 8e922db3f1..9fccac8ead 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_MVEBU_MMC) += mvebu_mmc.o obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o obj-$(CONFIG_MMC_MXC) += mxcmmc.o obj-$(CONFIG_MMC_MXS) += mxsmmc.o -obj-$(CONFIG_X86) += pci_mmc.o +obj-$(CONFIG_MMC_PCI) += pci_mmc.o obj-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o obj-$(CONFIG_SUPPORT_EMMC_RPMB) += rpmb.o obj-$(CONFIG_S3C_SDI) += s3c_sdi.o