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

1 files changed, 6 insertions, 5 deletions

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index d37761846cd5..973bf5fd9800 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -8,6 +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>
@@ -97,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 +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 +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>;