[PATCH] mmc: driver for TI FlashMedia card reader - Kconfig/Makefile

Signed-off-by: Alex Dubov <oakad@yahoo.com>
Cc: Daniel Qarras <dqarras@yahoo.com>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 7fc692a8f5b080e8db0a7c133db23f5eced53297..3df0e7a07c46c31be7e6635f09f51f5fd489955e 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -18,7 +18,7 @@ config IBM_ASM
          service processor board as a regular serial port. To make use of
          this feature serial driver support (CONFIG_SERIAL_8250) must be
          enabled.
-         
+
          WARNING: This software may not be supported or function
          correctly on your IBM server. Please consult the IBM ServerProven
          website <http://www.pc.ibm.com/ww/eserver/xseries/serverproven> for
@@ -28,5 +28,33 @@ config IBM_ASM
 
          If unsure, say N.
 
-endmenu
+config TIFM_CORE
+       tristate "TI Flash Media interface support (EXPERIMENTAL)"
+       depends on EXPERIMENTAL
+       help
+         If you want support for Texas Instruments(R) Flash Media adapters
+         you should select this option and then also choose an appropriate
+         host adapter, such as 'TI Flash Media PCI74xx/PCI76xx host adapter
+         support', if you have a TI PCI74xx compatible card reader, for
+         example.
+         You will also have to select some flash card format drivers. MMC/SD
+         cards are supported via 'MMC/SD Card support: TI Flash Media MMC/SD
+         Interface support (MMC_TIFM_SD)'.
+
+          To compile this driver as a module, choose M here: the module will
+         be called tifm_core.
 
+config TIFM_7XX1
+       tristate "TI Flash Media PCI74xx/PCI76xx host adapter support (EXPERIMENTAL)"
+       depends on PCI && TIFM_CORE && EXPERIMENTAL
+       default TIFM_CORE
+       help
+         This option enables support for Texas Instruments(R) PCI74xx and
+         PCI76xx families of Flash Media adapters, found in many laptops.
+         To make actual use of the device, you will have to select some
+         flash card format drivers, as outlined in the TIFM_CORE Help.
+
+          To compile this driver as a module, choose M here: the module will
+         be called tifm_7xx1.
+
+endmenu

diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index c1bf1fb04c5c5cf2007c93f8a3239de35a29659a..d65ece76095a43283de2714a8c7dc0ac9a0f1625 100644 (file)
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -6,3 +6,5 @@ obj- := misc.o  # Dummy rule to force built-in.o to be made
 obj-$(CONFIG_IBM_ASM)          += ibmasm/
 obj-$(CONFIG_HDPU_FEATURES)    += hdpuftrs/
 obj-$(CONFIG_LKDTM)            += lkdtm.o
+obj-$(CONFIG_TIFM_CORE)        += tifm_core.o
+obj-$(CONFIG_TIFM_7XX1)        += tifm_7xx1.o

diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig
index f540bd88dc5a23aa12216079cf7ad675b2eff092..ea41852ec8cd33f945eb942519fe90b680de7920 100644 (file)
--- a/drivers/mmc/Kconfig
+++ b/drivers/mmc/Kconfig
@@ -109,4 +109,20 @@ config MMC_IMX
 
          If unsure, say N.
 
+config MMC_TIFM_SD
+       tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
+       depends on MMC && EXPERIMENTAL
+       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.
+
 endmenu

diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile
index b1f6e03e7aa9cd216a6a12ccc9518956f0cb2fbb..acfd4de0aba526f5bc220ef33c0c50643bcbc896 100644 (file)
--- a/drivers/mmc/Makefile
+++ b/drivers/mmc/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_MMC_WBSD)                += wbsd.o
 obj-$(CONFIG_MMC_AU1X)         += au1xmmc.o
 obj-$(CONFIG_MMC_OMAP)         += omap.o
 obj-$(CONFIG_MMC_AT91RM9200)   += at91_mci.o
+obj-$(CONFIG_MMC_TIFM_SD)      += tifm_sd.o
 
 mmc_core-y := mmc.o mmc_sysfs.o
 mmc_core-$(CONFIG_BLOCK) += mmc_queue.o