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: Pierre Ossman <drzeus@drzeus.cx>

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 12af9c7..c7d64c0 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -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

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index 9ef010a..4d2bdfe 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -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
+mmc_core-y                     := mmc.o mmc_sysfs.o
 
-#
-# Media drivers
-#
-obj-$(CONFIG_MMC_BLOCK)                += mmc_block.o
-mmc_block-objs                 := block.o queue.o
+obj-$(CONFIG_MMC)              += card/
+obj-$(CONFIG_MMC)              += host/
 
-#
-# 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

diff --git a/drivers/mmc/card/Kconfig b/drivers/mmc/card/Kconfig
new file mode 100644 (file)
index 0000000..01a9fd3
--- /dev/null
+++ b/drivers/mmc/card/Kconfig
@@ -0,0 +1,17 @@
+#
+# 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.
+

diff --git a/drivers/mmc/card/Makefile b/drivers/mmc/card/Makefile
new file mode 100644 (file)
index 0000000..cf8c939
--- /dev/null
+++ b/drivers/mmc/card/Makefile
@@ -0,0 +1,11 @@
+#
+# 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
+

diff --git a/drivers/mmc/block.c b/drivers/mmc/card/block.c
similarity index 100%
rename from drivers/mmc/block.c
rename to drivers/mmc/card/block.c

diff --git a/drivers/mmc/queue.c b/drivers/mmc/card/queue.c
similarity index 100%
rename from drivers/mmc/queue.c
rename to drivers/mmc/card/queue.c

diff --git a/drivers/mmc/queue.h b/drivers/mmc/card/queue.h
similarity index 100%
rename from drivers/mmc/queue.h
rename to drivers/mmc/card/queue.h

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
new file mode 100644 (file)
index 0000000..ed4deab
--- /dev/null
+++ b/drivers/mmc/host/Kconfig
@@ -0,0 +1,103 @@
+#
+# MMC/SD host controller drivers
+#
+
+comment "MMC/SD Host Controller Drivers"
+       depends on MMC
+
+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)'.
+
+          To compile this driver as a module, choose M here: the
+         module will be called tifm_sd.
+

diff --git a/drivers/mmc/host/Makefile b/drivers/mmc/host/Makefile
new file mode 100644 (file)
index 0000000..6685f64
--- /dev/null
+++ b/drivers/mmc/host/Makefile
@@ -0,0 +1,18 @@
+#
+# 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_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
+

diff --git a/drivers/mmc/at91_mci.c b/drivers/mmc/host/at91_mci.c
similarity index 100%
rename from drivers/mmc/at91_mci.c
rename to drivers/mmc/host/at91_mci.c

diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
similarity index 100%
rename from drivers/mmc/au1xmmc.c
rename to drivers/mmc/host/au1xmmc.c

diff --git a/drivers/mmc/au1xmmc.h b/drivers/mmc/host/au1xmmc.h
similarity index 100%
rename from drivers/mmc/au1xmmc.h
rename to drivers/mmc/host/au1xmmc.h

diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/host/imxmmc.c
similarity index 100%
rename from drivers/mmc/imxmmc.c
rename to drivers/mmc/host/imxmmc.c

diff --git a/drivers/mmc/imxmmc.h b/drivers/mmc/host/imxmmc.h
similarity index 100%
rename from drivers/mmc/imxmmc.h
rename to drivers/mmc/host/imxmmc.h

diff --git a/drivers/mmc/mmci.c b/drivers/mmc/host/mmci.c
similarity index 100%
rename from drivers/mmc/mmci.c
rename to drivers/mmc/host/mmci.c

diff --git a/drivers/mmc/mmci.h b/drivers/mmc/host/mmci.h
similarity index 100%
rename from drivers/mmc/mmci.h
rename to drivers/mmc/host/mmci.h

diff --git a/drivers/mmc/omap.c b/drivers/mmc/host/omap.c
similarity index 100%
rename from drivers/mmc/omap.c
rename to drivers/mmc/host/omap.c

diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/host/pxamci.c
similarity index 100%
rename from drivers/mmc/pxamci.c
rename to drivers/mmc/host/pxamci.c

diff --git a/drivers/mmc/pxamci.h b/drivers/mmc/host/pxamci.h
similarity index 100%
rename from drivers/mmc/pxamci.h
rename to drivers/mmc/host/pxamci.h

diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/host/sdhci.c
similarity index 100%
rename from drivers/mmc/sdhci.c
rename to drivers/mmc/host/sdhci.c

diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/host/sdhci.h
similarity index 100%
rename from drivers/mmc/sdhci.h
rename to drivers/mmc/host/sdhci.h

diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
similarity index 100%
rename from drivers/mmc/tifm_sd.c
rename to drivers/mmc/host/tifm_sd.c

diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/host/wbsd.c
similarity index 100%
rename from drivers/mmc/wbsd.c
rename to drivers/mmc/host/wbsd.c

diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/host/wbsd.h
similarity index 100%
rename from drivers/mmc/wbsd.h
rename to drivers/mmc/host/wbsd.h