Merge remote-tracking branch 'at91/at91-next'

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/board-afeb-9260v1.c
	arch/arm/mach-at91/board-neocore926.c
	arch/arm/mach-at91/board-rm9200dk.c
	arch/arm/mach-at91/board-sam9g20ek.c
	arch/arm/mach-at91/board-sam9m10g45ek.c
	drivers/ata/pata_at91.c

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
index 24b6f8c0440ddc0c4b4661bc1bbf8b4f51c9b399,f00fed40b2d87e5110cfd5d0ffdabbfc3abf269b..6bfcd484d4347591c26a0a6a23dded8a1b46f62d
--- 1/arch/arm/mach-at91/at91sam9260_devices.c
--- 2/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -327,10 -327,10 +327,10 @@@ void __init at91_add_device_mci(short m
        if (!data)
                return;
  
 -      for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
 +      for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
                if (data->slot[i].bus_width) {
                        /* input/irq */
-                       if (data->slot[i].detect_pin) {
+                       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);
                        }

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9rl_devices.c
Simple merge

diff --cc arch/arm/mach-at91/board-1arm.c
Simple merge

diff --cc arch/arm/mach-at91/board-afeb-9260v1.c
index 4282d96dffa808b1ebf059227d088ca3b92ec441,68a3e90069590283604fc2f63cfe84ad5d23f756..8c755c6fdbe2c1715158d7eb1c2db04ff33e8a82
--- 1/arch/arm/mach-at91/board-afeb-9260v1.c
--- 2/arch/arm/mach-at91/board-afeb-9260v1.c
+++ b/arch/arm/mach-at91/board-afeb-9260v1.c
@@@ -135,9 -142,9 +136,10 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
        .bus_width_16   = 0,
+       .det_pin        = -EINVAL,
 +      .parts          = afeb9260_nand_partition,
 +      .num_parts      = ARRAY_SIZE(afeb9260_nand_partition),
  };
  
  

diff --cc arch/arm/mach-at91/board-cam60.c
index f90cfb32bad2b89815c0ed292b15721dcaa393be,73f105bf62a6ffcea5acf60e9f5fb9f3e7496444..08a136b039e2a4b038e0e388c34ed86f4db4a39d
--- 1/arch/arm/mach-at91/board-cam60.c
--- 2/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@@ -135,11 -136,16 +136,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata cam60_nand_data = {
        .ale            = 21,
        .cle            = 22,
-       // .det_pin     = ... not there
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PA9,
        .enable_pin     = AT91_PIN_PA7,
 -      .partition_info = nand_partitions,
 +      .parts          = cam60_nand_partition,
 +      .num_parts      = ARRAY_SIZE(cam60_nand_partition),
  };
  
  static struct sam9_smc_config __initdata cam60_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-cap9adk.c
index 5dffd3be62d25878b52cdbb46150a7d71ad965ac,22b62a4b1c321b7a0a9dacbfd11e93418d1a3945..3b48829f0c3f99fdbf04cf00c029898e368e9be2
--- 1/arch/arm/mach-at91/board-cap9adk.c
--- 2/arch/arm/mach-at91/board-cap9adk.c
+++ b/arch/arm/mach-at91/board-cap9adk.c
@@@ -172,11 -174,16 +174,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata cap9adk_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
- //    .rdy_pin        = ... not connected
+       .det_pin        = -EINVAL,
+       .rdy_pin        = -EINVAL,
        .enable_pin     = AT91_PIN_PD15,
 -      .partition_info = nand_partitions,
 +      .parts          = cap9adk_nand_partitions,
 +      .num_parts      = ARRAY_SIZE(cap9adk_nand_partitions),
  };
  
  static struct sam9_smc_config __initdata cap9adk_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-carmeva.c
Simple merge

diff --cc arch/arm/mach-at91/board-cpu9krea.c
Simple merge

diff --cc arch/arm/mach-at91/board-cpuat91.c
Simple merge

diff --cc arch/arm/mach-at91/board-csb337.c
Simple merge

diff --cc arch/arm/mach-at91/board-csb637.c
Simple merge

diff --cc arch/arm/mach-at91/board-eb9200.c
Simple merge

diff --cc arch/arm/mach-at91/board-ecbat91.c
Simple merge

diff --cc arch/arm/mach-at91/board-kafa.c
Simple merge

diff --cc arch/arm/mach-at91/board-kb9202.c
index e61351ffad50c15399dba98cb7b8b7fa9116728e,e0c4d988ab45ecf1c460321dbcf222052fa18045..39933efcd1741fa79b8ef46cbea2052685d27914
--- 1/arch/arm/mach-at91/board-kb9202.c
--- 2/arch/arm/mach-at91/board-kb9202.c
+++ b/arch/arm/mach-at91/board-kb9202.c
@@@ -100,11 -103,16 +103,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata kb9202_nand_data = {
        .ale            = 22,
        .cle            = 21,
-       // .det_pin     = ... not there
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC29,
        .enable_pin     = AT91_PIN_PC28,
 -      .partition_info = nand_partitions,
 +      .parts          = kb9202_nand_partition,
 +      .num_parts      = ARRAY_SIZE(kb9202_nand_partition),
  };
  
  static void __init kb9202_board_init(void)

diff --cc arch/arm/mach-at91/board-neocore926.c
index ef816c17dc61ebd0a0b9fb0c04ab134912f5b4c7,2451b98f5dc6d79dbe74a250e36af5edb079cfc4..d80ec7390880093b867f0d16d5de6e241284c59a
--- 1/arch/arm/mach-at91/board-neocore926.c
--- 2/arch/arm/mach-at91/board-neocore926.c
+++ b/arch/arm/mach-at91/board-neocore926.c
@@@ -188,8 -195,8 +189,9 @@@ static struct atmel_nand_data __initdat
        .rdy_pin                = AT91_PIN_PB19,
        .rdy_pin_active_low     = 1,
        .enable_pin             = AT91_PIN_PD15,
 -      .partition_info         = nand_partitions,
+       .det_pin                = -EINVAL,
 +      .parts                  = neocore926_nand_partition,
 +      .num_parts              = ARRAY_SIZE(neocore926_nand_partition),
  };
  
  static struct sam9_smc_config __initdata neocore926_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-picotux200.c
Simple merge

diff --cc arch/arm/mach-at91/board-qil-a9260.c
index 07421bdb88eaf7f1b985a39c23bac74a7d61dd08,429942193c0e41085e57777cd2ecc09e131a5a14..c123c6f9085bc777a9573bee071a93948747c99d
--- 1/arch/arm/mach-at91/board-qil-a9260.c
--- 2/arch/arm/mach-at91/board-qil-a9260.c
+++ b/arch/arm/mach-at91/board-qil-a9260.c
@@@ -133,11 -134,16 +134,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-rm9200dk.c
index 80a8c9c6e92221f53b2024f95d41a1be80e90afe,d79168388f3f011038b60349a88914db540c56da..fe16c27f7c559e5c427c492f2a15725f2d6f4085
--- 1/arch/arm/mach-at91/board-rm9200dk.c
--- 2/arch/arm/mach-at91/board-rm9200dk.c
+++ b/arch/arm/mach-at91/board-rm9200dk.c
@@@ -143,9 -153,8 +147,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 21,
        .det_pin        = AT91_PIN_PB1,
        .rdy_pin        = AT91_PIN_PC2,
-       // .enable_pin  = ... not there
+       .enable_pin     = -EINVAL,
 -      .partition_info = nand_partitions,
 +      .parts          = dk_nand_partition,
 +      .num_parts      = ARRAY_SIZE(dk_nand_partition),
  };
  
  #define DK_FLASH_BASE AT91_CHIPSELECT_0

diff --cc arch/arm/mach-at91/board-rm9200ek.c
Simple merge

diff --cc arch/arm/mach-at91/board-sam9-l9260.c
index 072d53af98d9ebdd594dc9d17efd68c479341976,00cf07626dff15417edd407da3a25c6dda935dca..d8e9cdcbf9f4e032f55f8f2aa3836c8512460d95
--- 1/arch/arm/mach-at91/board-sam9-l9260.c
--- 2/arch/arm/mach-at91/board-sam9-l9260.c
+++ b/arch/arm/mach-at91/board-sam9-l9260.c
@@@ -134,11 -135,16 +135,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9260ek.c
index 4f10181a07822b4a4a93b0634aa668f428951a19,8f899513f9cb095cd1cb3319d8308ca7c46123cf..605dc0165ff73758b9a70e6ac93cc1a7b1fd3deb
--- 1/arch/arm/mach-at91/board-sam9260ek.c
--- 2/arch/arm/mach-at91/board-sam9260ek.c
+++ b/arch/arm/mach-at91/board-sam9260ek.c
@@@ -176,11 -177,16 +177,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9261ek.c
index b005b738e8ff7bc6dc4af3c8e173421bd9b234c7,e778d2ccbaeb163ab1bf76da440c0121e0ddb1b8..364f762d7077bf3edb6e3eb14e810a7d4ff19b20
--- 1/arch/arm/mach-at91/board-sam9261ek.c
--- 2/arch/arm/mach-at91/board-sam9261ek.c
+++ b/arch/arm/mach-at91/board-sam9261ek.c
@@@ -182,11 -183,16 +183,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 22,
        .cle            = 21,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC15,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9263ek.c
index bccdcf23caa106e392dba97fa4df69f9775a5337,814381a9717b8ff158ecde36f501ef61e2b52bba..a3dbdae8a989370be0f8912502895c1db57ffbf5
--- 1/arch/arm/mach-at91/board-sam9263ek.c
--- 2/arch/arm/mach-at91/board-sam9263ek.c
+++ b/arch/arm/mach-at91/board-sam9263ek.c
@@@ -183,11 -183,16 +183,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PA22,
        .enable_pin     = AT91_PIN_PD15,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9g20ek.c
index 64fc75c9d0ac118730cac024eeb94c4d3da17611,a27069cbb584e583c0409df132ca9e0fb4ecf5f6..5206701b5ce9f80a074b06c57d56117efe3a83f5
--- 1/arch/arm/mach-at91/board-sam9g20ek.c
--- 2/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c
@@@ -163,8 -170,8 +164,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC13,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
+       .det_pin        = -EINVAL,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9m10g45ek.c
index 92de9127923a6dd0ecf6b61780129a1e3e9d6cf2,8e7d8ad3f5b081271b169c76239625c8561a563c..9ba1adbdc57c1495c71e58b7452accada82205c0
--- 1/arch/arm/mach-at91/board-sam9m10g45ek.c
--- 2/arch/arm/mach-at91/board-sam9m10g45ek.c
+++ b/arch/arm/mach-at91/board-sam9m10g45ek.c
@@@ -143,8 -150,8 +144,9 @@@ static struct atmel_nand_data __initdat
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC8,
        .enable_pin     = AT91_PIN_PC14,
 -      .partition_info = nand_partitions,
+       .det_pin        = -EINVAL,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-sam9rlek.c
index b2b748239f365ab77627a6d96a7c442be91fd161,39fc576962f405c6dedd86e234e67f83f0a8fde2..0d5ef5c65753698dd7a6cdf84e1307ff4814a34c
--- 1/arch/arm/mach-at91/board-sam9rlek.c
--- 2/arch/arm/mach-at91/board-sam9rlek.c
+++ b/arch/arm/mach-at91/board-sam9rlek.c
@@@ -91,11 -91,16 +91,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PD17,
        .enable_pin     = AT91_PIN_PB6,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata ek_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-snapper9260.c
index 0df01c6e2d0c1b458bc89ac41e46740302eda69b,17dae5003c333fc344437bd91481703ba31dcf0b..95b403113558d728a7cc0434e58b59ea03da8754
--- 1/arch/arm/mach-at91/board-snapper9260.c
--- 2/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@@ -101,9 -111,10 +104,11 @@@ static struct atmel_nand_data __initdat
        .ale            = 21,
        .cle            = 22,
        .rdy_pin        = AT91_PIN_PC13,
 -      .partition_info = snapper9260_nand_partition_info,
 +      .parts          = snapper9260_nand_partitions,
 +      .num_parts      = ARRAY_SIZE(snapper9260_nand_partitions),
        .bus_width_16   = 0,
+       .enable_pin     = -EINVAL,
+       .det_pin        = -EINVAL,
  };
  
  static struct sam9_smc_config __initdata snapper9260_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-usb-a926x.c
index 0a20bab21f998ef5597be890f9ed47977d27d19f,e5e78dd8d63caaeb3b866a099f15b8593eaec757..c9cff9ce1683f61167ca4ca434b5bcb7b0b64c66
--- 1/arch/arm/mach-at91/board-usb-a926x.c
--- 2/arch/arm/mach-at91/board-usb-a926x.c
+++ b/arch/arm/mach-at91/board-usb-a926x.c
@@@ -193,11 -194,16 +194,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata ek_nand_data = {
        .ale            = 21,
        .cle            = 22,
- //    .det_pin        = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PA22,
        .enable_pin     = AT91_PIN_PD15,
 -      .partition_info = nand_partitions,
 +      .parts          = ek_nand_partition,
 +      .num_parts      = ARRAY_SIZE(ek_nand_partition),
  };
  
  static struct sam9_smc_config __initdata usb_a9260_nand_smc_config = {

diff --cc arch/arm/mach-at91/board-yl-9200.c
index 649b052231f5aad9ea812547aed176bd3bd5ebcf,ecb8378b4af0478e2cca637e928af540f20879c1..1e83a62d717727603313366727d17f634f4131c9
--- 1/arch/arm/mach-at91/board-yl-9200.c
--- 2/arch/arm/mach-at91/board-yl-9200.c
+++ b/arch/arm/mach-at91/board-yl-9200.c
@@@ -175,11 -177,16 +177,11 @@@ static struct mtd_partition __initdata 
  static struct atmel_nand_data __initdata yl9200_nand_data = {
        .ale            = 6,
        .cle            = 7,
-       // .det_pin     = ... not connected
+       .det_pin        = -EINVAL,
        .rdy_pin        = AT91_PIN_PC14,        /* R/!B (Sheet10) */
        .enable_pin     = AT91_PIN_PC15,        /* !CE  (Sheet10) */
 -      .partition_info = nand_partitions,
 +      .parts          = yl9200_nand_partition,
 +      .num_parts      = ARRAY_SIZE(yl9200_nand_partition),
  };
  
  /*

diff --cc arch/arm/mach-at91/gpio.c
Simple merge

diff --cc arch/arm/mach-at91/include/mach/at91sam9g45.h
Simple merge

diff --cc arch/arm/mach-at91/include/mach/gpio.h
index 2b9a1f51210f0cc048048410bd9e801883e04bc9,5213879ff9033ee63286545d2b4d28749127a8dd..e3fd225121c748f7f592b0ebedfe095028e5845b
--- 1/arch/arm/mach-at91/include/mach/gpio.h
--- 2/arch/arm/mach-at91/include/mach/gpio.h
+++ b/arch/arm/mach-at91/include/mach/gpio.h
@@@ -214,9 -212,14 +212,9 @@@ extern void at91_gpio_resume(void)
   */
  
  #include <asm/errno.h>
 -#include <asm-generic/gpio.h>         /* cansleep wrappers */
 -
 -#define gpio_get_value        __gpio_get_value
 -#define gpio_set_value        __gpio_set_value
 -#define gpio_cansleep __gpio_cansleep
  
- #define gpio_to_irq(gpio) (gpio)
- #define irq_to_gpio(irq)  (irq)
+ #define gpio_to_irq(gpio) (gpio + NR_AIC_IRQS)
+ #define irq_to_gpio(irq)  (irq - NR_AIC_IRQS)
  
  #endif        /* __ASSEMBLY__ */
  

diff --cc drivers/ata/pata_at91.c
index a76f24a8e5db95a98b3f9dda9ecfc7dcab3eb4ce,39153531fa281d9c847548bb3bc324a6a0e2a146..5970503d671138a5abf572bc4b8e2f5907bde5de
--- 1/drivers/ata/pata_at91.c
--- 2/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
@@@ -414,13 -414,10 +414,13 @@@ static int __devinit pata_at91_probe(st
  
        host->private_data = info;
  
-       ret = ata_host_activate(host, irq ? gpio_to_irq(irq) : 0,
-                       irq ? ata_sff_interrupt : NULL,
 -      return ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
++      ret = ata_host_activate(host, gpio_is_valid(irq) ? gpio_to_irq(irq) : 0,
+                       gpio_is_valid(irq) ? ata_sff_interrupt : NULL,
                        irq_flags, &pata_at91_sht);
  
 +      if (!ret)
 +              return 0;
 +
  err_put:
        clk_put(info->mck);
        return ret;

diff --cc drivers/ide/at91_ide.c
Simple merge

diff --cc drivers/mmc/host/at91_mci.c
Simple merge

diff --cc drivers/mtd/nand/atmel_nand.c
Simple merge

diff --cc drivers/usb/gadget/at91_udc.c
Simple merge