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, 10 insertions, 9 deletions

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index f57ffbc97432..bbf88d722956 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -9,6 +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>
@@ -67,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>;
@@ -115,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 +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>;
@@ -177,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 +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>;
@@ -303,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>;