From: Arnd Bergmann <arnd@arndb.de>
Date: Fri, 10 Aug 2012 10:34:18 +0000 (+0200)
Subject: Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=e05dd97c5c345bd1f6ce9f6fc242326a64191239;p=linux-edison.git

Merge tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91 into at91/mci

AT91 SoC related code modifications: a cleanup in defconfigs and
a one liner in a board file.
The most important is the move to atmel-mci driver in AT91 SoC & boards.
The old at91_mci (marked as deprecated) will be removed in 3.7. So all
platform data for this old driver are erased and replace by information
needed by atmel-mci driver.

* tag 'at91-for-next-soc' of git://github.com/at91linux/linux-at91:
  ARM: at91: add atmel-mci support for chips and boards which can use it
  ARM: at91/defconfig: change the MCI driver to use in defconfigs
  ARM: at91: set i2c_board_info.type to "ds1339" directly
  ARM: at91/defconfig: Remove unaffected config option

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---

e05dd97c5c345bd1f6ce9f6fc242326a64191239
diff --cc arch/arm/mach-at91/board-sam9-l9260.c
index 46e1eb55053,0af92e6cce6..c5f01acce3c
--- a/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@@ -158,34 -157,19 +158,34 @@@ static void __init ek_add_device_nand(v
  /*
   * MCI (SD/MMC)
   */
- static struct at91_mmc_data __initdata ek_mmc_data = {
- 	.slot_b		= 1,
- 	.wire4		= 1,
- 	.det_pin	= AT91_PIN_PC8,
- 	.wp_pin		= AT91_PIN_PC4,
- 	.vcc_pin	= -EINVAL,
+ static struct mci_platform_data __initdata ek_mci0_data = {
+ 	.slot[1] = {
+ 		.bus_width	= 4,
+ 		.detect_pin	= AT91_PIN_PC8,
+ 		.wp_pin		= AT91_PIN_PC4,
+ 	},
  };
  
 +/*
 + * LEDs
 + */
 +static struct gpio_led ek_leds[] = {
 +	{	/* D1 */
 +		.name			= "led1",
 +		.gpio			= AT91_PIN_PA9,
 +		.active_low		= 1,
 +		.default_trigger	= "heartbeat",
 +	},
 +	{	/* D2 */
 +		.name			= "led2",
 +		.gpio			= AT91_PIN_PA6,
 +		.active_low		= 1,
 +		.default_trigger	= "timer",
 +	}
 +};
 +
  static void __init ek_board_init(void)
  {
 -	/* Setup the LEDs */
 -	at91_init_leds(AT91_PIN_PA9, AT91_PIN_PA6);
 -
  	/* Serial */
  	/* DBGU on ttyS0. (Rx & Tx only) */
  	at91_register_uart(0, 0, 0);
@@@ -209,11 -193,9 +209,11 @@@
  	/* Ethernet */
  	at91_add_device_eth(&ek_macb_data);
  	/* MMC */
- 	at91_add_device_mmc(0, &ek_mmc_data);
+ 	at91_add_device_mci(0, &ek_mci0_data);
  	/* I2C */
  	at91_add_device_i2c(NULL, 0);
 +	/* LEDs */
 +	at91_gpio_leds(ek_leds, ARRAY_SIZE(ek_leds));
  }
  
  MACHINE_START(SAM9_L9260, "Olimex SAM9-L9260")