03cd8f7ebe
This patch solves nasty problem original driver has. Original goal of the ricoh_mmc was to disable this device because then, mmc cards can be read using standard SDHCI controller, thus avoiding writing of yet another driver. However, the act of disablement, makes other pci functions that belong to this controller (xD and memstick) shift up one level, thus pci core has now wrong idea about these devices. To fix this issue, this patch moves the driver into the pci quirk section, thus it is executes before the pci is enumerated, and therefore solving that issue, also same sequence of commands is performed on resume for same reasons. Also regardless of the above, this way is cleaner. You still need to set CONFIG_MMC_RICOH_MMC to enable this quirk Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com> Acked-by: Philip Langdale <philipl@overt.org> Acked-by: Wolfram Sang <w.sang@pengutronix.de> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
46 lines
1.4 KiB
Makefile
46 lines
1.4 KiB
Makefile
#
|
|
# Makefile for MMC/SD host controller drivers
|
|
#
|
|
|
|
ifeq ($(CONFIG_MMC_DEBUG),y)
|
|
EXTRA_CFLAGS += -DDEBUG
|
|
endif
|
|
|
|
obj-$(CONFIG_MMC_ARMMMCI) += mmci.o
|
|
obj-$(CONFIG_MMC_PXA) += pxamci.o
|
|
obj-$(CONFIG_MMC_IMX) += imxmmc.o
|
|
obj-$(CONFIG_MMC_MXC) += mxcmmc.o
|
|
obj-$(CONFIG_MMC_SDHCI) += sdhci.o
|
|
obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o
|
|
obj-$(CONFIG_MMC_SDHCI_PLTFM) += sdhci-pltfm.o
|
|
obj-$(CONFIG_MMC_SDHCI_S3C) += sdhci-s3c.o
|
|
obj-$(CONFIG_MMC_WBSD) += wbsd.o
|
|
obj-$(CONFIG_MMC_AU1X) += au1xmmc.o
|
|
obj-$(CONFIG_MMC_OMAP) += omap.o
|
|
obj-$(CONFIG_MMC_OMAP_HS) += omap_hsmmc.o
|
|
obj-$(CONFIG_MMC_AT91) += at91_mci.o
|
|
obj-$(CONFIG_MMC_ATMELMCI) += atmel-mci.o
|
|
obj-$(CONFIG_MMC_TIFM_SD) += tifm_sd.o
|
|
obj-$(CONFIG_MMC_MSM7X00A) += msm_sdcc.o
|
|
obj-$(CONFIG_MMC_MVSDIO) += mvsdio.o
|
|
obj-$(CONFIG_MMC_DAVINCI) += davinci_mmc.o
|
|
obj-$(CONFIG_MMC_SPI) += mmc_spi.o
|
|
ifeq ($(CONFIG_OF),y)
|
|
obj-$(CONFIG_MMC_SPI) += of_mmc_spi.o
|
|
endif
|
|
obj-$(CONFIG_MMC_S3C) += s3cmci.o
|
|
obj-$(CONFIG_MMC_SDRICOH_CS) += sdricoh_cs.o
|
|
obj-$(CONFIG_MMC_TMIO) += tmio_mmc.o
|
|
obj-$(CONFIG_MMC_CB710) += cb710-mmc.o
|
|
obj-$(CONFIG_MMC_VIA_SDMMC) += via-sdmmc.o
|
|
obj-$(CONFIG_SDH_BFIN) += bfin_sdh.o
|
|
|
|
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
|
|
sdhci-of-y := sdhci-of-core.o
|
|
sdhci-of-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
|
|
sdhci-of-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
|
|
|
|
ifeq ($(CONFIG_CB710_DEBUG),y)
|
|
CFLAGS-cb710-mmc += -DDEBUG
|
|
endif
|