atmel-mci: unified Atmel MCI drivers (AVR32 & AT91)

Unification of the atmel-mci driver to support the AT91 processors MCI
interface.  The atmel-mci driver currently supports the AVR32 and this
patch adds AT91 support.

Add read/write proof selection switch dependent on chip availability of
this feature.

To use this new driver on a at91 the platform driver for your board needs
to be updated.

[nicolas.ferre@atmel.com indent, Kconfig comment and one printk modification]
Signed-off-by: Rob Emanuele <rob@emanuele.us>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: Haavard Skinnemoen <hskinnemoen@atmel.com>
Cc: Andrew Victor <linux@maxim.org.za>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 12 insertions, 4 deletions

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 34fdfa968fe9..6f20eb93554b 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -160,6 +160,12 @@ config MMC_AU1X
 
           If unsure, say N.
 
+choice
+        prompt "Atmel SD/MMC Driver"
+        default MMC_ATMELMCI if AVR32
+        help
+          Choose which driver to use for the Atmel MCI Silicon
+
 config MMC_AT91
         tristate "AT91 SD/MMC Card Interface support"
         depends on ARCH_AT91
@@ -170,17 +176,19 @@ config MMC_AT91
 
 config MMC_ATMELMCI
         tristate "Atmel Multimedia Card Interface support"
-        depends on AVR32
+        depends on AVR32 || ARCH_AT91
         help
           This selects the Atmel Multimedia Card Interface driver. If
-          you have an AT32 (AVR32) platform with a Multimedia Card
-          slot, say Y or M here.
+          you have an AT32 (AVR32) or AT91 platform with a Multimedia
+          Card slot, say Y or M here.
 
           If unsure, say N.
 
+endchoice
+
 config MMC_ATMELMCI_DMA
         bool "Atmel MCI DMA support (EXPERIMENTAL)"
-        depends on MMC_ATMELMCI && DMA_ENGINE && EXPERIMENTAL
+        depends on MMC_ATMELMCI && AVR32 && DMA_ENGINE && EXPERIMENTAL
         help
           Say Y here to have the Atmel MCI driver use a DMA engine to
           do data transfers and thus increase the throughput and