Merge remote-tracking branch 'asoc/topic/atmel' into asoc-next

diff --combined arch/arm/mach-at91/at91rm9200_devices.c
index 3cee0e6ea7c3c126ec3b319497b01cf335f3f16a,f40925a552a1534c18c47ec37e2c98c61cdc2d81..9e76427aaec29a0065963e8633196f598bc9d2bc
--- 1/arch/arm/mach-at91/at91rm9200_devices.c
--- 2/arch/arm/mach-at91/at91rm9200_devices.c
+++ b/arch/arm/mach-at91/at91rm9200_devices.c
@@@ -68,7 -68,7 +68,7 @@@ void __init at91_add_device_usbh(struc
  
        /* Enable overcurrent notification */
        for (i = 0; i < data->ports; i++) {
 -              if (data->overcurrent_pin[i])
 +              if (gpio_is_valid(data->overcurrent_pin[i]))
                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
        }
  
@@@ -752,7 -752,7 +752,7 @@@ static struct resource ssc0_resources[
  };
  
  static struct platform_device at91rm9200_ssc0_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc0_dmamask,
@@@ -794,7 -794,7 +794,7 @@@ static struct resource ssc1_resources[
  };
  
  static struct platform_device at91rm9200_ssc1_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 1,
        .dev    = {
                .dma_mask               = &ssc1_dmamask,
@@@ -836,7 -836,7 +836,7 @@@ static struct resource ssc2_resources[
  };
  
  static struct platform_device at91rm9200_ssc2_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 2,
        .dev    = {
                .dma_mask               = &ssc2_dmamask,

diff --combined arch/arm/mach-at91/at91sam9260_devices.c
index 414bd855fb0cb7fd1d0295012016937175d9c449,6959fd2c6555280f54e578d9e7a200e07ba743e1..e67cfa2acbe00d05fe773630113b3331cc4661eb
--- 1/arch/arm/mach-at91/at91sam9260_devices.c
--- 2/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -72,7 -72,7 +72,7 @@@ void __init at91_add_device_usbh(struc
  
        /* Enable overcurrent notification */
        for (i = 0; i < data->ports; i++) {
 -              if (data->overcurrent_pin[i])
 +              if (gpio_is_valid(data->overcurrent_pin[i]))
                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
        }
  
@@@ -742,7 -742,7 +742,7 @@@ static struct resource ssc_resources[] 
  };
  
  static struct platform_device at91sam9260_ssc_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc_dmamask,

diff --combined arch/arm/mach-at91/at91sam9261_devices.c
index cd604aad8e963c217301df7fa421637d1b0315a3,d8afd2130b7994dccfe38138ba980ab3269ff4d5..a27d9dd0faa4a99b9a07e5416c7f0cc96ee18f73
--- 1/arch/arm/mach-at91/at91sam9261_devices.c
--- 2/arch/arm/mach-at91/at91sam9261_devices.c
+++ b/arch/arm/mach-at91/at91sam9261_devices.c
@@@ -72,7 -72,7 +72,7 @@@ void __init at91_add_device_usbh(struc
  
        /* Enable overcurrent notification */
        for (i = 0; i < data->ports; i++) {
 -              if (data->overcurrent_pin[i])
 +              if (gpio_is_valid(data->overcurrent_pin[i]))
                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
        }
  
@@@ -706,7 -706,7 +706,7 @@@ static struct resource ssc0_resources[
  };
  
  static struct platform_device at91sam9261_ssc0_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc0_dmamask,
@@@ -748,7 -748,7 +748,7 @@@ static struct resource ssc1_resources[
  };
  
  static struct platform_device at91sam9261_ssc1_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 1,
        .dev    = {
                .dma_mask               = &ssc1_dmamask,
@@@ -790,7 -790,7 +790,7 @@@ static struct resource ssc2_resources[
  };
  
  static struct platform_device at91sam9261_ssc2_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 2,
        .dev    = {
                .dma_mask               = &ssc2_dmamask,

diff --combined arch/arm/mach-at91/at91sam9263_devices.c
index 9c61e59a2104e7f0399fc0dca4ea926d7136d4f9,025c9704bfe6c8763e1ec8fc119cacf885270a87..8215839f2d540a46db98a83eeddf4228122c75b8
--- 1/arch/arm/mach-at91/at91sam9263_devices.c
--- 2/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@@ -78,7 -78,7 +78,7 @@@ void __init at91_add_device_usbh(struc
  
        /* Enable overcurrent notification */
        for (i = 0; i < data->ports; i++) {
 -              if (data->overcurrent_pin[i])
 +              if (gpio_is_valid(data->overcurrent_pin[i]))
                        at91_set_gpio_input(data->overcurrent_pin[i], 1);
        }
  
@@@ -1199,7 -1199,7 +1199,7 @@@ static struct resource ssc0_resources[
  };
  
  static struct platform_device at91sam9263_ssc0_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc0_dmamask,
@@@ -1241,7 -1241,7 +1241,7 @@@ static struct resource ssc1_resources[
  };
  
  static struct platform_device at91sam9263_ssc1_device = {
-       .name   = "ssc",
+       .name   = "at91rm9200_ssc",
        .id     = 1,
        .dev    = {
                .dma_mask               = &ssc1_dmamask,

diff --combined arch/arm/mach-at91/at91sam9g45_devices.c
index fcd233cb33d25d68417a992c3b09fac45e63501a,27e3bf64a8bc3c2c845b9869252f3be01f30b296..d26474a97fec884e1ef0338400cbf68b00d0ceae
--- 1/arch/arm/mach-at91/at91sam9g45_devices.c
--- 2/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@@ -1459,7 -1459,7 +1459,7 @@@ static struct resource ssc0_resources[
  };
  
  static struct platform_device at91sam9g45_ssc0_device = {
-       .name   = "ssc",
+       .name   = "at91sam9g45_ssc",
        .id     = 0,
        .dev    = {
                .dma_mask               = &ssc0_dmamask,
@@@ -1501,7 -1501,7 +1501,7 @@@ static struct resource ssc1_resources[
  };
  
  static struct platform_device at91sam9g45_ssc1_device = {
-       .name   = "ssc",
+       .name   = "at91sam9g45_ssc",
        .id     = 1,
        .dev    = {
                .dma_mask               = &ssc1_dmamask,
@@@ -1841,8 -1841,8 +1841,8 @@@ static struct resource sha_resources[] 
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
 -              .start  = AT91SAM9G45_ID_AESTDESSHA,
 -              .end    = AT91SAM9G45_ID_AESTDESSHA,
 +              .start  = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
 +              .end    = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
                .flags  = IORESOURCE_IRQ,
        },
  };
@@@ -1874,8 -1874,8 +1874,8 @@@ static struct resource tdes_resources[
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
 -              .start  = AT91SAM9G45_ID_AESTDESSHA,
 -              .end    = AT91SAM9G45_ID_AESTDESSHA,
 +              .start  = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
 +              .end    = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
                .flags  = IORESOURCE_IRQ,
        },
  };
@@@ -1910,8 -1910,8 +1910,8 @@@ static struct resource aes_resources[] 
                .flags  = IORESOURCE_MEM,
        },
        [1] = {
 -              .start  = AT91SAM9G45_ID_AESTDESSHA,
 -              .end    = AT91SAM9G45_ID_AESTDESSHA,
 +              .start  = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
 +              .end    = NR_IRQS_LEGACY + AT91SAM9G45_ID_AESTDESSHA,
                .flags  = IORESOURCE_IRQ,
        },
  };