aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-sam9-l9260.c
diff options
context:
space:
mode:
authorLudovic Desroches <ludovic.desroches@atmel.com>2012-05-21 06:23:27 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-07-02 12:03:01 -0400
commit4cf3326ab5f34a333a46c59d0d3783db9cef13bf (patch)
tree4d8b5f494f0c99b2f261b6145c91cbc97f492795 /arch/arm/mach-at91/board-sam9-l9260.c
parent24f5c4b6e6f2933eb22979283db6174f378d9b36 (diff)
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: Ludovic Desroches <ludovic.desroches@atmel.com> [nicolas.ferre@atmel.com: remove at91_mci platform data] Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-sam9-l9260.c')
-rw-r--r--arch/arm/mach-at91/board-sam9-l9260.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-at91/board-sam9-l9260.c b/arch/arm/mach-at91/board-sam9-l9260.c
index cdd21f2595d2..0af92e6cce64 100644
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@ -72,7 +72,7 @@ static struct at91_udc_data __initdata ek_udc_data = {
72 * SPI devices. 72 * SPI devices.
73 */ 73 */
74static struct spi_board_info ek_spi_devices[] = { 74static struct spi_board_info ek_spi_devices[] = {
75#if !defined(CONFIG_MMC_AT91) 75#if !IS_ENABLED(CONFIG_MMC_ATMELMCI)
76 { /* DataFlash chip */ 76 { /* DataFlash chip */
77 .modalias = "mtd_dataflash", 77 .modalias = "mtd_dataflash",
78 .chip_select = 1, 78 .chip_select = 1,
@@ -157,12 +157,12 @@ static void __init ek_add_device_nand(void)
157/* 157/*
158 * MCI (SD/MMC) 158 * MCI (SD/MMC)
159 */ 159 */
160static struct at91_mmc_data __initdata ek_mmc_data = { 160static struct mci_platform_data __initdata ek_mci0_data = {
161 .slot_b = 1, 161 .slot[1] = {
162 .wire4 = 1, 162 .bus_width = 4,
163 .det_pin = AT91_PIN_PC8, 163 .detect_pin = AT91_PIN_PC8,
164 .wp_pin = AT91_PIN_PC4, 164 .wp_pin = AT91_PIN_PC4,
165 .vcc_pin = -EINVAL, 165 },
166}; 166};
167 167
168static void __init ek_board_init(void) 168static void __init ek_board_init(void)
@@ -193,7 +193,7 @@ static void __init ek_board_init(void)
193 /* Ethernet */ 193 /* Ethernet */
194 at91_add_device_eth(&ek_macb_data); 194 at91_add_device_eth(&ek_macb_data);
195 /* MMC */ 195 /* MMC */
196 at91_add_device_mmc(0, &ek_mmc_data); 196 at91_add_device_mci(0, &ek_mci0_data);
197 /* I2C */ 197 /* I2C */
198 at91_add_device_i2c(NULL, 0); 198 at91_add_device_i2c(NULL, 0);
199} 199}