24 files changed, 158 insertions, 127 deletions

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index 12af9c718764..c7d64c0187fb 100644
--- 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 9ef010a51608..4d2bdfeb8d76 100644
--- 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
index 000000000000..01a9fd376a1f
--- /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
index 000000000000..cf8c939867f5
--- /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
index 8eba037a18e0..8eba037a18e0 100644
--- a/drivers/mmc/block.c
+++ b/drivers/mmc/card/block.c
diff --git a/drivers/mmc/queue.c b/drivers/mmc/card/queue.c
index aa75ac11a19e..aa75ac11a19e 100644
--- a/drivers/mmc/queue.c
+++ b/drivers/mmc/card/queue.c
diff --git a/drivers/mmc/queue.h b/drivers/mmc/card/queue.h
index c9f139e764f6..c9f139e764f6 100644
--- a/drivers/mmc/queue.h
+++ b/drivers/mmc/card/queue.h
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
new file mode 100644
index 000000000000..ed4deab2203d
--- /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
index 000000000000..6685f64345b4
--- /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
index e37943c314cb..e37943c314cb 100644
--- a/drivers/mmc/at91_mci.c
+++ b/drivers/mmc/host/at91_mci.c
diff --git a/drivers/mmc/au1xmmc.c b/drivers/mmc/host/au1xmmc.c
index b7156a4555b5..b7156a4555b5 100644
--- a/drivers/mmc/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
diff --git a/drivers/mmc/au1xmmc.h b/drivers/mmc/host/au1xmmc.h
index 341cbdf0baca..341cbdf0baca 100644
--- a/drivers/mmc/au1xmmc.h
+++ b/drivers/mmc/host/au1xmmc.h
diff --git a/drivers/mmc/imxmmc.c b/drivers/mmc/host/imxmmc.c
index 7ee2045acbef..7ee2045acbef 100644
--- a/drivers/mmc/imxmmc.c
+++ b/drivers/mmc/host/imxmmc.c
diff --git a/drivers/mmc/imxmmc.h b/drivers/mmc/host/imxmmc.h
index e5339e334dbb..e5339e334dbb 100644
--- a/drivers/mmc/imxmmc.h
+++ b/drivers/mmc/host/imxmmc.h
diff --git a/drivers/mmc/mmci.c b/drivers/mmc/host/mmci.c
index d11c2d23ceea..d11c2d23ceea 100644
--- a/drivers/mmc/mmci.c
+++ b/drivers/mmc/host/mmci.c
diff --git a/drivers/mmc/mmci.h b/drivers/mmc/host/mmci.h
index 6d7eadc9a678..6d7eadc9a678 100644
--- a/drivers/mmc/mmci.h
+++ b/drivers/mmc/host/mmci.h
diff --git a/drivers/mmc/omap.c b/drivers/mmc/host/omap.c
index e851384e51f4..e851384e51f4 100644
--- a/drivers/mmc/omap.c
+++ b/drivers/mmc/host/omap.c
diff --git a/drivers/mmc/pxamci.c b/drivers/mmc/host/pxamci.c
index a98ff98fa567..a98ff98fa567 100644
--- a/drivers/mmc/pxamci.c
+++ b/drivers/mmc/host/pxamci.c
diff --git a/drivers/mmc/pxamci.h b/drivers/mmc/host/pxamci.h
index 1b163220df2b..1b163220df2b 100644
--- a/drivers/mmc/pxamci.h
+++ b/drivers/mmc/host/pxamci.h
diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/host/sdhci.c
index 579142a7904b..579142a7904b 100644
--- a/drivers/mmc/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
diff --git a/drivers/mmc/sdhci.h b/drivers/mmc/host/sdhci.h
index 7400f4bc114f..7400f4bc114f 100644
--- a/drivers/mmc/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
diff --git a/drivers/mmc/tifm_sd.c b/drivers/mmc/host/tifm_sd.c
index b0d77d298412..b0d77d298412 100644
--- a/drivers/mmc/tifm_sd.c
+++ b/drivers/mmc/host/tifm_sd.c
diff --git a/drivers/mmc/wbsd.c b/drivers/mmc/host/wbsd.c
index 9f7518b37c33..9f7518b37c33 100644
--- a/drivers/mmc/wbsd.c
+++ b/drivers/mmc/host/wbsd.c
diff --git a/drivers/mmc/wbsd.h b/drivers/mmc/host/wbsd.h
index 873bda1e59b4..873bda1e59b4 100644
--- a/drivers/mmc/wbsd.h
+++ b/drivers/mmc/host/wbsd.h