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

Conflicts:
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9g45.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
Simple merge

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

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

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
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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/usb/gadget/at91_udc.c
Simple merge