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

Commit 1c6a0718 authored by Pierre Ossman's avatar Pierre Ossman
Browse files

mmc: Move host and card drivers to subdirs 



Clean up the drivers/mmc directory by moving card and host drivers
into subdirectories.

Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 98ac2162

drivers/mmc/Kconfig

+2 −104
Original line number Diff line number Diff line
@@ -19,110 +19,8 @@ config MMC_DEBUG 
	  This is an option for use by developers; most people should

	  say N here.  This enables MMC core and driver debugging.



config MMC_BLOCK

	tristate "MMC block device driver"

	depends on MMC && BLOCK

	default y

	help

	  Say Y here to enable the MMC block device driver support.

	  This provides a block device driver, which you can use to

	  mount the filesystem. Almost everyone wishing MMC support

	  should say Y or M here.



config MMC_ARMMMCI

	tristate "ARM AMBA Multimedia Card Interface support"

	depends on ARM_AMBA && MMC

	help

	  This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card

	  Interface (PL180 and PL181) support.  If you have an ARM(R)

	  platform with a Multimedia Card slot, say Y or M here.



	  If unsure, say N.



config MMC_PXA

	tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"

	depends on ARCH_PXA && MMC

	help

	  This selects the Intel(R) PXA(R) Multimedia card Interface.

	  If you have a PXA(R) platform with a Multimedia Card slot,

	  say Y or M here.



	  If unsure, say N.



config MMC_SDHCI

	tristate "Secure Digital Host Controller Interface support  (EXPERIMENTAL)"

	depends on PCI && MMC && EXPERIMENTAL

	help

	  This select the generic Secure Digital Host Controller Interface.

	  It is used by manufacturers such as Texas Instruments(R), Ricoh(R)

	  and Toshiba(R). Most controllers found in laptops are of this type.

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



	  If unsure, say N.



config MMC_OMAP

	tristate "TI OMAP Multimedia Card Interface support"

	depends on ARCH_OMAP && MMC

	select TPS65010 if MACH_OMAP_H2

	help

	  This selects the TI OMAP Multimedia card Interface.

	  If you have an OMAP board with a Multimedia Card slot,

	  say Y or M here.



	  If unsure, say N.



config MMC_WBSD

	tristate "Winbond W83L51xD SD/MMC Card Interface support"

	depends on MMC && ISA_DMA_API

	help

	  This selects the Winbond(R) W83L51xD Secure digital and

          Multimedia card Interface.

	  If you have a machine with a integrated W83L518D or W83L519D

	  SD/MMC card reader, say Y or M here.



	  If unsure, say N.



config MMC_AU1X

	tristate "Alchemy AU1XX0 MMC Card Interface support"

	depends on MMC && SOC_AU1200

	help

	  This selects the AMD Alchemy(R) Multimedia card interface.

	  If you have a Alchemy platform with a MMC slot, say Y or M here.



	  If unsure, say N.



config MMC_AT91

	tristate "AT91 SD/MMC Card Interface support"

	depends on ARCH_AT91 && MMC

	help

	  This selects the AT91 MCI controller.



	  If unsure, say N.



config MMC_IMX

	tristate "Motorola i.MX Multimedia Card Interface support"

	depends on ARCH_IMX && MMC

	help

	  This selects the Motorola i.MX Multimedia card Interface.

	  If you have a i.MX platform with a Multimedia Card slot,

	  say Y or M here.



	  If unsure, say N.



config MMC_TIFM_SD

	tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"

	depends on MMC && EXPERIMENTAL && PCI

	select TIFM_CORE

	help

	  Say Y here if you want to be able to access MMC/SD cards with

	  the Texas Instruments(R) Flash Media card reader, found in many

	  laptops.

	  This option 'selects' (turns on, enables) 'TIFM_CORE', but you

	  probably also need appropriate card reader host adapter, such as

	  'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support

	  (TIFM_7XX1)'.

source "drivers/mmc/card/Kconfig"



          To compile this driver as a module, choose M here: the

	  module will be called tifm_sd.

source "drivers/mmc/host/Kconfig"



endmenu

drivers/mmc/Makefile

+7 −23
Original line number Diff line number Diff line
@@ -2,32 +2,16 @@ 
# Makefile for the kernel mmc device drivers.

#



ifeq ($(CONFIG_MMC_DEBUG),y)

	EXTRA_CFLAGS		+= -DDEBUG

endif



#

# Core

#

obj-$(CONFIG_MMC)		+= mmc_core.o



#

# Media drivers

#

obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

mmc_block-objs			:= block.o queue.o



#

# Host drivers

#

obj-$(CONFIG_MMC_ARMMMCI)	+= mmci.o

obj-$(CONFIG_MMC_PXA)		+= pxamci.o

obj-$(CONFIG_MMC_IMX)		+= imxmmc.o

obj-$(CONFIG_MMC_SDHCI)		+= sdhci.o

obj-$(CONFIG_MMC_WBSD)		+= wbsd.o

obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o

obj-$(CONFIG_MMC_AT91)		+= at91_mci.o

obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o



mmc_core-y			:= mmc.o mmc_sysfs.o



ifeq ($(CONFIG_MMC_DEBUG),y)

EXTRA_CFLAGS += -DDEBUG

endif
 
obj-$(CONFIG_MMC)		+= card/

obj-$(CONFIG_MMC)		+= host/

drivers/mmc/card/Kconfig

0 → 100644
+17 −0
Original line number Diff line number Diff line 
#

# MMC/SD card drivers

#



comment "MMC/SD Card Drivers"

	depends MMC



config MMC_BLOCK

	tristate "MMC block device driver"

	depends on MMC && BLOCK

	default y

	help

	  Say Y here to enable the MMC block device driver support.

	  This provides a block device driver, which you can use to

	  mount the filesystem. Almost everyone wishing MMC support

	  should say Y or M here.

drivers/mmc/card/Makefile

0 → 100644
+11 −0
Original line number Diff line number Diff line 
#

# Makefile for MMC/SD card drivers

#



ifeq ($(CONFIG_MMC_DEBUG),y)

	EXTRA_CFLAGS		+= -DDEBUG

endif



obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

mmc_block-objs			:= block.o queue.o

drivers/mmc/block.c→drivers/mmc/card/block.c

+0 −0

File moved.

View file