Skip to contentSkip to conversation

mmc: at91-mci: remove driver

PATCH New ludovic.desroches at atmel.com 4 participants 9 messages Oct 29, 2012 – Oct 30, 2012

Subsystems (4)
Arm (32-bit) Arm sub-architectures MMC, SD and SDIO Arm/Microchip (AT91) SoC support
lore
Share & tools
lore

ludovic.desroches at atmel.com

author
#0 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

From: Ludovic Desroches <[email protected]>

The at91-mci driver is no more needed since atmel-mci driver supports all Atmel devices.

Signed-off-by Ludovic Desroches <[email protected]>
Acked-by Nicolas Ferre <[email protected]>

---

Hello,

This patch removes the old at91-mci driver for 3.8 as it has been planned.

Regards

Ludovic

 MAINTAINERS                             |    8 -
 arch/arm/mach-at91/include/mach/board.h |   10 -
 drivers/mmc/host/Kconfig                |   22 +-
 drivers/mmc/host/Makefile               |    1 -
 drivers/mmc/host/at91_mci.c             | 1219 -------------------------------
 drivers/mmc/host/at91_mci.h             |  115 ---
 6 files changed, 1 insertion(+), 1374 deletions(-)
 delete mode 100644 drivers/mmc/host/at91_mci.c
 delete mode 100644 drivers/mmc/host/at91_mci.h
MAINTAINERS +0 -8
index 1fa9074..7fde4b1 100644
@@ -1360,14 +1360,6 @@ S:	Maintained
 F:	drivers/atm/
 F:	include/linux/atm*
 
-ATMEL AT91 MCI DRIVER
-M:	Ludovic Desroches <[email protected]>
-L:	linux-arm-kernel at 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 <[email protected]>
 S:	Maintained
arch/arm/mach-at91/include/mach/board.h +0 -10
index c55a436..a0d92a9 100644
@@ -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
index 9bf10e7..5c7c846 100644
@@ -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
index 17ad0a7..cd64b5d 100644
@@ -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 deleted +0 -1219

1,219 lines not on this page · raw message

drivers/mmc/host/at91_mci.h deleted +0 -115

115 lines not on this page · raw message

Signature · 1 line
1.7.11.3
#2 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

Quoted 5 lines · Chris Ball

Hi,

Quoted 2 lines · ludovic.desroches at atmel.com

From: Ludovic Desroches <[email protected]>

Quoted 7 lines
Quoted 5 lines

The at91-mci driver is no more needed since atmel-mci driver supports all Atmel devices.

Signed-off-by Ludovic Desroches <[email protected]>
Acked-by Nicolas Ferre <[email protected]>

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Best Regards,
J.

#3 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#4 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

Quoted 10 lines · Chris Ball

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Quoted 6 lines

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

I'm modifing and moiving the board.h so this file will not exist anymore

and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h

Best Regards,
J.

Quoted 7 lines

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#5 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

Hi,

Quoted 14 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 13 lines · Chris Ball

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

Quoted 6 lines
Quoted 3 lines

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

I'm modifing and moiving the board.h so this file will not exist anymore

and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h

Can we take the modification of board.h out of this patch, then, leaving just the drivers/mmc/ changes?

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#6 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

Quoted 20 lines · Chris Ball

Hi,

Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Chris Ball

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

Quoted 6 lines
Quoted 3 lines

I'm modifing and moiving the board.h so this file will not exist anymore

and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h

Can we take the modification of board.h out of this patch, then, leaving just the drivers/mmc/ changes?

If you really insist but for changelog history and bisectable I'll prefer to do not do so

Best Regards,
J.

#7 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

On 10/30/2012 04:43 PM, Jean-Christophe PLAGNIOL-VILLARD :

Quoted 21 lines · Chris Ball
Quoted 20 lines

Hi,

Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Chris Ball

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

Quoted 8 lines
Quoted 6 lines
Quoted 3 lines

I'm modifing and moiving the board.h so this file will not exist anymore

and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h

Can we take the modification of board.h out of this patch, then, leaving just the drivers/mmc/ changes?

If you really insist but for changelog history and bisectable I'll prefer to do not do so

Why don't we leave the code already submitted in the mmc tree. It seems that the conflict can be pretty easily handled in advance as it ends up being a file removal...

So, I would not bother Chris with our own business and would just manage the conflict later, in linux-next (maybe sending a little note to Stephen).

My $0.02.

Bye,

Signature · 1 line
Nicolas Ferre
author
#8 lore raw

PATCH 1/1 mmc: at91-mci: remove driver

In reply to Chris Ball

Hi,

Le 10/30/2012 04:38 PM, Chris Ball a ?crit :

Quoted 20 lines

Hi,

Quoted 17 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 16 lines · Chris Ball

Hi,

Quoted 6 lines · Jean-Christophe PLAGNIOL-VILLARD
Quoted 1 line

Thanks! Pushed to mmc-next for 3.8.

if you don't mind I prefer to take it via at91

I've a patch series that cleanup the platform_data it's difficult to merge with this one

Hm, I don't understand why it should be difficult to merge. Is it because this patch modifies arch/arm/mach-at91/include/mach/board.h?

If so, sounds like we should just take that change out of this patch and have it go into your platform data cleanup patch, and then I can merge the drivers/mmc change independently? Let me know what you think.

Quoted 6 lines
Quoted 3 lines

I'm modifing and moiving the board.h so this file will not exist anymore

and the platform data are not anymore in arch/arm/mach-at91/include/mach/board.h

Can we take the modification of board.h out of this patch, then, leaving just the drivers/mmc/ changes?

Yes I can remove board.h changes from the patch. Jean-Christophe, do you agree too?

Ludovic

Quoted 3 lines

- Chris.