mmc: at91-mci: this driver is now deprecated

at91-mci is deprecated since atmel-mci can deal with all chips.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Chris Ball <cjb@laptop.org>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 03ca210..d212f83 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -539,3 +539,14 @@ When:      3.6
 Why:   setitimer is not returning -EFAULT if user pointer is NULL. This
        violates the spec.
 Who:   Sasikantha Babu <sasikanth.v19@gmail.com>
+
+----------------------------
+
+What:  at91-mci driver ("CONFIG_MMC_AT91")
+When:  3.7
+Why:   There are two mci drivers: at91-mci and atmel-mci. The PDC support
+       was added to atmel-mci as a first step to support more chips.
+       Then at91-mci was kept only for old IP versions (on at91rm9200 and
+       at91sam9261). The support of these IP versions has just been added
+       to atmel-mci, so atmel-mci can be used for all chips.
+Who:   Ludovic Desroches <ludovic.desroches@atmel.com>

diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9f1f5e2..aa131b3 100644 (file)
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -278,10 +278,13 @@ choice
          Choose which driver to use for the Atmel MCI Silicon
 
 config MMC_AT91
-       tristate "AT91 SD/MMC Card Interface support"
+       tristate "AT91 SD/MMC Card Interface support (DEPRECATED)"
        depends on ARCH_AT91
        help
-         This selects the AT91 MCI controller.
+         This selects the AT91 MCI controller. This driver will
+         be removed soon (for more information have a look to
+         Documentation/feature-removal-schedule.txt). Please use
+         MMC_ATMEL_MCI.
 
          If unsure, say N.