aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-05-16 11:51:59 -0400
committerChris Ball <cjb@laptop.org>2012-05-17 14:33:48 -0400
commit0caaa9539adcff38ce12e99f0ab25645e7eb3eea (patch)
tree54947fd19c5772c78398c42e4f807257187dcf2d
parentdb35f83ef47b5f180f2670d11f5f93992314ea09 (diff)
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>
-rw-r--r--Documentation/feature-removal-schedule.txt11
-rw-r--r--drivers/mmc/host/Kconfig7
2 files changed, 16 insertions, 2 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 03ca210406ed..d212f83f17cf 100644
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -539,3 +539,14 @@ When: 3.6
539Why: setitimer is not returning -EFAULT if user pointer is NULL. This 539Why: setitimer is not returning -EFAULT if user pointer is NULL. This
540 violates the spec. 540 violates the spec.
541Who: Sasikantha Babu <sasikanth.v19@gmail.com> 541Who: Sasikantha Babu <sasikanth.v19@gmail.com>
542
543----------------------------
544
545What: at91-mci driver ("CONFIG_MMC_AT91")
546When: 3.7
547Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support
548 was added to atmel-mci as a first step to support more chips.
549 Then at91-mci was kept only for old IP versions (on at91rm9200 and
550 at91sam9261). The support of these IP versions has just been added
551 to atmel-mci, so atmel-mci can be used for all chips.
552Who: Ludovic Desroches <ludovic.desroches@atmel.com>
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig
index 9f1f5e2bbfef..aa131b32e3b2 100644
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@ -278,10 +278,13 @@ choice
278 Choose which driver to use for the Atmel MCI Silicon 278 Choose which driver to use for the Atmel MCI Silicon
279 279
280config MMC_AT91 280config MMC_AT91
281 tristate "AT91 SD/MMC Card Interface support" 281 tristate "AT91 SD/MMC Card Interface support (DEPRECATED)"
282 depends on ARCH_AT91 282 depends on ARCH_AT91
283 help 283 help
284 This selects the AT91 MCI controller. 284 This selects the AT91 MCI controller. This driver will
285 be removed soon (for more information have a look to
286 Documentation/feature-removal-schedule.txt). Please use
287 MMC_ATMEL_MCI.
285 288
286 If unsure, say N. 289 If unsure, say N.
287 290