Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6a20deb authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Chris Ball
Browse files

mmc: at91-mci: remove obsolete driver 



The at91-mci driver is not needed anymore since the atmel-mci driver now
supports all Atmel devices.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent f5072512

MAINTAINERS

+0 −8
Original line number Diff line number Diff line
@@ -1352,14 +1352,6 @@ S: Maintained 
F:	drivers/atm/

F:	include/linux/atm*



ATMEL AT91 MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

W:	http://www.atmel.com/products/AT91/

W:	http://www.at91.com/

S:	Maintained

F:	drivers/mmc/host/at91_mci.c



ATMEL AT91 / AT32 MCI DRIVER

M:	Ludovic Desroches <ludovic.desroches@atmel.com>

S:	Maintained

arch/arm/mach-at91/include/mach/board.h

+0 −10
Original line number Diff line number Diff line
@@ -70,16 +70,6 @@ struct at91_cf_data { 
extern void __init at91_add_device_cf(struct at91_cf_data *data);



 /* MMC / SD */

  /* at91_mci platform config */

struct at91_mmc_data {

	int		det_pin;	/* card detect IRQ */

	unsigned	slot_b:1;	/* uses Slot B */

	unsigned	wire4:1;	/* (SD) supports DAT0..DAT3 */

	int		wp_pin;		/* (SD) writeprotect detect */

	int		vcc_pin;	/* power switching (high == on) */

};

extern void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data);



  /* atmel-mci platform config */

extern void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data);

drivers/mmc/host/Kconfig

+1 −21
Original line number Diff line number Diff line
@@ -270,26 +270,8 @@ config MMC_AU1X 


	  If unsure, say N.



choice

	prompt "Atmel SD/MMC Driver"

	depends on AVR32 || ARCH_AT91

	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 (DEPRECATED)"

	depends on ARCH_AT91

	help

	  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.



config MMC_ATMELMCI

	tristate "Atmel Multimedia Card Interface support"

	tristate "Atmel SD/MMC Driver (Multimedia Card Interface)"

	depends on AVR32 || ARCH_AT91

	help

	  This selects the Atmel Multimedia Card Interface driver. If
@@ -298,8 +280,6 @@ config MMC_ATMELMCI 


	  If unsure, say N.



endchoice



config MMC_ATMELMCI_DMA

	bool "Atmel MCI DMA support"

	depends on MMC_ATMELMCI && (AVR32 || ARCH_AT91SAM9G45) && DMA_ENGINE

drivers/mmc/host/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ obj-$(CONFIG_MMC_WBSD) += wbsd.o 
obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o

obj-$(CONFIG_MMC_OMAP_HS)	+= omap_hsmmc.o

obj-$(CONFIG_MMC_AT91)		+= at91_mci.o

obj-$(CONFIG_MMC_ATMELMCI)	+= atmel-mci.o

obj-$(CONFIG_MMC_TIFM_SD)	+= tifm_sd.o

obj-$(CONFIG_MMC_MSM)		+= msm_sdcc.o

drivers/mmc/host/at91_mci.c

deleted100644 → 0
+0 −1219

File deleted.

Preview size limit exceeded, changes collapsed.