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

Commit 4cf3326a authored by Ludovic Desroches's avatar Ludovic Desroches Committed by Nicolas Ferre
Browse files

ARM: at91: add atmel-mci support for chips and boards which can use it 



Since atmel-mci driver supports all atmel mci versions,
use it instead of the deprecated at91_mci driver.
Platform data and all related configuration are removed.

Signed-off-by: default avatarLudovic Desroches <ludovic.desroches@atmel.com>
[nicolas.ferre@atmel.com: remove at91_mci platform data]
Signed-off-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 24f5c4b6

arch/arm/mach-at91/at91rm9200_devices.c

+54 −38
Original line number Diff line number Diff line
@@ -294,9 +294,9 @@ void __init at91_add_device_cf(struct at91_cf_data *data) {} 
 *  MMC / SD

 * -------------------------------------------------------------------- */



#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)

#if IS_ENABLED(CONFIG_MMC_ATMELMCI)

static u64 mmc_dmamask = DMA_BIT_MASK(32);

static struct at91_mmc_data mmc_data;

static struct mci_platform_data mmc_data;



static struct resource mmc_resources[] = {

	[0] = {
@@ -312,7 +312,7 @@ static struct resource mmc_resources[] = { 
};



static struct platform_device at91rm9200_mmc_device = {

	.name		= "at91_mci",

	.name		= "atmel_mci",

	.id		= -1,

	.dev		= {

				.dma_mask		= &mmc_dmamask,
@@ -323,53 +323,69 @@ static struct platform_device at91rm9200_mmc_device = { 
	.num_resources	= ARRAY_SIZE(mmc_resources),

};



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

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

{

	unsigned int i;

	unsigned int slot_count = 0;



	if (!data)

		return;



	/* input/irq */

	if (gpio_is_valid(data->det_pin)) {

		at91_set_gpio_input(data->det_pin, 1);

		at91_set_deglitch(data->det_pin, 1);

	}

	if (gpio_is_valid(data->wp_pin))

		at91_set_gpio_input(data->wp_pin, 1);

	if (gpio_is_valid(data->vcc_pin))

		at91_set_gpio_output(data->vcc_pin, 0);

	for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {



	/* CLK */

	at91_set_A_periph(AT91_PIN_PA27, 0);

		if (!data->slot[i].bus_width)

			continue;



	if (data->slot_b) {

		/* CMD */

		at91_set_B_periph(AT91_PIN_PA8, 1);



		/* DAT0, maybe DAT1..DAT3 */

		at91_set_B_periph(AT91_PIN_PA9, 1);

		if (data->wire4) {

			at91_set_B_periph(AT91_PIN_PA10, 1);

			at91_set_B_periph(AT91_PIN_PA11, 1);

			at91_set_B_periph(AT91_PIN_PA12, 1);

		/* input/irq */

		if (gpio_is_valid(data->slot[i].detect_pin)) {

			at91_set_gpio_input(data->slot[i].detect_pin, 1);

			at91_set_deglitch(data->slot[i].detect_pin, 1);

		}

	} else {

		if (gpio_is_valid(data->slot[i].wp_pin))

			at91_set_gpio_input(data->slot[i].wp_pin, 1);



		switch (i) {

		case 0:					/* slot A */

			/* CMD */

			at91_set_A_periph(AT91_PIN_PA28, 1);



			/* DAT0, maybe DAT1..DAT3 */

			at91_set_A_periph(AT91_PIN_PA29, 1);

		if (data->wire4) {

			if (data->slot[i].bus_width == 4) {

				at91_set_B_periph(AT91_PIN_PB3, 1);

				at91_set_B_periph(AT91_PIN_PB4, 1);

				at91_set_B_periph(AT91_PIN_PB5, 1);

			}

			slot_count++;

			break;

		case 1:					/* slot B */

			/* CMD */

			at91_set_B_periph(AT91_PIN_PA8, 1);

			/* DAT0, maybe DAT1..DAT3 */

			at91_set_B_periph(AT91_PIN_PA9, 1);

			if (data->slot[i].bus_width == 4) {

				at91_set_B_periph(AT91_PIN_PA10, 1);

				at91_set_B_periph(AT91_PIN_PA11, 1);

				at91_set_B_periph(AT91_PIN_PA12, 1);

			}

			slot_count++;

			break;

		default:

			printk(KERN_ERR

			       "AT91: SD/MMC slot %d not available\n", i);

			break;

		}

		if (slot_count) {

			/* CLK */

			at91_set_A_periph(AT91_PIN_PA27, 0);



			mmc_data = *data;

			platform_device_register(&at91rm9200_mmc_device);

		}

	}



}

#else

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) {}

#endif

arch/arm/mach-at91/at91sam9260_devices.c

+1 −83
Original line number Diff line number Diff line
@@ -208,93 +208,11 @@ void __init at91_add_device_eth(struct macb_platform_data *data) {} 
#endif





/* --------------------------------------------------------------------

 *  MMC / SD

 * -------------------------------------------------------------------- */



#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)

static u64 mmc_dmamask = DMA_BIT_MASK(32);

static struct at91_mmc_data mmc_data;



static struct resource mmc_resources[] = {

	[0] = {

		.start	= AT91SAM9260_BASE_MCI,

		.end	= AT91SAM9260_BASE_MCI + SZ_16K - 1,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

		.start	= AT91SAM9260_ID_MCI,

		.end	= AT91SAM9260_ID_MCI,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct platform_device at91sam9260_mmc_device = {

	.name		= "at91_mci",

	.id		= -1,

	.dev		= {

				.dma_mask		= &mmc_dmamask,

				.coherent_dma_mask	= DMA_BIT_MASK(32),

				.platform_data		= &mmc_data,

	},

	.resource	= mmc_resources,

	.num_resources	= ARRAY_SIZE(mmc_resources),

};



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

{

	if (!data)

		return;



	/* input/irq */

	if (gpio_is_valid(data->det_pin)) {

		at91_set_gpio_input(data->det_pin, 1);

		at91_set_deglitch(data->det_pin, 1);

	}

	if (gpio_is_valid(data->wp_pin))

		at91_set_gpio_input(data->wp_pin, 1);

	if (gpio_is_valid(data->vcc_pin))

		at91_set_gpio_output(data->vcc_pin, 0);



	/* CLK */

	at91_set_A_periph(AT91_PIN_PA8, 0);



	if (data->slot_b) {

		/* CMD */

		at91_set_B_periph(AT91_PIN_PA1, 1);



		/* DAT0, maybe DAT1..DAT3 */

		at91_set_B_periph(AT91_PIN_PA0, 1);

		if (data->wire4) {

			at91_set_B_periph(AT91_PIN_PA5, 1);

			at91_set_B_periph(AT91_PIN_PA4, 1);

			at91_set_B_periph(AT91_PIN_PA3, 1);

		}

	} else {

		/* CMD */

		at91_set_A_periph(AT91_PIN_PA7, 1);



		/* DAT0, maybe DAT1..DAT3 */

		at91_set_A_periph(AT91_PIN_PA6, 1);

		if (data->wire4) {

			at91_set_A_periph(AT91_PIN_PA9, 1);

			at91_set_A_periph(AT91_PIN_PA10, 1);

			at91_set_A_periph(AT91_PIN_PA11, 1);

		}

	}



	mmc_data = *data;

	platform_device_register(&at91sam9260_mmc_device);

}

#else

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

#endif



/* --------------------------------------------------------------------

 *  MMC / SD Slot for Atmel MCI Driver

 * -------------------------------------------------------------------- */



#if defined(CONFIG_MMC_ATMELMCI) || defined(CONFIG_MMC_ATMELMCI_MODULE)

#if IS_ENABLED(CONFIG_MMC_ATMELMCI)

static u64 mmc_dmamask = DMA_BIT_MASK(32);

static struct mci_platform_data mmc_data;

arch/arm/mach-at91/at91sam9261_devices.c

+30 −30
Original line number Diff line number Diff line
@@ -137,9 +137,9 @@ void __init at91_add_device_udc(struct at91_udc_data *data) {} 
 *  MMC / SD

 * -------------------------------------------------------------------- */



#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)

#if IS_ENABLED(CONFIG_MMC_ATMELMCI)

static u64 mmc_dmamask = DMA_BIT_MASK(32);

static struct at91_mmc_data mmc_data;

static struct mci_platform_data mmc_data;



static struct resource mmc_resources[] = {

	[0] = {
@@ -155,7 +155,7 @@ static struct resource mmc_resources[] = { 
};



static struct platform_device at91sam9261_mmc_device = {

	.name		= "at91_mci",

	.name		= "atmel_mci",

	.id		= -1,

	.dev		= {

				.dma_mask		= &mmc_dmamask,
@@ -166,20 +166,19 @@ static struct platform_device at91sam9261_mmc_device = { 
	.num_resources	= ARRAY_SIZE(mmc_resources),

};



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

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

{

	if (!data)

		return;



	if (data->slot[0].bus_width) {

		/* input/irq */

	if (gpio_is_valid(data->det_pin)) {

		at91_set_gpio_input(data->det_pin, 1);

		at91_set_deglitch(data->det_pin, 1);

		if (gpio_is_valid(data->slot[0].detect_pin)) {

			at91_set_gpio_input(data->slot[0].detect_pin, 1);

			at91_set_deglitch(data->slot[0].detect_pin, 1);

		}

	if (gpio_is_valid(data->wp_pin))

		at91_set_gpio_input(data->wp_pin, 1);

	if (gpio_is_valid(data->vcc_pin))

		at91_set_gpio_output(data->vcc_pin, 0);

		if (gpio_is_valid(data->slot[0].wp_pin))

			at91_set_gpio_input(data->slot[0].wp_pin, 1);



		/* CLK */

		at91_set_B_periph(AT91_PIN_PA2, 0);
@@ -189,7 +188,7 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) 


		/* DAT0, maybe DAT1..DAT3 */

		at91_set_B_periph(AT91_PIN_PA0, 1);

	if (data->wire4) {

		if (data->slot[0].bus_width == 4) {

			at91_set_B_periph(AT91_PIN_PA4, 1);

			at91_set_B_periph(AT91_PIN_PA5, 1);

			at91_set_B_periph(AT91_PIN_PA6, 1);
@@ -198,8 +197,9 @@ void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) 
		mmc_data = *data;

		platform_device_register(&at91sam9261_mmc_device);

	}

}

#else

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) {}

#endif

arch/arm/mach-at91/at91sam9263.c

+2 −2
Original line number Diff line number Diff line
@@ -187,8 +187,8 @@ static struct clk_lookup periph_clocks_lookups[] = { 
	CLKDEV_CON_ID("hclk", &macb_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.0", &ssc0_clk),

	CLKDEV_CON_DEV_ID("pclk", "ssc.1", &ssc1_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.0", &mmc0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "at91_mci.1", &mmc1_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.0", &mmc0_clk),

	CLKDEV_CON_DEV_ID("mci_clk", "atmel_mci.1", &mmc1_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.0", &spi0_clk),

	CLKDEV_CON_DEV_ID("spi_clk", "atmel_spi.1", &spi1_clk),

	CLKDEV_CON_DEV_ID("t0_clk", "atmel_tcb.0", &tcb_clk),

arch/arm/mach-at91/at91sam9263_devices.c

+93 −68
Original line number Diff line number Diff line
@@ -218,9 +218,9 @@ void __init at91_add_device_eth(struct macb_platform_data *data) {} 
 *  MMC / SD

 * -------------------------------------------------------------------- */



#if defined(CONFIG_MMC_AT91) || defined(CONFIG_MMC_AT91_MODULE)

#if IS_ENABLED(CONFIG_MMC_ATMELMCI)

static u64 mmc_dmamask = DMA_BIT_MASK(32);

static struct at91_mmc_data mmc0_data, mmc1_data;

static struct mci_platform_data mmc0_data, mmc1_data;



static struct resource mmc0_resources[] = {

	[0] = {
@@ -236,7 +236,7 @@ static struct resource mmc0_resources[] = { 
};



static struct platform_device at91sam9263_mmc0_device = {

	.name		= "at91_mci",

	.name		= "atmel_mci",

	.id		= 0,

	.dev		= {

				.dma_mask		= &mmc_dmamask,
@@ -261,7 +261,7 @@ static struct resource mmc1_resources[] = { 
};



static struct platform_device at91sam9263_mmc1_device = {

	.name		= "at91_mci",

	.name		= "atmel_mci",

	.id		= 1,

	.dev		= {

				.dma_mask		= &mmc_dmamask,
@@ -272,85 +272,110 @@ static struct platform_device at91sam9263_mmc1_device = { 
	.num_resources	= ARRAY_SIZE(mmc1_resources),

};



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

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

{

	unsigned int i;

	unsigned int slot_count = 0;



	if (!data)

		return;



	for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {



		if (!data->slot[i].bus_width)

			continue;



		/* input/irq */

	if (gpio_is_valid(data->det_pin)) {

		at91_set_gpio_input(data->det_pin, 1);

		at91_set_deglitch(data->det_pin, 1);

		if (gpio_is_valid(data->slot[i].detect_pin)) {

			at91_set_gpio_input(data->slot[i].detect_pin,

					1);

			at91_set_deglitch(data->slot[i].detect_pin,

					1);

		}

	if (gpio_is_valid(data->wp_pin))

		at91_set_gpio_input(data->wp_pin, 1);

	if (gpio_is_valid(data->vcc_pin))

		at91_set_gpio_output(data->vcc_pin, 0);

		if (gpio_is_valid(data->slot[i].wp_pin))

			at91_set_gpio_input(data->slot[i].wp_pin, 1);



		if (mmc_id == 0) {				/* MCI0 */

		/* CLK */

		at91_set_A_periph(AT91_PIN_PA12, 0);



		if (data->slot_b) {

			/* CMD */

			at91_set_A_periph(AT91_PIN_PA16, 1);



			/* DAT0, maybe DAT1..DAT3 */

			at91_set_A_periph(AT91_PIN_PA17, 1);

			if (data->wire4) {

				at91_set_A_periph(AT91_PIN_PA18, 1);

				at91_set_A_periph(AT91_PIN_PA19, 1);

				at91_set_A_periph(AT91_PIN_PA20, 1);

			}

		} else {

			switch (i) {

			case 0:					/* slot A */

				/* CMD */

				at91_set_A_periph(AT91_PIN_PA1, 1);



				/* DAT0, maybe DAT1..DAT3 */

				at91_set_A_periph(AT91_PIN_PA0, 1);

			if (data->wire4) {

				if (data->slot[i].bus_width == 4) {

					at91_set_A_periph(AT91_PIN_PA3, 1);

					at91_set_A_periph(AT91_PIN_PA4, 1);

					at91_set_A_periph(AT91_PIN_PA5, 1);

				}

				slot_count++;

				break;

			case 1:					/* slot B */

				/* CMD */

				at91_set_A_periph(AT91_PIN_PA16, 1);

				/* DAT0, maybe DAT1..DAT3 */

				at91_set_A_periph(AT91_PIN_PA17, 1);

				if (data->slot[i].bus_width == 4) {

					at91_set_A_periph(AT91_PIN_PA18, 1);

					at91_set_A_periph(AT91_PIN_PA19, 1);

					at91_set_A_periph(AT91_PIN_PA20, 1);

				}

				slot_count++;

				break;

			default:

				printk(KERN_ERR

				       "AT91: SD/MMC slot %d not available\n", i);

				break;

			}

			if (slot_count) {

				/* CLK */

				at91_set_A_periph(AT91_PIN_PA12, 0);



				mmc0_data = *data;

				platform_device_register(&at91sam9263_mmc0_device);

	} else {			/* MCI1 */

		/* CLK */

		at91_set_A_periph(AT91_PIN_PA6, 0);



		if (data->slot_b) {

			/* CMD */

			at91_set_A_periph(AT91_PIN_PA21, 1);



			/* DAT0, maybe DAT1..DAT3 */

			at91_set_A_periph(AT91_PIN_PA22, 1);

			if (data->wire4) {

				at91_set_A_periph(AT91_PIN_PA23, 1);

				at91_set_A_periph(AT91_PIN_PA24, 1);

				at91_set_A_periph(AT91_PIN_PA25, 1);

			}

		} else {

		} else if (mmc_id == 1) {			/* MCI1 */

			switch (i) {

			case 0:					/* slot A */

				/* CMD */

				at91_set_A_periph(AT91_PIN_PA7, 1);



				/* DAT0, maybe DAT1..DAT3 */

				at91_set_A_periph(AT91_PIN_PA8, 1);

			if (data->wire4) {

				if (data->slot[i].bus_width == 4) {

					at91_set_A_periph(AT91_PIN_PA9, 1);

					at91_set_A_periph(AT91_PIN_PA10, 1);

					at91_set_A_periph(AT91_PIN_PA11, 1);

				}

				slot_count++;

				break;

			case 1:					/* slot B */

				/* CMD */

				at91_set_A_periph(AT91_PIN_PA21, 1);

				/* DAT0, maybe DAT1..DAT3 */

				at91_set_A_periph(AT91_PIN_PA22, 1);

				if (data->slot[i].bus_width == 4) {

					at91_set_A_periph(AT91_PIN_PA23, 1);

					at91_set_A_periph(AT91_PIN_PA24, 1);

					at91_set_A_periph(AT91_PIN_PA25, 1);

				}

				slot_count++;

				break;

			default:

				printk(KERN_ERR

				       "AT91: SD/MMC slot %d not available\n", i);

				break;

			}

			if (slot_count) {

				/* CLK */

				at91_set_A_periph(AT91_PIN_PA6, 0);



				mmc1_data = *data;

				platform_device_register(&at91sam9263_mmc1_device);

			}

		}

	}

}

#else

void __init at91_add_device_mmc(short mmc_id, struct at91_mmc_data *data) {}

void __init at91_add_device_mci(short mmc_id, struct mci_platform_data *data) {}

#endif



/* --------------------------------------------------------------------