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

From Nicolas Ferre:
Again some nice DT updates for AT91:
- DMA binding update with one patch shared with slave-dma tree
- more SPI DT activation
- enable the USB gadget HS for DT platforms

* tag 'at91-dt' of git://github.com/at91linux/linux-at91:
  ARM: at91: sam9m10g45ek add udc DT support
  ARM: at91: sam9g45 add udc DT support
  ARM: at91: sam9x5ek add udc DT support
  ARM: at91: sam9x5 add udc DT support
  ARM: at91: dt: at91sam9x5: add SPI DMA client infos
  ARM: at91: dt: switch DMA DT bindings to pre-processor
  ARM: at91: dt: add header to define at_hdmac configuration

diff --combined arch/arm/boot/dts/at91sam9g45.dtsi
index a03d0c05d027185bb0fce1c5115ee90ee3e00cf9,cb44bbb1d8cfb9e06cb0ce55c6d93063da25f529..c3e514837074c1874412e88cb294fd4ec976a2ba
--- 1/arch/arm/boot/dts/at91sam9g45.dtsi
--- 2/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@@ -10,6 -10,7 +10,7 @@@
   */
  
  #include "skeleton.dtsi"
+ #include <dt-bindings/dma/at91.h>
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
@@@ -38,12 -39,8 +39,12 @@@
                ssc1 = &ssc1;
        };
        cpus {
 -              cpu@0 {
 -                      compatible = "arm,arm926ejs";
 +              #address-cells = <0>;
 +              #size-cells = <0>;
 +
 +              cpu {
 +                      compatible = "arm,arm926ej-s";
 +                      device_type = "cpu";
                };
        };
  
@@@ -617,7 -614,7 +618,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma 1 0>;
+                               dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -628,7 -625,7 +629,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xfffd0000 0x600>;
                                interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma 1 13>;
+                               dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -662,6 -659,68 +663,68 @@@
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                        };
+ 
+                       usb2: gadget@fff78000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "atmel,at91sam9rl-udc";
+                               reg = <0x00600000 0x80000
+                                      0xfff78000 0x400>;
+                               interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
+                               status = "disabled";
+ 
+                               ep0 {
+                                       reg = <0>;
+                                       atmel,fifo-size = <64>;
+                                       atmel,nb-banks = <1>;
+                               };
+ 
+                               ep1 {
+                                       reg = <1>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <2>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep2 {
+                                       reg = <2>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <2>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep3 {
+                                       reg = <3>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                               };
+ 
+                               ep4 {
+                                       reg = <4>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                               };
+ 
+                               ep5 {
+                                       reg = <5>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep6 {
+                                       reg = <6>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+                       };
                };
  
                nand0: nand@40000000 {

diff --combined arch/arm/boot/dts/at91sam9n12.dtsi
index d37761846cd5987c3d75b3812883618801020beb,c7f0684c2c95702996df8a921d086b9411d2292e..973bf5fd98007797e210e568f7c5907fc79bf0fe
--- 1/arch/arm/boot/dts/at91sam9n12.dtsi
--- 2/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@@ -8,6 -8,7 +8,7 @@@
   */
  
  #include "skeleton.dtsi"
+ #include <dt-bindings/dma/at91.h>
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
@@@ -34,12 -35,8 +35,12 @@@
                ssc0 = &ssc0;
        };
        cpus {
 -              cpu@0 {
 -                      compatible = "arm,arm926ejs";
 +              #address-cells = <0>;
 +              #size-cells = <0>;
 +
 +              cpu {
 +                      compatible = "arm,arm926ej-s";
 +                      device_type = "cpu";
                };
        };
  
@@@ -64,7 -61,6 +65,7 @@@
                                compatible = "atmel,at91rm9200-aic";
                                interrupt-controller;
                                reg = <0xfffff000 0x200>;
 +                              atmel,external-irqs = <31>;
                        };
  
                        ramc0: ramc@ffffe800 {
@@@ -97,7 -93,7 +98,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf0008000 0x600>;
                                interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma 1 0>;
+                               dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -465,8 -461,8 +466,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8010000 0x100>;
                                interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma 1 13>,
-                                      <&dma 1 14>;
+                               dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>,
+                                      <&dma 1 AT91_DMA_CFG_PER_ID(14)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -477,8 -473,8 +478,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8014000 0x100>;
                                interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma 1 15>,
-                                      <&dma 1 16>;
+                               dmas = <&dma 1 AT91_DMA_CFG_PER_ID(15)>,
+                                      <&dma 1 AT91_DMA_CFG_PER_ID(16)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;

diff --combined arch/arm/boot/dts/at91sam9x5.dtsi
index ff4bd7a061b041bde53739f74f3e8753f0ed8bac,5a7b148e686c2e33abffff8c9dc36a0fde6c2d30..57d45f5bea09e77c72585fade7041521311bbf34
--- 1/arch/arm/boot/dts/at91sam9x5.dtsi
--- 2/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@@ -10,6 -10,7 +10,7 @@@
   */
  
  #include "skeleton.dtsi"
+ #include <dt-bindings/dma/at91.h>
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
@@@ -36,12 -37,8 +37,12 @@@
                ssc0 = &ssc0;
        };
        cpus {
 -              cpu@0 {
 -                      compatible = "arm,arm926ejs";
 +              #address-cells = <0>;
 +              #size-cells = <0>;
 +
 +              cpu {
 +                      compatible = "arm,arm926ej-s";
 +                      device_type = "cpu";
                };
        };
  
@@@ -550,7 -547,7 +551,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf0008000 0x600>;
                                interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma0 1 0>;
+                               dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -561,7 -558,7 +562,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf000c000 0x600>;
                                interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma1 1 0>;
+                               dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -624,8 -621,8 +625,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8010000 0x100>;
                                interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma0 1 7>,
-                                      <&dma0 1 8>;
+                               dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(7)>,
+                                      <&dma0 1 AT91_DMA_CFG_PER_ID(8)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -638,8 -635,8 +639,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8014000 0x100>;
                                interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma1 1 5>,
-                                      <&dma1 1 6>;
+                               dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(5)>,
+                                      <&dma1 1 AT91_DMA_CFG_PER_ID(6)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -652,8 -649,8 +653,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8018000 0x100>;
                                interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma0 1 9>,
-                                      <&dma0 1 10>;
+                               dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(9)>,
+                                      <&dma0 1 AT91_DMA_CFG_PER_ID(10)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;
@@@ -727,6 -724,9 +728,9 @@@
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0000000 0x100>;
                                interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
+                               dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(1)>,
+                                      <&dma0 1 AT91_DMA_CFG_PER_ID(2)>;
+                               dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
@@@ -738,11 -738,76 +742,76 @@@
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0004000 0x100>;
                                interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
+                               dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(1)>,
+                                      <&dma1 1 AT91_DMA_CFG_PER_ID(2)>;
+                               dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                        };
  
+                       usb2: gadget@f803c000 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "atmel,at91sam9rl-udc";
+                               reg = <0x00500000 0x80000
+                                      0xf803c000 0x400>;
+                               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
+                               status = "disabled";
+ 
+                               ep0 {
+                                       reg = <0>;
+                                       atmel,fifo-size = <64>;
+                                       atmel,nb-banks = <1>;
+                               };
+ 
+                               ep1 {
+                                       reg = <1>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <2>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep2 {
+                                       reg = <2>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <2>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep3 {
+                                       reg = <3>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                               };
+ 
+                               ep4 {
+                                       reg = <4>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                               };
+ 
+                               ep5 {
+                                       reg = <5>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+ 
+                               ep6 {
+                                       reg = <6>;
+                                       atmel,fifo-size = <1024>;
+                                       atmel,nb-banks = <3>;
+                                       atmel,can-dma;
+                                       atmel,can-isoc;
+                               };
+                       };
+ 
                        watchdog@fffffe40 {
                                compatible = "atmel,at91sam9260-wdt";
                                reg = <0xfffffe40 0x10>;

diff --combined arch/arm/boot/dts/sama5d3.dtsi
index f57ffbc97432b8ded53221129ce7f79e95917e54,03b8c02a409b4872c0e6c0f9abf9fe9ed903c699..bbf88d72295638544a983a5239741b1fa520359b
--- 1/arch/arm/boot/dts/sama5d3.dtsi
--- 2/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@@ -9,6 -9,7 +9,7 @@@
   */
  
  #include "skeleton.dtsi"
+ #include <dt-bindings/dma/at91.h>
  #include <dt-bindings/pinctrl/at91.h>
  #include <dt-bindings/interrupt-controller/irq.h>
  #include <dt-bindings/gpio/gpio.h>
@@@ -38,12 -39,8 +39,12 @@@
                ssc1 = &ssc1;
        };
        cpus {
 +              #address-cells = <1>;
 +              #size-cells = <0>;
                cpu@0 {
 +                      device_type = "cpu";
                        compatible = "arm,cortex-a5";
 +                      reg = <0x0>;
                };
        };
  
@@@ -67,7 -64,7 +68,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf0000000 0x600>;
                                interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma0 2 0>;
+                               dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>;
@@@ -82,6 -79,11 +83,6 @@@
                                compatible = "atmel,at91sam9x5-spi";
                                reg = <0xf0004000 0x100>;
                                interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
 -                              cs-gpios = <&pioD 13 0
 -                                          &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
 -                                          &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
 -                                          &pioD 16 0 /* conflicts with RTS0 and PWMFI3 */
 -                                         >;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
@@@ -115,8 -117,8 +116,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf0014000 0x4000>;
                                interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma0 2 7>,
-                                      <&dma0 2 8>;
+                               dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(7)>,
+                                      <&dma0 2 AT91_DMA_CFG_PER_ID(8)>;
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_i2c0>;
@@@ -129,8 -131,8 +130,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf0018000 0x4000>;
                                interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma0 2 9>,
-                                      <&dma0 2 10>;
+                               dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(9)>,
+                                      <&dma0 2 AT91_DMA_CFG_PER_ID(10)>;
                                dma-names = "tx", "rx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_i2c1>;
@@@ -158,7 -160,7 +159,7 @@@
                        };
  
                        macb0: ethernet@f0028000 {
 -                              compatible = "cnds,pc302-gem", "cdns,gem";
 +                              compatible = "cdns,pc302-gem", "cdns,gem";
                                reg = <0xf0028000 0x100>;
                                interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
@@@ -177,7 -179,7 +178,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf8000000 0x600>;
                                interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma1 2 0>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(0)>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>;
@@@ -190,7 -192,7 +191,7 @@@
                                compatible = "atmel,hsmci";
                                reg = <0xf8004000 0x600>;
                                interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
-                               dmas = <&dma1 2 1>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>;
@@@ -205,6 -207,11 +206,6 @@@
                                compatible = "atmel,at91sam9x5-spi";
                                reg = <0xf8008000 0x100>;
                                interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
 -                              cs-gpios = <&pioC 25 0
 -                                          &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
 -                                          &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
 -                                          &pioC 28 0 /* conflitcs with PWMFI0 and ISI_D9 */
 -                                         >;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
@@@ -303,8 -310,8 +304,8 @@@
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf801c000 0x4000>;
                                interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>;
-                               dmas = <&dma1 2 11>,
-                                      <&dma1 2 12>;
+                               dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(11)>,
+                                      <&dma1 2 AT91_DMA_CFG_PER_ID(12)>;
                                dma-names = "tx", "rx";
                                #address-cells = <1>;
                                #size-cells = <0>;