diff options
author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2013-05-30 12:08:22 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-06-14 18:12:30 -0400 |
commit | d4ae89c8ae2c302c25591a5adee0e0832427a8e2 (patch) | |
tree | 083aaba9417dd077c050a913333ff7d642e48478 /arch/arm/boot/dts/sama5d3.dtsi | |
parent | ca79522c3f4430facefd63d0da408038d4b0f5fe (diff) |
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>
Diffstat (limited to 'arch/arm/boot/dts/sama5d3.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sama5d3.dtsi | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi index c00e15872594..03b8c02a409b 100644 --- a/arch/arm/boot/dts/sama5d3.dtsi +++ b/arch/arm/boot/dts/sama5d3.dtsi | |||
@@ -9,6 +9,7 @@ | |||
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include "skeleton.dtsi" | 11 | #include "skeleton.dtsi" |
12 | #include <dt-bindings/dma/at91.h> | ||
12 | #include <dt-bindings/pinctrl/at91.h> | 13 | #include <dt-bindings/pinctrl/at91.h> |
13 | #include <dt-bindings/interrupt-controller/irq.h> | 14 | #include <dt-bindings/interrupt-controller/irq.h> |
14 | #include <dt-bindings/gpio/gpio.h> | 15 | #include <dt-bindings/gpio/gpio.h> |
@@ -63,7 +64,7 @@ | |||
63 | compatible = "atmel,hsmci"; | 64 | compatible = "atmel,hsmci"; |
64 | reg = <0xf0000000 0x600>; | 65 | reg = <0xf0000000 0x600>; |
65 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>; | 66 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>; |
66 | dmas = <&dma0 2 0>; | 67 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(0)>; |
67 | dma-names = "rxtx"; | 68 | dma-names = "rxtx"; |
68 | pinctrl-names = "default"; | 69 | pinctrl-names = "default"; |
69 | pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>; | 70 | pinctrl-0 = <&pinctrl_mmc0_clk_cmd_dat0 &pinctrl_mmc0_dat1_3 &pinctrl_mmc0_dat4_7>; |
@@ -116,8 +117,8 @@ | |||
116 | compatible = "atmel,at91sam9x5-i2c"; | 117 | compatible = "atmel,at91sam9x5-i2c"; |
117 | reg = <0xf0014000 0x4000>; | 118 | reg = <0xf0014000 0x4000>; |
118 | interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>; | 119 | interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>; |
119 | dmas = <&dma0 2 7>, | 120 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(7)>, |
120 | <&dma0 2 8>; | 121 | <&dma0 2 AT91_DMA_CFG_PER_ID(8)>; |
121 | dma-names = "tx", "rx"; | 122 | dma-names = "tx", "rx"; |
122 | pinctrl-names = "default"; | 123 | pinctrl-names = "default"; |
123 | pinctrl-0 = <&pinctrl_i2c0>; | 124 | pinctrl-0 = <&pinctrl_i2c0>; |
@@ -130,8 +131,8 @@ | |||
130 | compatible = "atmel,at91sam9x5-i2c"; | 131 | compatible = "atmel,at91sam9x5-i2c"; |
131 | reg = <0xf0018000 0x4000>; | 132 | reg = <0xf0018000 0x4000>; |
132 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>; | 133 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>; |
133 | dmas = <&dma0 2 9>, | 134 | dmas = <&dma0 2 AT91_DMA_CFG_PER_ID(9)>, |
134 | <&dma0 2 10>; | 135 | <&dma0 2 AT91_DMA_CFG_PER_ID(10)>; |
135 | dma-names = "tx", "rx"; | 136 | dma-names = "tx", "rx"; |
136 | pinctrl-names = "default"; | 137 | pinctrl-names = "default"; |
137 | pinctrl-0 = <&pinctrl_i2c1>; | 138 | pinctrl-0 = <&pinctrl_i2c1>; |
@@ -178,7 +179,7 @@ | |||
178 | compatible = "atmel,hsmci"; | 179 | compatible = "atmel,hsmci"; |
179 | reg = <0xf8000000 0x600>; | 180 | reg = <0xf8000000 0x600>; |
180 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>; | 181 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>; |
181 | dmas = <&dma1 2 0>; | 182 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(0)>; |
182 | dma-names = "rxtx"; | 183 | dma-names = "rxtx"; |
183 | pinctrl-names = "default"; | 184 | pinctrl-names = "default"; |
184 | pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; | 185 | pinctrl-0 = <&pinctrl_mmc1_clk_cmd_dat0 &pinctrl_mmc1_dat1_3>; |
@@ -191,7 +192,7 @@ | |||
191 | compatible = "atmel,hsmci"; | 192 | compatible = "atmel,hsmci"; |
192 | reg = <0xf8004000 0x600>; | 193 | reg = <0xf8004000 0x600>; |
193 | interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>; | 194 | interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>; |
194 | dmas = <&dma1 2 1>; | 195 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(1)>; |
195 | dma-names = "rxtx"; | 196 | dma-names = "rxtx"; |
196 | pinctrl-names = "default"; | 197 | pinctrl-names = "default"; |
197 | pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>; | 198 | pinctrl-0 = <&pinctrl_mmc2_clk_cmd_dat0 &pinctrl_mmc2_dat1_3>; |
@@ -309,8 +310,8 @@ | |||
309 | compatible = "atmel,at91sam9x5-i2c"; | 310 | compatible = "atmel,at91sam9x5-i2c"; |
310 | reg = <0xf801c000 0x4000>; | 311 | reg = <0xf801c000 0x4000>; |
311 | interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>; | 312 | interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>; |
312 | dmas = <&dma1 2 11>, | 313 | dmas = <&dma1 2 AT91_DMA_CFG_PER_ID(11)>, |
313 | <&dma1 2 12>; | 314 | <&dma1 2 AT91_DMA_CFG_PER_ID(12)>; |
314 | dma-names = "tx", "rx"; | 315 | dma-names = "tx", "rx"; |
315 | #address-cells = <1>; | 316 | #address-cells = <1>; |
316 | #size-cells = <0>; | 317 | #size-cells = <0>; |