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/at91sam9n12.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/at91sam9n12.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi index 3166e1d06c18..c7f0684c2c95 100644 --- a/arch/arm/boot/dts/at91sam9n12.dtsi +++ b/arch/arm/boot/dts/at91sam9n12.dtsi | |||
@@ -8,6 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "skeleton.dtsi" | 10 | #include "skeleton.dtsi" |
11 | #include <dt-bindings/dma/at91.h> | ||
11 | #include <dt-bindings/pinctrl/at91.h> | 12 | #include <dt-bindings/pinctrl/at91.h> |
12 | #include <dt-bindings/interrupt-controller/irq.h> | 13 | #include <dt-bindings/interrupt-controller/irq.h> |
13 | #include <dt-bindings/gpio/gpio.h> | 14 | #include <dt-bindings/gpio/gpio.h> |
@@ -92,7 +93,7 @@ | |||
92 | compatible = "atmel,hsmci"; | 93 | compatible = "atmel,hsmci"; |
93 | reg = <0xf0008000 0x600>; | 94 | reg = <0xf0008000 0x600>; |
94 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; | 95 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; |
95 | dmas = <&dma 1 0>; | 96 | dmas = <&dma 1 AT91_DMA_CFG_PER_ID(0)>; |
96 | dma-names = "rxtx"; | 97 | dma-names = "rxtx"; |
97 | #address-cells = <1>; | 98 | #address-cells = <1>; |
98 | #size-cells = <0>; | 99 | #size-cells = <0>; |
@@ -460,8 +461,8 @@ | |||
460 | compatible = "atmel,at91sam9x5-i2c"; | 461 | compatible = "atmel,at91sam9x5-i2c"; |
461 | reg = <0xf8010000 0x100>; | 462 | reg = <0xf8010000 0x100>; |
462 | interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>; | 463 | interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>; |
463 | dmas = <&dma 1 13>, | 464 | dmas = <&dma 1 AT91_DMA_CFG_PER_ID(13)>, |
464 | <&dma 1 14>; | 465 | <&dma 1 AT91_DMA_CFG_PER_ID(14)>; |
465 | dma-names = "tx", "rx"; | 466 | dma-names = "tx", "rx"; |
466 | #address-cells = <1>; | 467 | #address-cells = <1>; |
467 | #size-cells = <0>; | 468 | #size-cells = <0>; |
@@ -472,8 +473,8 @@ | |||
472 | compatible = "atmel,at91sam9x5-i2c"; | 473 | compatible = "atmel,at91sam9x5-i2c"; |
473 | reg = <0xf8014000 0x100>; | 474 | reg = <0xf8014000 0x100>; |
474 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>; | 475 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>; |
475 | dmas = <&dma 1 15>, | 476 | dmas = <&dma 1 AT91_DMA_CFG_PER_ID(15)>, |
476 | <&dma 1 16>; | 477 | <&dma 1 AT91_DMA_CFG_PER_ID(16)>; |
477 | dma-names = "tx", "rx"; | 478 | dma-names = "tx", "rx"; |
478 | #address-cells = <1>; | 479 | #address-cells = <1>; |
479 | #size-cells = <0>; | 480 | #size-cells = <0>; |