diff options
author | Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> | 2013-04-23 20:34:25 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-05-17 06:11:50 -0400 |
commit | 5e8b3bc392180c89da15c7d73915517fba7cc140 (patch) | |
tree | 623bd62a542d8b19d50d7d9bd6451ece6376c9fc /arch/arm/boot/dts/at91sam9x5.dtsi | |
parent | c9d0f317c6dc45f84888bc11947bc10e6c547dc3 (diff) |
ARM: at91: dt: switch to standard IRQ flag defines
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.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 | 55 |
1 files changed, 28 insertions, 27 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index cfbf9235e8ae..af91599488e9 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include "skeleton.dtsi" | 12 | #include "skeleton.dtsi" |
13 | #include <dt-bindings/pinctrl/at91.h> | 13 | #include <dt-bindings/pinctrl/at91.h> |
14 | #include <dt-bindings/interrupt-controller/irq.h> | ||
14 | #include <dt-bindings/gpio/gpio.h> | 15 | #include <dt-bindings/gpio/gpio.h> |
15 | 16 | ||
16 | / { | 17 | / { |
@@ -87,32 +88,32 @@ | |||
87 | pit: timer@fffffe30 { | 88 | pit: timer@fffffe30 { |
88 | compatible = "atmel,at91sam9260-pit"; | 89 | compatible = "atmel,at91sam9260-pit"; |
89 | reg = <0xfffffe30 0xf>; | 90 | reg = <0xfffffe30 0xf>; |
90 | interrupts = <1 4 7>; | 91 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
91 | }; | 92 | }; |
92 | 93 | ||
93 | tcb0: timer@f8008000 { | 94 | tcb0: timer@f8008000 { |
94 | compatible = "atmel,at91sam9x5-tcb"; | 95 | compatible = "atmel,at91sam9x5-tcb"; |
95 | reg = <0xf8008000 0x100>; | 96 | reg = <0xf8008000 0x100>; |
96 | interrupts = <17 4 0>; | 97 | interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; |
97 | }; | 98 | }; |
98 | 99 | ||
99 | tcb1: timer@f800c000 { | 100 | tcb1: timer@f800c000 { |
100 | compatible = "atmel,at91sam9x5-tcb"; | 101 | compatible = "atmel,at91sam9x5-tcb"; |
101 | reg = <0xf800c000 0x100>; | 102 | reg = <0xf800c000 0x100>; |
102 | interrupts = <17 4 0>; | 103 | interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>; |
103 | }; | 104 | }; |
104 | 105 | ||
105 | dma0: dma-controller@ffffec00 { | 106 | dma0: dma-controller@ffffec00 { |
106 | compatible = "atmel,at91sam9g45-dma"; | 107 | compatible = "atmel,at91sam9g45-dma"; |
107 | reg = <0xffffec00 0x200>; | 108 | reg = <0xffffec00 0x200>; |
108 | interrupts = <20 4 0>; | 109 | interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>; |
109 | #dma-cells = <2>; | 110 | #dma-cells = <2>; |
110 | }; | 111 | }; |
111 | 112 | ||
112 | dma1: dma-controller@ffffee00 { | 113 | dma1: dma-controller@ffffee00 { |
113 | compatible = "atmel,at91sam9g45-dma"; | 114 | compatible = "atmel,at91sam9g45-dma"; |
114 | reg = <0xffffee00 0x200>; | 115 | reg = <0xffffee00 0x200>; |
115 | interrupts = <21 4 0>; | 116 | interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>; |
116 | #dma-cells = <2>; | 117 | #dma-cells = <2>; |
117 | }; | 118 | }; |
118 | 119 | ||
@@ -416,7 +417,7 @@ | |||
416 | pioA: gpio@fffff400 { | 417 | pioA: gpio@fffff400 { |
417 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 418 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
418 | reg = <0xfffff400 0x200>; | 419 | reg = <0xfffff400 0x200>; |
419 | interrupts = <2 4 1>; | 420 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>; |
420 | #gpio-cells = <2>; | 421 | #gpio-cells = <2>; |
421 | gpio-controller; | 422 | gpio-controller; |
422 | interrupt-controller; | 423 | interrupt-controller; |
@@ -426,7 +427,7 @@ | |||
426 | pioB: gpio@fffff600 { | 427 | pioB: gpio@fffff600 { |
427 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 428 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
428 | reg = <0xfffff600 0x200>; | 429 | reg = <0xfffff600 0x200>; |
429 | interrupts = <2 4 1>; | 430 | interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>; |
430 | #gpio-cells = <2>; | 431 | #gpio-cells = <2>; |
431 | gpio-controller; | 432 | gpio-controller; |
432 | #gpio-lines = <19>; | 433 | #gpio-lines = <19>; |
@@ -437,7 +438,7 @@ | |||
437 | pioC: gpio@fffff800 { | 438 | pioC: gpio@fffff800 { |
438 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 439 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
439 | reg = <0xfffff800 0x200>; | 440 | reg = <0xfffff800 0x200>; |
440 | interrupts = <3 4 1>; | 441 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>; |
441 | #gpio-cells = <2>; | 442 | #gpio-cells = <2>; |
442 | gpio-controller; | 443 | gpio-controller; |
443 | interrupt-controller; | 444 | interrupt-controller; |
@@ -447,7 +448,7 @@ | |||
447 | pioD: gpio@fffffa00 { | 448 | pioD: gpio@fffffa00 { |
448 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; | 449 | compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; |
449 | reg = <0xfffffa00 0x200>; | 450 | reg = <0xfffffa00 0x200>; |
450 | interrupts = <3 4 1>; | 451 | interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>; |
451 | #gpio-cells = <2>; | 452 | #gpio-cells = <2>; |
452 | gpio-controller; | 453 | gpio-controller; |
453 | #gpio-lines = <22>; | 454 | #gpio-lines = <22>; |
@@ -459,7 +460,7 @@ | |||
459 | ssc0: ssc@f0010000 { | 460 | ssc0: ssc@f0010000 { |
460 | compatible = "atmel,at91sam9g45-ssc"; | 461 | compatible = "atmel,at91sam9g45-ssc"; |
461 | reg = <0xf0010000 0x4000>; | 462 | reg = <0xf0010000 0x4000>; |
462 | interrupts = <28 4 5>; | 463 | interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>; |
463 | pinctrl-names = "default"; | 464 | pinctrl-names = "default"; |
464 | pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; | 465 | pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; |
465 | status = "disabled"; | 466 | status = "disabled"; |
@@ -468,7 +469,7 @@ | |||
468 | mmc0: mmc@f0008000 { | 469 | mmc0: mmc@f0008000 { |
469 | compatible = "atmel,hsmci"; | 470 | compatible = "atmel,hsmci"; |
470 | reg = <0xf0008000 0x600>; | 471 | reg = <0xf0008000 0x600>; |
471 | interrupts = <12 4 0>; | 472 | interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>; |
472 | dmas = <&dma0 1 0>; | 473 | dmas = <&dma0 1 0>; |
473 | dma-names = "rxtx"; | 474 | dma-names = "rxtx"; |
474 | #address-cells = <1>; | 475 | #address-cells = <1>; |
@@ -479,7 +480,7 @@ | |||
479 | mmc1: mmc@f000c000 { | 480 | mmc1: mmc@f000c000 { |
480 | compatible = "atmel,hsmci"; | 481 | compatible = "atmel,hsmci"; |
481 | reg = <0xf000c000 0x600>; | 482 | reg = <0xf000c000 0x600>; |
482 | interrupts = <26 4 0>; | 483 | interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>; |
483 | dmas = <&dma1 1 0>; | 484 | dmas = <&dma1 1 0>; |
484 | dma-names = "rxtx"; | 485 | dma-names = "rxtx"; |
485 | #address-cells = <1>; | 486 | #address-cells = <1>; |
@@ -490,7 +491,7 @@ | |||
490 | dbgu: serial@fffff200 { | 491 | dbgu: serial@fffff200 { |
491 | compatible = "atmel,at91sam9260-usart"; | 492 | compatible = "atmel,at91sam9260-usart"; |
492 | reg = <0xfffff200 0x200>; | 493 | reg = <0xfffff200 0x200>; |
493 | interrupts = <1 4 7>; | 494 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
494 | pinctrl-names = "default"; | 495 | pinctrl-names = "default"; |
495 | pinctrl-0 = <&pinctrl_dbgu>; | 496 | pinctrl-0 = <&pinctrl_dbgu>; |
496 | status = "disabled"; | 497 | status = "disabled"; |
@@ -499,7 +500,7 @@ | |||
499 | usart0: serial@f801c000 { | 500 | usart0: serial@f801c000 { |
500 | compatible = "atmel,at91sam9260-usart"; | 501 | compatible = "atmel,at91sam9260-usart"; |
501 | reg = <0xf801c000 0x200>; | 502 | reg = <0xf801c000 0x200>; |
502 | interrupts = <5 4 5>; | 503 | interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>; |
503 | pinctrl-names = "default"; | 504 | pinctrl-names = "default"; |
504 | pinctrl-0 = <&pinctrl_usart0>; | 505 | pinctrl-0 = <&pinctrl_usart0>; |
505 | status = "disabled"; | 506 | status = "disabled"; |
@@ -508,7 +509,7 @@ | |||
508 | usart1: serial@f8020000 { | 509 | usart1: serial@f8020000 { |
509 | compatible = "atmel,at91sam9260-usart"; | 510 | compatible = "atmel,at91sam9260-usart"; |
510 | reg = <0xf8020000 0x200>; | 511 | reg = <0xf8020000 0x200>; |
511 | interrupts = <6 4 5>; | 512 | interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>; |
512 | pinctrl-names = "default"; | 513 | pinctrl-names = "default"; |
513 | pinctrl-0 = <&pinctrl_usart1>; | 514 | pinctrl-0 = <&pinctrl_usart1>; |
514 | status = "disabled"; | 515 | status = "disabled"; |
@@ -517,7 +518,7 @@ | |||
517 | usart2: serial@f8024000 { | 518 | usart2: serial@f8024000 { |
518 | compatible = "atmel,at91sam9260-usart"; | 519 | compatible = "atmel,at91sam9260-usart"; |
519 | reg = <0xf8024000 0x200>; | 520 | reg = <0xf8024000 0x200>; |
520 | interrupts = <7 4 5>; | 521 | interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>; |
521 | pinctrl-names = "default"; | 522 | pinctrl-names = "default"; |
522 | pinctrl-0 = <&pinctrl_usart2>; | 523 | pinctrl-0 = <&pinctrl_usart2>; |
523 | status = "disabled"; | 524 | status = "disabled"; |
@@ -526,7 +527,7 @@ | |||
526 | macb0: ethernet@f802c000 { | 527 | macb0: ethernet@f802c000 { |
527 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 528 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; |
528 | reg = <0xf802c000 0x100>; | 529 | reg = <0xf802c000 0x100>; |
529 | interrupts = <24 4 3>; | 530 | interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>; |
530 | pinctrl-names = "default"; | 531 | pinctrl-names = "default"; |
531 | pinctrl-0 = <&pinctrl_macb0_rmii>; | 532 | pinctrl-0 = <&pinctrl_macb0_rmii>; |
532 | status = "disabled"; | 533 | status = "disabled"; |
@@ -535,14 +536,14 @@ | |||
535 | macb1: ethernet@f8030000 { | 536 | macb1: ethernet@f8030000 { |
536 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 537 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; |
537 | reg = <0xf8030000 0x100>; | 538 | reg = <0xf8030000 0x100>; |
538 | interrupts = <27 4 3>; | 539 | interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>; |
539 | status = "disabled"; | 540 | status = "disabled"; |
540 | }; | 541 | }; |
541 | 542 | ||
542 | i2c0: i2c@f8010000 { | 543 | i2c0: i2c@f8010000 { |
543 | compatible = "atmel,at91sam9x5-i2c"; | 544 | compatible = "atmel,at91sam9x5-i2c"; |
544 | reg = <0xf8010000 0x100>; | 545 | reg = <0xf8010000 0x100>; |
545 | interrupts = <9 4 6>; | 546 | interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>; |
546 | dmas = <&dma0 1 7>, | 547 | dmas = <&dma0 1 7>, |
547 | <&dma0 1 8>; | 548 | <&dma0 1 8>; |
548 | dma-names = "tx", "rx"; | 549 | dma-names = "tx", "rx"; |
@@ -556,7 +557,7 @@ | |||
556 | i2c1: i2c@f8014000 { | 557 | i2c1: i2c@f8014000 { |
557 | compatible = "atmel,at91sam9x5-i2c"; | 558 | compatible = "atmel,at91sam9x5-i2c"; |
558 | reg = <0xf8014000 0x100>; | 559 | reg = <0xf8014000 0x100>; |
559 | interrupts = <10 4 6>; | 560 | interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>; |
560 | dmas = <&dma1 1 5>, | 561 | dmas = <&dma1 1 5>, |
561 | <&dma1 1 6>; | 562 | <&dma1 1 6>; |
562 | dma-names = "tx", "rx"; | 563 | dma-names = "tx", "rx"; |
@@ -570,7 +571,7 @@ | |||
570 | i2c2: i2c@f8018000 { | 571 | i2c2: i2c@f8018000 { |
571 | compatible = "atmel,at91sam9x5-i2c"; | 572 | compatible = "atmel,at91sam9x5-i2c"; |
572 | reg = <0xf8018000 0x100>; | 573 | reg = <0xf8018000 0x100>; |
573 | interrupts = <11 4 6>; | 574 | interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>; |
574 | dmas = <&dma0 1 9>, | 575 | dmas = <&dma0 1 9>, |
575 | <&dma0 1 10>; | 576 | <&dma0 1 10>; |
576 | dma-names = "tx", "rx"; | 577 | dma-names = "tx", "rx"; |
@@ -584,7 +585,7 @@ | |||
584 | adc0: adc@f804c000 { | 585 | adc0: adc@f804c000 { |
585 | compatible = "atmel,at91sam9260-adc"; | 586 | compatible = "atmel,at91sam9260-adc"; |
586 | reg = <0xf804c000 0x100>; | 587 | reg = <0xf804c000 0x100>; |
587 | interrupts = <19 4 0>; | 588 | interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>; |
588 | atmel,adc-use-external; | 589 | atmel,adc-use-external; |
589 | atmel,adc-channels-used = <0xffff>; | 590 | atmel,adc-channels-used = <0xffff>; |
590 | atmel,adc-vref = <3300>; | 591 | atmel,adc-vref = <3300>; |
@@ -627,7 +628,7 @@ | |||
627 | #size-cells = <0>; | 628 | #size-cells = <0>; |
628 | compatible = "atmel,at91rm9200-spi"; | 629 | compatible = "atmel,at91rm9200-spi"; |
629 | reg = <0xf0000000 0x100>; | 630 | reg = <0xf0000000 0x100>; |
630 | interrupts = <13 4 3>; | 631 | interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>; |
631 | pinctrl-names = "default"; | 632 | pinctrl-names = "default"; |
632 | pinctrl-0 = <&pinctrl_spi0>; | 633 | pinctrl-0 = <&pinctrl_spi0>; |
633 | status = "disabled"; | 634 | status = "disabled"; |
@@ -638,7 +639,7 @@ | |||
638 | #size-cells = <0>; | 639 | #size-cells = <0>; |
639 | compatible = "atmel,at91rm9200-spi"; | 640 | compatible = "atmel,at91rm9200-spi"; |
640 | reg = <0xf0004000 0x100>; | 641 | reg = <0xf0004000 0x100>; |
641 | interrupts = <14 4 3>; | 642 | interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>; |
642 | pinctrl-names = "default"; | 643 | pinctrl-names = "default"; |
643 | pinctrl-0 = <&pinctrl_spi1>; | 644 | pinctrl-0 = <&pinctrl_spi1>; |
644 | status = "disabled"; | 645 | status = "disabled"; |
@@ -647,7 +648,7 @@ | |||
647 | rtc@fffffeb0 { | 648 | rtc@fffffeb0 { |
648 | compatible = "atmel,at91rm9200-rtc"; | 649 | compatible = "atmel,at91rm9200-rtc"; |
649 | reg = <0xfffffeb0 0x40>; | 650 | reg = <0xfffffeb0 0x40>; |
650 | interrupts = <1 4 7>; | 651 | interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>; |
651 | status = "disabled"; | 652 | status = "disabled"; |
652 | }; | 653 | }; |
653 | }; | 654 | }; |
@@ -676,14 +677,14 @@ | |||
676 | usb0: ohci@00600000 { | 677 | usb0: ohci@00600000 { |
677 | compatible = "atmel,at91rm9200-ohci", "usb-ohci"; | 678 | compatible = "atmel,at91rm9200-ohci", "usb-ohci"; |
678 | reg = <0x00600000 0x100000>; | 679 | reg = <0x00600000 0x100000>; |
679 | interrupts = <22 4 2>; | 680 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; |
680 | status = "disabled"; | 681 | status = "disabled"; |
681 | }; | 682 | }; |
682 | 683 | ||
683 | usb1: ehci@00700000 { | 684 | usb1: ehci@00700000 { |
684 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; | 685 | compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; |
685 | reg = <0x00700000 0x100000>; | 686 | reg = <0x00700000 0x100000>; |
686 | interrupts = <22 4 2>; | 687 | interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>; |
687 | status = "disabled"; | 688 | status = "disabled"; |
688 | }; | 689 | }; |
689 | }; | 690 | }; |