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

Commit 6b918657 authored by Haavard Skinnemoen's avatar Haavard Skinnemoen
Browse files

atmel-mci: Platform code for supporting multiple mmc slots 



Add the necessary platform infrastructure to support multiple mmc/sdcard
slots all at once through a single controller. Currently, the driver
will use the first valid slot it finds and stick with that, but later
patches will add support for switching between several slots on the fly.

Extend the platform data structure with per-slot information: MMC/SDcard
bus width and card detect/write protect pins. This will affect the pin
muxing as well as the capabilities announced to the mmc core.

Note that board code is now required to supply a mci_platform_data
struct to at32_add_device_mci().

Signed-off-by: default avatarHaavard Skinnemoen <haavard.skinnemoen@atmel.com>
parent 945533b5

arch/avr32/boards/atngw100/setup.c

+5 −2
Original line number Diff line number Diff line
@@ -53,8 +53,11 @@ static struct spi_board_info spi0_board_info[] __initdata = { 
};



static struct mci_platform_data __initdata mci0_data = {

	.slot[0] = {

		.bus_width	= 4,

		.detect_pin	= GPIO_PIN_PC(25),

		.wp_pin		= GPIO_PIN_PE(0),

	},

};



/*

arch/avr32/boards/atstk1000/atstk1002.c

+11 −7
Original line number Diff line number Diff line
@@ -264,16 +264,20 @@ void __init setup_board(void) 


#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM



static struct mci_platform_data __initdata mci0_data = {

	.slot[0] = {

		.bus_width	= 4,



/* MMC card detect requires MACB0 *NOT* be used */

#ifdef CONFIG_BOARD_ATSTK1002_SW6_CUSTOM

static struct mci_platform_data __initdata mci0_data = {

		.detect_pin	= GPIO_PIN_PC(14), /* gpio30/sdcd */

		.wp_pin		= GPIO_PIN_PC(15), /* gpio31/sdwp */

};

#define MCI_PDATA	&mci0_data

#else

#define MCI_PDATA	NULL

		.detect_pin	= -ENODEV,

		.wp_pin		= -ENODEV,

#endif	/* SW6 for sd{cd,wp} routing */

	},

};



#endif	/* SW2 for MMC signal routing */
@@ -326,7 +330,7 @@ static int __init atstk1002_init(void) 
	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0, MCI_PDATA);

	at32_add_device_mci(0, &mci0_pdata);

#endif

#ifdef CONFIG_BOARD_ATSTK1002_SW5_CUSTOM

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

arch/avr32/boards/atstk1000/atstk1003.c

+11 −1
Original line number Diff line number Diff line
@@ -66,6 +66,16 @@ static struct spi_board_info spi1_board_info[] __initdata = { { 
} };

#endif



#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

static struct mci_platform_data __initdata mci0_data = {

	.slot[0] = {

		.bus_width	= 4,

		.detect_pin	= -ENODEV,

		.wp_pin		= -ENODEV,

	},

};

#endif



#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC

static void __init atstk1003_setup_extdac(void)

{
@@ -154,7 +164,7 @@ static int __init atstk1003_init(void) 
	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0, NULL);

	at32_add_device_mci(0, &mci0_data);

#endif

	at32_add_device_usba(0, NULL);

#ifndef CONFIG_BOARD_ATSTK100X_SW3_CUSTOM

arch/avr32/boards/atstk1000/atstk1004.c

+11 −1
Original line number Diff line number Diff line
@@ -71,6 +71,16 @@ static struct spi_board_info spi1_board_info[] __initdata = { { 
} };

#endif



#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

static struct mci_platform_data __initdata mci0_data = {

	.slot[0] = {

		.bus_width	= 4,

		.detect_pin	= -ENODEV,

		.wp_pin		= -ENODEV,

	},

};

#endif



#ifdef CONFIG_BOARD_ATSTK1000_EXTDAC

static void __init atstk1004_setup_extdac(void)

{
@@ -137,7 +147,7 @@ static int __init atstk1004_init(void) 
	at32_add_device_spi(1, spi1_board_info, ARRAY_SIZE(spi1_board_info));

#endif

#ifndef CONFIG_BOARD_ATSTK100X_SW2_CUSTOM

	at32_add_device_mci(0, NULL);

	at32_add_device_mci(0, &mci0_data);

#endif

	at32_add_device_lcdc(0, &atstk1000_lcdc_data,

			     fbmem_start, fbmem_size, 0);

arch/avr32/include/asm/atmel-mci.h

+21 −1
Original line number Diff line number Diff line 
#ifndef __ASM_AVR32_ATMEL_MCI_H

#define __ASM_AVR32_ATMEL_MCI_H



struct mci_platform_data {

/**

 * struct mci_slot_pdata - board-specific per-slot configuration

 * @bus_width: Number of data lines wired up the slot

 * @detect_pin: GPIO pin wired to the card detect switch

 * @wp_pin: GPIO pin wired to the write protect sensor

 *

 * If a given slot is not present on the board, @bus_width should be

 * set to 0. The other fields are ignored in this case.

 *

 * Any pins that aren't available should be set to a negative value.

 */

struct mci_slot_pdata {

	unsigned int		bus_width;

	int			detect_pin;

	int			wp_pin;

};



/**

 * struct mci_platform_data - board-specific MMC/SDcard configuration

 * @slot: Per-slot configuration data.

 */

struct mci_platform_data {

	struct mci_slot_pdata	slot[2];

};



#endif /* __ASM_AVR32_ATMEL_MCI_H */