ARM: at91: dt: switch DMA DT bindings to pre-processor

Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index faec17d1bb33fbf04cc1ec2b3aaaee60e94ca40a..6bb74fef19390e9b17f54410a6f29d27d06a54bb 100644 (file)
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.dtsi
@@ -10,6 +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>
@@ -613,7 +614,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>;
@@ -624,7 +625,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>;

diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index 3166e1d06c18681e3b1833587f53c440ee642e7e..c7f0684c2c95702996df8a921d086b9411d2292e 100644 (file)
--- 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>
@@ -92,7 +93,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>;
@@ -460,8 +461,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>;
@@ -472,8 +473,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 --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index e77106ef2ee56189a9eddc225616268453a9f26f..d4ce6407c04857e6dfdba1563ea9c83e411ae140 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -10,6 +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>
@@ -546,7 +547,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>;
@@ -557,7 +558,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>;
@@ -620,8 +621,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>;
@@ -634,8 +635,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>;
@@ -648,8 +649,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>;

diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index c00e15872594112b87e7f2d04f6144f4d047adf4..03b8c02a409b4872c0e6c0f9abf9fe9ed903c699 100644 (file)
--- 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>
@@ -63,7 +64,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>;
@@ -116,8 +117,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>;
@@ -130,8 +131,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>;
@@ -178,7 +179,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>;
@@ -191,7 +192,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>;
@@ -309,8 +310,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>;