Commit 7d2be074 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen Committed by Pierre Ossman
Browse files

atmel-mci: Driver for Atmel on-chip MMC controllers 

This is a driver for the MMC controller on the AP7000 chips from
Atmel. It should in theory work on AT91 systems too with some
tweaking, but since the DMA interface is quite different, it's not
entirely clear if it's worth merging this with the at91_mci driver.

This driver has been around for a while in BSPs and kernel sources
provided by Atmel, but this particular version uses the generic DMA
Engine framework (with the slave extensions) instead of an
avr32-only DMA controller framework.

This driver can also use PIO transfers when no DMA channels are
available, and for transfers where using DMA may be difficult or
impractical for some reason (e.g. the DMA setup overhead is usually
not worth it for very short transfers, and badly aligned buffers or
lengths are difficult to handle.)

Currently, the driver only support PIO transfers. DMA support has been
split out to a separate patch to hopefully make it easier to review.

The driver has been tested using mmc-block and ext3fs on several SD,
SDHC and MMC+ cards. Reads and writes work fine, with read transfer
rates up to 3.5 MiB/s on fast cards with debugging disabled.

The driver has also been tested using the mmc_test module on the same
cards. All tests except 7, 9, 15 and 17 succeed. The first two are
unsupported by all the cards I have, so I don't know if the driver
handles this correctly. The last two fail because the hardware flags a
Data CRC Error instead of a Data Timeout error. I'm not sure how to deal
with that.

Documentation for this controller can be found in many data sheets from
Atmel, including the AT32AP7000 data sheet which can be found here:

http://www.atmel.com/dyn/products/datasheets.asp?family_id=682



Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: default avatarPierre Ossman <drzeus@drzeus.cx>
parent 6d373331

arch/avr32/boards/atngw100/setup.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <linux/leds.h>

#include <linux/leds.h>

#include <linux/spi/spi.h>

#include <linux/spi/spi.h>





#include <asm/atmel-mci.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/setup.h>

#include <asm/setup.h>
@@ -51,6 +52,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { 
	},

	},

};

};





static struct mci_platform_data __initdata mci0_data = {

	.detect_pin	= GPIO_PIN_PC(25),

	.wp_pin		= GPIO_PIN_PE(0),

};



/*

/*

 * The next two functions should go away as the boot loader is

 * The next two functions should go away as the boot loader is

 * supposed to initialize the macb address registers with a valid

 * supposed to initialize the macb address registers with a valid
@@ -170,6 +176,7 @@ static int __init atngw100_init(void) 
	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));

	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));





	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));

	at32_add_device_spi(0, spi0_board_info, ARRAY_SIZE(spi0_board_info));

	at32_add_device_mci(0, &mci0_data);

	at32_add_device_usba(0, NULL);

	at32_add_device_usba(0, NULL);





	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {

	for (i = 0; i < ARRAY_SIZE(ngw_leds); i++) {

arch/avr32/boards/atstk1000/atstk1002.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -234,6 +234,9 @@ static int __init atstk1002_init(void) 
#ifdef CONFIG_BOARD_ATSTK100X_SPI1

#ifdef CONFIG_BOARD_ATSTK100X_SPI1

	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#endif

#ifndef CONFIG_BOARD_ATSTK1002_SW2_CUSTOM

	at32_add_device_mci(0, NULL);

#endif

#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM

#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM

	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));

	set_hw_addr(at32_add_device_eth(1, &eth_data[1]));

#else

#else

arch/avr32/mach-at32ap/at32ap700x.c

+25 −5
Original line number Original line Diff line number Diff line
@@ -14,6 +14,7 @@ 
#include <linux/spi/spi.h>

#include <linux/spi/spi.h>

#include <linux/usb/atmel_usba_udc.h>

#include <linux/usb/atmel_usba_udc.h>





#include <asm/atmel-mci.h>

#include <asm/io.h>

#include <asm/io.h>

#include <asm/irq.h>

#include <asm/irq.h>
@@ -1278,20 +1279,32 @@ static struct clk atmel_mci0_pclk = { 
	.index		= 9,

	.index		= 9,

};

};





struct platform_device *__init at32_add_device_mci(unsigned int id)

struct platform_device *__init

at32_add_device_mci(unsigned int id, struct mci_platform_data *data)

{

{

	struct mci_platform_data	_data;

	struct platform_device		*pdev;

	struct platform_device		*pdev;

	struct dw_dma_slave		*dws;





	if (id != 0)

	if (id != 0)

		return NULL;

		return NULL;





	pdev = platform_device_alloc("atmel_mci", id);

	pdev = platform_device_alloc("atmel_mci", id);

	if (!pdev)

	if (!pdev)

		return NULL;

		goto fail;





	if (platform_device_add_resources(pdev, atmel_mci0_resource,

	if (platform_device_add_resources(pdev, atmel_mci0_resource,

				ARRAY_SIZE(atmel_mci0_resource)))

				ARRAY_SIZE(atmel_mci0_resource)))

		goto err_add_resources;

		goto fail;



	if (!data) {

		data = &_data;

		memset(data, 0, sizeof(struct mci_platform_data));

	}



	if (platform_device_add_data(pdev, data,

				sizeof(struct mci_platform_data)))

		goto fail;





	select_peripheral(PA(10), PERIPH_A, 0);	/* CLK	 */

	select_peripheral(PA(10), PERIPH_A, 0);	/* CLK	 */

	select_peripheral(PA(11), PERIPH_A, 0);	/* CMD	 */

	select_peripheral(PA(11), PERIPH_A, 0);	/* CMD	 */
@@ -1300,12 +1313,19 @@ struct platform_device *__init at32_add_device_mci(unsigned int id) 
	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */

	select_peripheral(PA(14), PERIPH_A, 0);	/* DATA2 */

	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */

	select_peripheral(PA(15), PERIPH_A, 0);	/* DATA3 */





	if (data) {

		if (data->detect_pin != GPIO_PIN_NONE)

			at32_select_gpio(data->detect_pin, 0);

		if (data->wp_pin != GPIO_PIN_NONE)

			at32_select_gpio(data->wp_pin, 0);

	}



	atmel_mci0_pclk.dev = &pdev->dev;

	atmel_mci0_pclk.dev = &pdev->dev;





	platform_device_add(pdev);

	platform_device_add(pdev);

	return pdev;

	return pdev;





err_add_resources:

fail:

	platform_device_put(pdev);

	platform_device_put(pdev);

	return NULL;

	return NULL;

}

}

drivers/mmc/host/Kconfig

+10 −0
Original line number Original line Diff line number Diff line
@@ -104,6 +104,16 @@ config MMC_AT91 




	  If unsure, say N.

	  If unsure, say N.





config MMC_ATMELMCI

	tristate "Atmel Multimedia Card Interface support"

	depends on AVR32

	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.



	  If unsure, say N.



config MMC_IMX

config MMC_IMX

	tristate "Motorola i.MX Multimedia Card Interface support"

	tristate "Motorola i.MX Multimedia Card Interface support"

	depends on ARCH_IMX

	depends on ARCH_IMX

drivers/mmc/host/Makefile

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

obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o

obj-$(CONFIG_MMC_AT91)		+= at91_mci.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_TIFM_SD)	+= tifm_sd.o

obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o

obj-$(CONFIG_MMC_SPI)		+= mmc_spi.o

obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o
 
obj-$(CONFIG_MMC_S3C)   	+= s3cmci.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE