Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40bd953c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: msm_sdcc: Remove support for legacy msm_sdcc driver"

parents e5836d36 a9f49f26

MAINTAINERS

+0 −2
Original line number Diff line number Diff line
@@ -1029,8 +1029,6 @@ M: Bryan Huntsman <bryanh@codeaurora.org> 
L:	linux-arm-msm@vger.kernel.org

F:	arch/arm/mach-msm/

F:	drivers/video/msm/

F:	drivers/mmc/host/msm_sdcc.c

F:	drivers/mmc/host/msm_sdcc.h

F:	drivers/tty/serial/msm_serial.h

F:	drivers/tty/serial/msm_serial.c

F:	drivers/*/pm8???-*

drivers/mmc/host/Kconfig

+13 −116
Original line number Diff line number Diff line
@@ -104,6 +104,19 @@ config MMC_SDHCI_PLTFM 


	  If unsure, say N.



config MMC_SDHCI_MSM

	tristate "Qualcomm SDHCI Controller Support"

	depends on ARCH_MSM

	depends on MMC_SDHCI_PLTFM

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  support present in MSM SOCs from Qualcomm. The controller

	  supports SD/MMC/SDIO devices.



	  If you have a controller with this interface, say Y or M here.



	  If unsure, say N.



config MMC_SDHCI_OF_ESDHC

	tristate "SDHCI OF support for the Freescale eSDHC controller"

	depends on MMC_SDHCI_PLTFM
@@ -311,14 +324,6 @@ config MMC_ATMELMCI 


	  If unsure, say N.



config MMC_MSM

	tristate "Qualcomm SDCC Controller Support"

	depends on MMC && ARCH_MSM

	help

	  This provides support for the SD/MMC cell found in the

	  MSM and QSD SOCs from Qualcomm. The controller also has

	  support for SDIO devices.



config MMC_MXC

	tristate "Freescale i.MX21/27/31 or MPC512x Multimedia Card support"

	depends on ARCH_MXC || PPC_MPC512x
@@ -458,114 +463,6 @@ config MMC_SDRICOH_CS 
config MMC_TMIO_CORE

	tristate



config MMC_SDHCI_MSM

	tristate "Qualcomm SDHCI Controller Support"

	depends on ARCH_MSM

	depends on MMC_SDHCI_PLTFM

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  support present in MSM SOCs from Qualcomm. The controller

	  supports SD/MMC/SDIO devices.



	  If you have a controller with this interface, say Y or M here.



	  If unsure, say N.



config MMC_MSM

	tristate "Qualcomm SDCC Controller Support"

	depends on MMC && ARCH_MSM

	help

	  This provides support for the SD/MMC cell found in the

          MSM and QSD SOCs from Qualcomm.



config MMC_MSM_SDC1_SUPPORT

	boolean "Qualcomm SDC1 support"

	depends on MMC_MSM

	default y

	help

	  Select Y to enable Slot 1.



config MMC_MSM_SDC1_8_BIT_SUPPORT

	boolean "Qualcomm SDC1 8bit support"

	depends on MMC_MSM_SDC1_SUPPORT

	default n

	help

	  Select Y to enable 8bit support for Slot 1.



config MMC_MSM_SDC2_SUPPORT

	boolean "Qualcomm SDC2 support"

	depends on MMC_MSM

	default y

	help

	  Select Y to enable Slot 2.



config MMC_MSM_SDC2_8_BIT_SUPPORT

	boolean "Qualcomm SDC2 8bit support"

	depends on MMC_MSM_SDC2_SUPPORT

	default n

	help

	  Select Y to enable 8bit support for Slot 2.



config MMC_MSM_SDC3_SUPPORT

	boolean "Qualcomm SDC3 support"

	depends on MMC_MSM

	default n

	help

	  Select Y to enable Slot 3.



config MMC_MSM_SDC3_POLLING

	boolean "Qualcomm SDC3 support"

	depends on MMC_MSM



config MMC_MSM_SDC3_8_BIT_SUPPORT

	boolean "Qualcomm SDC3 8bit support"

	depends on MMC_MSM_SDC3_SUPPORT

	default n

	help

	  Select Y to enable 8bit support for Slot 3.



config MMC_MSM_SDC3_WP_SUPPORT

	boolean "Qualcomm SDC3 write protection support"

	depends on MMC_MSM_SDC3_SUPPORT

	default n

	help

	  Select Y to enable write protection support for Slot 3.



config MMC_MSM_SDC4_SUPPORT

	boolean "Qualcomm SDC4 support"

	depends on MMC_MSM

	default n

	help

	  Select Y to enable Slot 4.



config MMC_MSM_SDC4_8_BIT_SUPPORT

	boolean "Qualcomm SDC4 8bit support"

	depends on MMC_MSM_SDC4_SUPPORT

	default n

	help

	  Select Y to enable 8bit support for Slot 4.



config MMC_MSM_SDC5_SUPPORT

	boolean "Qualcomm SDC5 support"

	depends on MMC_MSM

	default n

	help

	  Select Y to enable Slot 5.



config MMC_MSM_SDC5_8_BIT_SUPPORT

	boolean "Qualcomm SDC5 8bit support"

	depends on MMC_MSM_SDC5_SUPPORT

	default n

	help

	  Select Y to enable 8bit support for Slot 5.



config MMC_MSM_SPS_SUPPORT

	bool "Use SPS BAM as data mover"

	depends on MMC_MSM && SPS

	default n

	help

	  Select Y to use SPS BAM as data mover



config MMC_TMIO

	tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"

	depends on MFD_TMIO || MFD_ASIC3

drivers/mmc/host/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ obj-$(CONFIG_MMC_OMAP) += omap.o 
obj-$(CONFIG_MMC_OMAP_HS)	+= omap_hsmmc.o

obj-$(CONFIG_MMC_ATMELMCI)	+= atmel-mci.o

obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o

obj-$(CONFIG_MMC_MSM)		+= msm_sdcc.o

obj-$(CONFIG_MMC_MVSDIO)	+= mvsdio.o

obj-$(CONFIG_MMC_DAVINCI)       += davinci_mmc.o

obj-$(CONFIG_MMC_GOLDFISH)	+= android-goldfish.o
@@ -37,8 +36,6 @@ tmio_mmc_core-y := tmio_mmc_pio.o 
tmio_mmc_core-$(subst m,y,$(CONFIG_MMC_SDHI))	+= tmio_mmc_dma.o

obj-$(CONFIG_MMC_SDHI)		+= sh_mobile_sdhi.o

obj-$(CONFIG_MMC_CB710)		+= cb710-mmc.o

obj-$(CONFIG_MMC_MSM)		+= msm_sdcc.o

obj-$(CONFIG_MMC_MSM_SPS_SUPPORT) += msm_sdcc_dml.o

obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o

obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o

obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.o