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/at91sam9x5.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/at91sam9x5.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index e77106ef2ee5..d4ce6407c048 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -10,6 +10,7 @@ | |||
10 | */ | 10 | */ |
11 | 11 | ||
12 | #include "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
13 | #include <dt-bindings/dma/at91.h> | ||
13 | #include <dt-bindings/pinctrl/at91.h> | 14 | #include <dt-bindings/pinctrl/at91.h> |
14 | #include <dt-bindings/interrupt-controller/irq.h> | 15 | #include <dt-bindings/interrupt-controller/irq.h> |
15 | #include <dt-bindings/gpio/gpio.h> | 16 | #include <dt-bindings/gpio/gpio.h> |
@@ -546,7 +547,7 @@ | |||
546 | compatible = "atmel,hsmci"; | 547 | compatible = "atmel,hsmci"; |
547 | reg = <0xf0008000 0x600>; | 548 | reg = <0xf0008000 0x600>; |
548 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; | 549 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; |
549 | dmas = <&dma0 1 0>; | 550 | dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(0)>; |
550 | dma-names = "rxtx"; | 551 | dma-names = "rxtx"; |
551 | #address-cells = <1>; | 552 | #address-cells = <1>; |
552 | #size-cells = <0>; | 553 | #size-cells = <0>; |
@@ -557,7 +558,7 @@ | |||
557 | compatible = "atmel,hsmci"; | 558 | compatible = "atmel,hsmci"; |
558 | reg = <0xf000c000 0x600>; | 559 | reg = <0xf000c000 0x600>; |
559 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>; | 560 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>; |
560 | dmas = <&dma1 1 0>; | 561 | dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(0)>; |
561 | dma-names = "rxtx"; | 562 | dma-names = "rxtx"; |
562 | #address-cells = <1>; | 563 | #address-cells = <1>; |
563 | #size-cells = <0>; | 564 | #size-cells = <0>; |
@@ -620,8 +621,8 @@ | |||
620 | compatible = "atmel,at91sam9x5-i2c"; | 621 | compatible = "atmel,at91sam9x5-i2c"; |
621 | reg = <0xf8010000 0x100>; | 622 | reg = <0xf8010000 0x100>; |
622 | interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>; | 623 | interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>; |
623 | dmas = <&dma0 1 7>, | 624 | dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(7)>, |
624 | <&dma0 1 8>; | 625 | <&dma0 1 AT91_DMA_CFG_PER_ID(8)>; |
625 | dma-names = "tx", "rx"; | 626 | dma-names = "tx", "rx"; |
626 | #address-cells = <1>; | 627 | #address-cells = <1>; |
627 | #size-cells = <0>; | 628 | #size-cells = <0>; |
@@ -634,8 +635,8 @@ | |||
634 | compatible = "atmel,at91sam9x5-i2c"; | 635 | compatible = "atmel,at91sam9x5-i2c"; |
635 | reg = <0xf8014000 0x100>; | 636 | reg = <0xf8014000 0x100>; |
636 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>; | 637 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>; |
637 | dmas = <&dma1 1 5>, | 638 | dmas = <&dma1 1 AT91_DMA_CFG_PER_ID(5)>, |
638 | <&dma1 1 6>; | 639 | <&dma1 1 AT91_DMA_CFG_PER_ID(6)>; |
639 | dma-names = "tx", "rx"; | 640 | dma-names = "tx", "rx"; |
640 | #address-cells = <1>; | 641 | #address-cells = <1>; |
641 | #size-cells = <0>; | 642 | #size-cells = <0>; |
@@ -648,8 +649,8 @@ | |||
648 | compatible = "atmel,at91sam9x5-i2c"; | 649 | compatible = "atmel,at91sam9x5-i2c"; |
649 | reg = <0xf8018000 0x100>; | 650 | reg = <0xf8018000 0x100>; |
650 | interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; | 651 | interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; |
651 | dmas = <&dma0 1 9>, | 652 | dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(9)>, |
652 | <&dma0 1 10>; | 653 | <&dma0 1 AT91_DMA_CFG_PER_ID(10)>; |
653 | dma-names = "tx", "rx"; | 654 | dma-names = "tx", "rx"; |
654 | #address-cells = <1>; | 655 | #address-cells = <1>; |
655 | #size-cells = <0>; | 656 | #size-cells = <0>; |