aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2013-04-23 20:34:25 -0400
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-05-17 06:11:50 -0400
commit5e8b3bc392180c89da15c7d73915517fba7cc140 (patch)
tree623bd62a542d8b19d50d7d9bd6451ece6376c9fc
parentc9d0f317c6dc45f84888bc11947bc10e6c547dc3 (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>
-rw-r--r--arch/arm/boot/dts/at91rm9200.dtsi45
-rw-r--r--arch/arm/boot/dts/at91sam9260.dtsi49
-rw-r--r--arch/arm/boot/dts/at91sam9263.dtsi43
-rw-r--r--arch/arm/boot/dts/at91sam9g45.dtsi49
-rw-r--r--arch/arm/boot/dts/at91sam9n12.dtsi41
-rw-r--r--arch/arm/boot/dts/at91sam9x5.dtsi55
-rw-r--r--arch/arm/boot/dts/sama5d3.dtsi79
7 files changed, 188 insertions, 173 deletions
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 361a957767c4..4aad0d9f5462 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -12,6 +12,7 @@
12 12
13#include "skeleton.dtsi" 13#include "skeleton.dtsi"
14#include <dt-bindings/pinctrl/at91.h> 14#include <dt-bindings/pinctrl/at91.h>
15#include <dt-bindings/interrupt-controller/irq.h>
15#include <dt-bindings/gpio/gpio.h> 16#include <dt-bindings/gpio/gpio.h>
16 17
17/ { 18/ {
@@ -79,25 +80,29 @@
79 st: timer@fffffd00 { 80 st: timer@fffffd00 {
80 compatible = "atmel,at91rm9200-st"; 81 compatible = "atmel,at91rm9200-st";
81 reg = <0xfffffd00 0x100>; 82 reg = <0xfffffd00 0x100>;
82 interrupts = <1 4 7>; 83 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
83 }; 84 };
84 85
85 tcb0: timer@fffa0000 { 86 tcb0: timer@fffa0000 {
86 compatible = "atmel,at91rm9200-tcb"; 87 compatible = "atmel,at91rm9200-tcb";
87 reg = <0xfffa0000 0x100>; 88 reg = <0xfffa0000 0x100>;
88 interrupts = <17 4 0 18 4 0 19 4 0>; 89 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
90 18 IRQ_TYPE_LEVEL_HIGH 0
91 19 IRQ_TYPE_LEVEL_HIGH 0>;
89 }; 92 };
90 93
91 tcb1: timer@fffa4000 { 94 tcb1: timer@fffa4000 {
92 compatible = "atmel,at91rm9200-tcb"; 95 compatible = "atmel,at91rm9200-tcb";
93 reg = <0xfffa4000 0x100>; 96 reg = <0xfffa4000 0x100>;
94 interrupts = <20 4 0 21 4 0 22 4 0>; 97 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
98 21 IRQ_TYPE_LEVEL_HIGH 0
99 22 IRQ_TYPE_LEVEL_HIGH 0>;
95 }; 100 };
96 101
97 i2c0: i2c@fffb8000 { 102 i2c0: i2c@fffb8000 {
98 compatible = "atmel,at91rm9200-i2c"; 103 compatible = "atmel,at91rm9200-i2c";
99 reg = <0xfffb8000 0x4000>; 104 reg = <0xfffb8000 0x4000>;
100 interrupts = <12 4 6>; 105 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
101 pinctrl-names = "default"; 106 pinctrl-names = "default";
102 pinctrl-0 = <&pinctrl_twi>; 107 pinctrl-0 = <&pinctrl_twi>;
103 #address-cells = <1>; 108 #address-cells = <1>;
@@ -108,7 +113,7 @@
108 mmc0: mmc@fffb4000 { 113 mmc0: mmc@fffb4000 {
109 compatible = "atmel,hsmci"; 114 compatible = "atmel,hsmci";
110 reg = <0xfffb4000 0x4000>; 115 reg = <0xfffb4000 0x4000>;
111 interrupts = <10 4 0>; 116 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
112 #address-cells = <1>; 117 #address-cells = <1>;
113 #size-cells = <0>; 118 #size-cells = <0>;
114 status = "disabled"; 119 status = "disabled";
@@ -117,7 +122,7 @@
117 ssc0: ssc@fffd0000 { 122 ssc0: ssc@fffd0000 {
118 compatible = "atmel,at91rm9200-ssc"; 123 compatible = "atmel,at91rm9200-ssc";
119 reg = <0xfffd0000 0x4000>; 124 reg = <0xfffd0000 0x4000>;
120 interrupts = <14 4 5>; 125 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
121 pinctrl-names = "default"; 126 pinctrl-names = "default";
122 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 127 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
123 status = "disable"; 128 status = "disable";
@@ -126,7 +131,7 @@
126 ssc1: ssc@fffd4000 { 131 ssc1: ssc@fffd4000 {
127 compatible = "atmel,at91rm9200-ssc"; 132 compatible = "atmel,at91rm9200-ssc";
128 reg = <0xfffd4000 0x4000>; 133 reg = <0xfffd4000 0x4000>;
129 interrupts = <15 4 5>; 134 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
130 pinctrl-names = "default"; 135 pinctrl-names = "default";
131 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 136 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
132 status = "disable"; 137 status = "disable";
@@ -135,7 +140,7 @@
135 ssc2: ssc@fffd8000 { 140 ssc2: ssc@fffd8000 {
136 compatible = "atmel,at91rm9200-ssc"; 141 compatible = "atmel,at91rm9200-ssc";
137 reg = <0xfffd8000 0x4000>; 142 reg = <0xfffd8000 0x4000>;
138 interrupts = <16 4 5>; 143 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
139 pinctrl-names = "default"; 144 pinctrl-names = "default";
140 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>; 145 pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
141 status = "disable"; 146 status = "disable";
@@ -144,7 +149,7 @@
144 macb0: ethernet@fffbc000 { 149 macb0: ethernet@fffbc000 {
145 compatible = "cdns,at91rm9200-emac", "cdns,emac"; 150 compatible = "cdns,at91rm9200-emac", "cdns,emac";
146 reg = <0xfffbc000 0x4000>; 151 reg = <0xfffbc000 0x4000>;
147 interrupts = <24 4 3>; 152 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
148 phy-mode = "rmii"; 153 phy-mode = "rmii";
149 pinctrl-names = "default"; 154 pinctrl-names = "default";
150 pinctrl-0 = <&pinctrl_macb_rmii>; 155 pinctrl-0 = <&pinctrl_macb_rmii>;
@@ -396,7 +401,7 @@
396 pioA: gpio@fffff400 { 401 pioA: gpio@fffff400 {
397 compatible = "atmel,at91rm9200-gpio"; 402 compatible = "atmel,at91rm9200-gpio";
398 reg = <0xfffff400 0x200>; 403 reg = <0xfffff400 0x200>;
399 interrupts = <2 4 1>; 404 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
400 #gpio-cells = <2>; 405 #gpio-cells = <2>;
401 gpio-controller; 406 gpio-controller;
402 interrupt-controller; 407 interrupt-controller;
@@ -406,7 +411,7 @@
406 pioB: gpio@fffff600 { 411 pioB: gpio@fffff600 {
407 compatible = "atmel,at91rm9200-gpio"; 412 compatible = "atmel,at91rm9200-gpio";
408 reg = <0xfffff600 0x200>; 413 reg = <0xfffff600 0x200>;
409 interrupts = <3 4 1>; 414 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
410 #gpio-cells = <2>; 415 #gpio-cells = <2>;
411 gpio-controller; 416 gpio-controller;
412 interrupt-controller; 417 interrupt-controller;
@@ -416,7 +421,7 @@
416 pioC: gpio@fffff800 { 421 pioC: gpio@fffff800 {
417 compatible = "atmel,at91rm9200-gpio"; 422 compatible = "atmel,at91rm9200-gpio";
418 reg = <0xfffff800 0x200>; 423 reg = <0xfffff800 0x200>;
419 interrupts = <4 4 1>; 424 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
420 #gpio-cells = <2>; 425 #gpio-cells = <2>;
421 gpio-controller; 426 gpio-controller;
422 interrupt-controller; 427 interrupt-controller;
@@ -426,7 +431,7 @@
426 pioD: gpio@fffffa00 { 431 pioD: gpio@fffffa00 {
427 compatible = "atmel,at91rm9200-gpio"; 432 compatible = "atmel,at91rm9200-gpio";
428 reg = <0xfffffa00 0x200>; 433 reg = <0xfffffa00 0x200>;
429 interrupts = <5 4 1>; 434 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
430 #gpio-cells = <2>; 435 #gpio-cells = <2>;
431 gpio-controller; 436 gpio-controller;
432 interrupt-controller; 437 interrupt-controller;
@@ -437,7 +442,7 @@
437 dbgu: serial@fffff200 { 442 dbgu: serial@fffff200 {
438 compatible = "atmel,at91rm9200-usart"; 443 compatible = "atmel,at91rm9200-usart";
439 reg = <0xfffff200 0x200>; 444 reg = <0xfffff200 0x200>;
440 interrupts = <1 4 7>; 445 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
441 pinctrl-names = "default"; 446 pinctrl-names = "default";
442 pinctrl-0 = <&pinctrl_dbgu>; 447 pinctrl-0 = <&pinctrl_dbgu>;
443 status = "disabled"; 448 status = "disabled";
@@ -446,7 +451,7 @@
446 usart0: serial@fffc0000 { 451 usart0: serial@fffc0000 {
447 compatible = "atmel,at91rm9200-usart"; 452 compatible = "atmel,at91rm9200-usart";
448 reg = <0xfffc0000 0x200>; 453 reg = <0xfffc0000 0x200>;
449 interrupts = <6 4 5>; 454 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
450 atmel,use-dma-rx; 455 atmel,use-dma-rx;
451 atmel,use-dma-tx; 456 atmel,use-dma-tx;
452 pinctrl-names = "default"; 457 pinctrl-names = "default";
@@ -457,7 +462,7 @@
457 usart1: serial@fffc4000 { 462 usart1: serial@fffc4000 {
458 compatible = "atmel,at91rm9200-usart"; 463 compatible = "atmel,at91rm9200-usart";
459 reg = <0xfffc4000 0x200>; 464 reg = <0xfffc4000 0x200>;
460 interrupts = <7 4 5>; 465 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
461 atmel,use-dma-rx; 466 atmel,use-dma-rx;
462 atmel,use-dma-tx; 467 atmel,use-dma-tx;
463 pinctrl-names = "default"; 468 pinctrl-names = "default";
@@ -468,7 +473,7 @@
468 usart2: serial@fffc8000 { 473 usart2: serial@fffc8000 {
469 compatible = "atmel,at91rm9200-usart"; 474 compatible = "atmel,at91rm9200-usart";
470 reg = <0xfffc8000 0x200>; 475 reg = <0xfffc8000 0x200>;
471 interrupts = <8 4 5>; 476 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
472 atmel,use-dma-rx; 477 atmel,use-dma-rx;
473 atmel,use-dma-tx; 478 atmel,use-dma-tx;
474 pinctrl-names = "default"; 479 pinctrl-names = "default";
@@ -479,7 +484,7 @@
479 usart3: serial@fffcc000 { 484 usart3: serial@fffcc000 {
480 compatible = "atmel,at91rm9200-usart"; 485 compatible = "atmel,at91rm9200-usart";
481 reg = <0xfffcc000 0x200>; 486 reg = <0xfffcc000 0x200>;
482 interrupts = <23 4 5>; 487 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
483 atmel,use-dma-rx; 488 atmel,use-dma-rx;
484 atmel,use-dma-tx; 489 atmel,use-dma-tx;
485 pinctrl-names = "default"; 490 pinctrl-names = "default";
@@ -490,7 +495,7 @@
490 usb1: gadget@fffb0000 { 495 usb1: gadget@fffb0000 {
491 compatible = "atmel,at91rm9200-udc"; 496 compatible = "atmel,at91rm9200-udc";
492 reg = <0xfffb0000 0x4000>; 497 reg = <0xfffb0000 0x4000>;
493 interrupts = <11 4 2>; 498 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
494 status = "disabled"; 499 status = "disabled";
495 }; 500 };
496 }; 501 };
@@ -515,7 +520,7 @@
515 usb0: ohci@00300000 { 520 usb0: ohci@00300000 {
516 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 521 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
517 reg = <0x00300000 0x100000>; 522 reg = <0x00300000 0x100000>;
518 interrupts = <23 4 2>; 523 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
519 status = "disabled"; 524 status = "disabled";
520 }; 525 };
521 }; 526 };
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index 7edadf348915..a776f50f1243 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -10,6 +10,7 @@
10 10
11#include "skeleton.dtsi" 11#include "skeleton.dtsi"
12#include <dt-bindings/pinctrl/at91.h> 12#include <dt-bindings/pinctrl/at91.h>
13#include <dt-bindings/interrupt-controller/irq.h>
13#include <dt-bindings/gpio/gpio.h> 14#include <dt-bindings/gpio/gpio.h>
14 15
15/ { 16/ {
@@ -86,19 +87,23 @@
86 pit: timer@fffffd30 { 87 pit: timer@fffffd30 {
87 compatible = "atmel,at91sam9260-pit"; 88 compatible = "atmel,at91sam9260-pit";
88 reg = <0xfffffd30 0xf>; 89 reg = <0xfffffd30 0xf>;
89 interrupts = <1 4 7>; 90 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
90 }; 91 };
91 92
92 tcb0: timer@fffa0000 { 93 tcb0: timer@fffa0000 {
93 compatible = "atmel,at91rm9200-tcb"; 94 compatible = "atmel,at91rm9200-tcb";
94 reg = <0xfffa0000 0x100>; 95 reg = <0xfffa0000 0x100>;
95 interrupts = <17 4 0 18 4 0 19 4 0>; 96 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
97 18 IRQ_TYPE_LEVEL_HIGH 0
98 19 IRQ_TYPE_LEVEL_HIGH 0>;
96 }; 99 };
97 100
98 tcb1: timer@fffdc000 { 101 tcb1: timer@fffdc000 {
99 compatible = "atmel,at91rm9200-tcb"; 102 compatible = "atmel,at91rm9200-tcb";
100 reg = <0xfffdc000 0x100>; 103 reg = <0xfffdc000 0x100>;
101 interrupts = <26 4 0 27 4 0 28 4 0>; 104 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0
105 27 IRQ_TYPE_LEVEL_HIGH 0
106 28 IRQ_TYPE_LEVEL_HIGH 0>;
102 }; 107 };
103 108
104 pinctrl@fffff400 { 109 pinctrl@fffff400 {
@@ -345,7 +350,7 @@
345 pioA: gpio@fffff400 { 350 pioA: gpio@fffff400 {
346 compatible = "atmel,at91rm9200-gpio"; 351 compatible = "atmel,at91rm9200-gpio";
347 reg = <0xfffff400 0x200>; 352 reg = <0xfffff400 0x200>;
348 interrupts = <2 4 1>; 353 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
349 #gpio-cells = <2>; 354 #gpio-cells = <2>;
350 gpio-controller; 355 gpio-controller;
351 interrupt-controller; 356 interrupt-controller;
@@ -355,7 +360,7 @@
355 pioB: gpio@fffff600 { 360 pioB: gpio@fffff600 {
356 compatible = "atmel,at91rm9200-gpio"; 361 compatible = "atmel,at91rm9200-gpio";
357 reg = <0xfffff600 0x200>; 362 reg = <0xfffff600 0x200>;
358 interrupts = <3 4 1>; 363 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
359 #gpio-cells = <2>; 364 #gpio-cells = <2>;
360 gpio-controller; 365 gpio-controller;
361 interrupt-controller; 366 interrupt-controller;
@@ -365,7 +370,7 @@
365 pioC: gpio@fffff800 { 370 pioC: gpio@fffff800 {
366 compatible = "atmel,at91rm9200-gpio"; 371 compatible = "atmel,at91rm9200-gpio";
367 reg = <0xfffff800 0x200>; 372 reg = <0xfffff800 0x200>;
368 interrupts = <4 4 1>; 373 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
369 #gpio-cells = <2>; 374 #gpio-cells = <2>;
370 gpio-controller; 375 gpio-controller;
371 interrupt-controller; 376 interrupt-controller;
@@ -376,7 +381,7 @@
376 dbgu: serial@fffff200 { 381 dbgu: serial@fffff200 {
377 compatible = "atmel,at91sam9260-usart"; 382 compatible = "atmel,at91sam9260-usart";
378 reg = <0xfffff200 0x200>; 383 reg = <0xfffff200 0x200>;
379 interrupts = <1 4 7>; 384 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
380 pinctrl-names = "default"; 385 pinctrl-names = "default";
381 pinctrl-0 = <&pinctrl_dbgu>; 386 pinctrl-0 = <&pinctrl_dbgu>;
382 status = "disabled"; 387 status = "disabled";
@@ -385,7 +390,7 @@
385 usart0: serial@fffb0000 { 390 usart0: serial@fffb0000 {
386 compatible = "atmel,at91sam9260-usart"; 391 compatible = "atmel,at91sam9260-usart";
387 reg = <0xfffb0000 0x200>; 392 reg = <0xfffb0000 0x200>;
388 interrupts = <6 4 5>; 393 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
389 atmel,use-dma-rx; 394 atmel,use-dma-rx;
390 atmel,use-dma-tx; 395 atmel,use-dma-tx;
391 pinctrl-names = "default"; 396 pinctrl-names = "default";
@@ -396,7 +401,7 @@
396 usart1: serial@fffb4000 { 401 usart1: serial@fffb4000 {
397 compatible = "atmel,at91sam9260-usart"; 402 compatible = "atmel,at91sam9260-usart";
398 reg = <0xfffb4000 0x200>; 403 reg = <0xfffb4000 0x200>;
399 interrupts = <7 4 5>; 404 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
400 atmel,use-dma-rx; 405 atmel,use-dma-rx;
401 atmel,use-dma-tx; 406 atmel,use-dma-tx;
402 pinctrl-names = "default"; 407 pinctrl-names = "default";
@@ -407,7 +412,7 @@
407 usart2: serial@fffb8000 { 412 usart2: serial@fffb8000 {
408 compatible = "atmel,at91sam9260-usart"; 413 compatible = "atmel,at91sam9260-usart";
409 reg = <0xfffb8000 0x200>; 414 reg = <0xfffb8000 0x200>;
410 interrupts = <8 4 5>; 415 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
411 atmel,use-dma-rx; 416 atmel,use-dma-rx;
412 atmel,use-dma-tx; 417 atmel,use-dma-tx;
413 pinctrl-names = "default"; 418 pinctrl-names = "default";
@@ -418,7 +423,7 @@
418 usart3: serial@fffd0000 { 423 usart3: serial@fffd0000 {
419 compatible = "atmel,at91sam9260-usart"; 424 compatible = "atmel,at91sam9260-usart";
420 reg = <0xfffd0000 0x200>; 425 reg = <0xfffd0000 0x200>;
421 interrupts = <23 4 5>; 426 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
422 atmel,use-dma-rx; 427 atmel,use-dma-rx;
423 atmel,use-dma-tx; 428 atmel,use-dma-tx;
424 pinctrl-names = "default"; 429 pinctrl-names = "default";
@@ -429,7 +434,7 @@
429 uart0: serial@fffd4000 { 434 uart0: serial@fffd4000 {
430 compatible = "atmel,at91sam9260-usart"; 435 compatible = "atmel,at91sam9260-usart";
431 reg = <0xfffd4000 0x200>; 436 reg = <0xfffd4000 0x200>;
432 interrupts = <24 4 5>; 437 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 5>;
433 atmel,use-dma-rx; 438 atmel,use-dma-rx;
434 atmel,use-dma-tx; 439 atmel,use-dma-tx;
435 pinctrl-names = "default"; 440 pinctrl-names = "default";
@@ -440,7 +445,7 @@
440 uart1: serial@fffd8000 { 445 uart1: serial@fffd8000 {
441 compatible = "atmel,at91sam9260-usart"; 446 compatible = "atmel,at91sam9260-usart";
442 reg = <0xfffd8000 0x200>; 447 reg = <0xfffd8000 0x200>;
443 interrupts = <25 4 5>; 448 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 5>;
444 atmel,use-dma-rx; 449 atmel,use-dma-rx;
445 atmel,use-dma-tx; 450 atmel,use-dma-tx;
446 pinctrl-names = "default"; 451 pinctrl-names = "default";
@@ -451,7 +456,7 @@
451 macb0: ethernet@fffc4000 { 456 macb0: ethernet@fffc4000 {
452 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 457 compatible = "cdns,at32ap7000-macb", "cdns,macb";
453 reg = <0xfffc4000 0x100>; 458 reg = <0xfffc4000 0x100>;
454 interrupts = <21 4 3>; 459 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
455 pinctrl-names = "default"; 460 pinctrl-names = "default";
456 pinctrl-0 = <&pinctrl_macb_rmii>; 461 pinctrl-0 = <&pinctrl_macb_rmii>;
457 status = "disabled"; 462 status = "disabled";
@@ -460,14 +465,14 @@
460 usb1: gadget@fffa4000 { 465 usb1: gadget@fffa4000 {
461 compatible = "atmel,at91rm9200-udc"; 466 compatible = "atmel,at91rm9200-udc";
462 reg = <0xfffa4000 0x4000>; 467 reg = <0xfffa4000 0x4000>;
463 interrupts = <10 4 2>; 468 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
464 status = "disabled"; 469 status = "disabled";
465 }; 470 };
466 471
467 i2c0: i2c@fffac000 { 472 i2c0: i2c@fffac000 {
468 compatible = "atmel,at91sam9260-i2c"; 473 compatible = "atmel,at91sam9260-i2c";
469 reg = <0xfffac000 0x100>; 474 reg = <0xfffac000 0x100>;
470 interrupts = <11 4 6>; 475 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
471 #address-cells = <1>; 476 #address-cells = <1>;
472 #size-cells = <0>; 477 #size-cells = <0>;
473 status = "disabled"; 478 status = "disabled";
@@ -476,7 +481,7 @@
476 mmc0: mmc@fffa8000 { 481 mmc0: mmc@fffa8000 {
477 compatible = "atmel,hsmci"; 482 compatible = "atmel,hsmci";
478 reg = <0xfffa8000 0x600>; 483 reg = <0xfffa8000 0x600>;
479 interrupts = <9 4 0>; 484 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;
480 #address-cells = <1>; 485 #address-cells = <1>;
481 #size-cells = <0>; 486 #size-cells = <0>;
482 status = "disabled"; 487 status = "disabled";
@@ -485,7 +490,7 @@
485 ssc0: ssc@fffbc000 { 490 ssc0: ssc@fffbc000 {
486 compatible = "atmel,at91rm9200-ssc"; 491 compatible = "atmel,at91rm9200-ssc";
487 reg = <0xfffbc000 0x4000>; 492 reg = <0xfffbc000 0x4000>;
488 interrupts = <14 4 5>; 493 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
489 pinctrl-names = "default"; 494 pinctrl-names = "default";
490 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 495 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
491 status = "disabled"; 496 status = "disabled";
@@ -496,7 +501,7 @@
496 #size-cells = <0>; 501 #size-cells = <0>;
497 compatible = "atmel,at91rm9200-spi"; 502 compatible = "atmel,at91rm9200-spi";
498 reg = <0xfffc8000 0x200>; 503 reg = <0xfffc8000 0x200>;
499 interrupts = <12 4 3>; 504 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
500 pinctrl-names = "default"; 505 pinctrl-names = "default";
501 pinctrl-0 = <&pinctrl_spi0>; 506 pinctrl-0 = <&pinctrl_spi0>;
502 status = "disabled"; 507 status = "disabled";
@@ -507,7 +512,7 @@
507 #size-cells = <0>; 512 #size-cells = <0>;
508 compatible = "atmel,at91rm9200-spi"; 513 compatible = "atmel,at91rm9200-spi";
509 reg = <0xfffcc000 0x200>; 514 reg = <0xfffcc000 0x200>;
510 interrupts = <13 4 3>; 515 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
511 pinctrl-names = "default"; 516 pinctrl-names = "default";
512 pinctrl-0 = <&pinctrl_spi1>; 517 pinctrl-0 = <&pinctrl_spi1>;
513 status = "disabled"; 518 status = "disabled";
@@ -516,7 +521,7 @@
516 adc0: adc@fffe0000 { 521 adc0: adc@fffe0000 {
517 compatible = "atmel,at91sam9260-adc"; 522 compatible = "atmel,at91sam9260-adc";
518 reg = <0xfffe0000 0x100>; 523 reg = <0xfffe0000 0x100>;
519 interrupts = <5 4 0>; 524 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
520 atmel,adc-use-external-triggers; 525 atmel,adc-use-external-triggers;
521 atmel,adc-channels-used = <0xf>; 526 atmel,adc-channels-used = <0xf>;
522 atmel,adc-vref = <3300>; 527 atmel,adc-vref = <3300>;
@@ -579,7 +584,7 @@
579 usb0: ohci@00500000 { 584 usb0: ohci@00500000 {
580 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 585 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
581 reg = <0x00500000 0x100000>; 586 reg = <0x00500000 0x100000>;
582 interrupts = <20 4 2>; 587 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
583 status = "disabled"; 588 status = "disabled";
584 }; 589 };
585 }; 590 };
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index bb4d7ca24b93..d9cf51a01b60 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -8,6 +8,7 @@
8 8
9#include "skeleton.dtsi" 9#include "skeleton.dtsi"
10#include <dt-bindings/pinctrl/at91.h> 10#include <dt-bindings/pinctrl/at91.h>
11#include <dt-bindings/interrupt-controller/irq.h>
11#include <dt-bindings/gpio/gpio.h> 12#include <dt-bindings/gpio/gpio.h>
12 13
13/ { 14/ {
@@ -74,13 +75,13 @@
74 pit: timer@fffffd30 { 75 pit: timer@fffffd30 {
75 compatible = "atmel,at91sam9260-pit"; 76 compatible = "atmel,at91sam9260-pit";
76 reg = <0xfffffd30 0xf>; 77 reg = <0xfffffd30 0xf>;
77 interrupts = <1 4 7>; 78 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
78 }; 79 };
79 80
80 tcb0: timer@fff7c000 { 81 tcb0: timer@fff7c000 {
81 compatible = "atmel,at91rm9200-tcb"; 82 compatible = "atmel,at91rm9200-tcb";
82 reg = <0xfff7c000 0x100>; 83 reg = <0xfff7c000 0x100>;
83 interrupts = <19 4 0>; 84 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
84 }; 85 };
85 86
86 rstc@fffffd00 { 87 rstc@fffffd00 {
@@ -326,7 +327,7 @@
326 pioA: gpio@fffff200 { 327 pioA: gpio@fffff200 {
327 compatible = "atmel,at91rm9200-gpio"; 328 compatible = "atmel,at91rm9200-gpio";
328 reg = <0xfffff200 0x200>; 329 reg = <0xfffff200 0x200>;
329 interrupts = <2 4 1>; 330 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
330 #gpio-cells = <2>; 331 #gpio-cells = <2>;
331 gpio-controller; 332 gpio-controller;
332 interrupt-controller; 333 interrupt-controller;
@@ -336,7 +337,7 @@
336 pioB: gpio@fffff400 { 337 pioB: gpio@fffff400 {
337 compatible = "atmel,at91rm9200-gpio"; 338 compatible = "atmel,at91rm9200-gpio";
338 reg = <0xfffff400 0x200>; 339 reg = <0xfffff400 0x200>;
339 interrupts = <3 4 1>; 340 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
340 #gpio-cells = <2>; 341 #gpio-cells = <2>;
341 gpio-controller; 342 gpio-controller;
342 interrupt-controller; 343 interrupt-controller;
@@ -346,7 +347,7 @@
346 pioC: gpio@fffff600 { 347 pioC: gpio@fffff600 {
347 compatible = "atmel,at91rm9200-gpio"; 348 compatible = "atmel,at91rm9200-gpio";
348 reg = <0xfffff600 0x200>; 349 reg = <0xfffff600 0x200>;
349 interrupts = <4 4 1>; 350 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
350 #gpio-cells = <2>; 351 #gpio-cells = <2>;
351 gpio-controller; 352 gpio-controller;
352 interrupt-controller; 353 interrupt-controller;
@@ -356,7 +357,7 @@
356 pioD: gpio@fffff800 { 357 pioD: gpio@fffff800 {
357 compatible = "atmel,at91rm9200-gpio"; 358 compatible = "atmel,at91rm9200-gpio";
358 reg = <0xfffff800 0x200>; 359 reg = <0xfffff800 0x200>;
359 interrupts = <4 4 1>; 360 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
360 #gpio-cells = <2>; 361 #gpio-cells = <2>;
361 gpio-controller; 362 gpio-controller;
362 interrupt-controller; 363 interrupt-controller;
@@ -366,7 +367,7 @@
366 pioE: gpio@fffffa00 { 367 pioE: gpio@fffffa00 {
367 compatible = "atmel,at91rm9200-gpio"; 368 compatible = "atmel,at91rm9200-gpio";
368 reg = <0xfffffa00 0x200>; 369 reg = <0xfffffa00 0x200>;
369 interrupts = <4 4 1>; 370 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
370 #gpio-cells = <2>; 371 #gpio-cells = <2>;
371 gpio-controller; 372 gpio-controller;
372 interrupt-controller; 373 interrupt-controller;
@@ -377,7 +378,7 @@
377 dbgu: serial@ffffee00 { 378 dbgu: serial@ffffee00 {
378 compatible = "atmel,at91sam9260-usart"; 379 compatible = "atmel,at91sam9260-usart";
379 reg = <0xffffee00 0x200>; 380 reg = <0xffffee00 0x200>;
380 interrupts = <1 4 7>; 381 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
381 pinctrl-names = "default"; 382 pinctrl-names = "default";
382 pinctrl-0 = <&pinctrl_dbgu>; 383 pinctrl-0 = <&pinctrl_dbgu>;
383 status = "disabled"; 384 status = "disabled";
@@ -386,7 +387,7 @@
386 usart0: serial@fff8c000 { 387 usart0: serial@fff8c000 {
387 compatible = "atmel,at91sam9260-usart"; 388 compatible = "atmel,at91sam9260-usart";
388 reg = <0xfff8c000 0x200>; 389 reg = <0xfff8c000 0x200>;
389 interrupts = <7 4 5>; 390 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
390 atmel,use-dma-rx; 391 atmel,use-dma-rx;
391 atmel,use-dma-tx; 392 atmel,use-dma-tx;
392 pinctrl-names = "default"; 393 pinctrl-names = "default";
@@ -397,7 +398,7 @@
397 usart1: serial@fff90000 { 398 usart1: serial@fff90000 {
398 compatible = "atmel,at91sam9260-usart"; 399 compatible = "atmel,at91sam9260-usart";
399 reg = <0xfff90000 0x200>; 400 reg = <0xfff90000 0x200>;
400 interrupts = <8 4 5>; 401 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
401 atmel,use-dma-rx; 402 atmel,use-dma-rx;
402 atmel,use-dma-tx; 403 atmel,use-dma-tx;
403 pinctrl-names = "default"; 404 pinctrl-names = "default";
@@ -408,7 +409,7 @@
408 usart2: serial@fff94000 { 409 usart2: serial@fff94000 {
409 compatible = "atmel,at91sam9260-usart"; 410 compatible = "atmel,at91sam9260-usart";
410 reg = <0xfff94000 0x200>; 411 reg = <0xfff94000 0x200>;
411 interrupts = <9 4 5>; 412 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
412 atmel,use-dma-rx; 413 atmel,use-dma-rx;
413 atmel,use-dma-tx; 414 atmel,use-dma-tx;
414 pinctrl-names = "default"; 415 pinctrl-names = "default";
@@ -419,7 +420,7 @@
419 ssc0: ssc@fff98000 { 420 ssc0: ssc@fff98000 {
420 compatible = "atmel,at91rm9200-ssc"; 421 compatible = "atmel,at91rm9200-ssc";
421 reg = <0xfff98000 0x4000>; 422 reg = <0xfff98000 0x4000>;
422 interrupts = <16 4 5>; 423 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
423 pinctrl-names = "default"; 424 pinctrl-names = "default";
424 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 425 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
425 status = "disabled"; 426 status = "disabled";
@@ -428,7 +429,7 @@
428 ssc1: ssc@fff9c000 { 429 ssc1: ssc@fff9c000 {
429 compatible = "atmel,at91rm9200-ssc"; 430 compatible = "atmel,at91rm9200-ssc";
430 reg = <0xfff9c000 0x4000>; 431 reg = <0xfff9c000 0x4000>;
431 interrupts = <17 4 5>; 432 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
432 pinctrl-names = "default"; 433 pinctrl-names = "default";
433 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 434 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
434 status = "disabled"; 435 status = "disabled";
@@ -437,7 +438,7 @@
437 macb0: ethernet@fffbc000 { 438 macb0: ethernet@fffbc000 {
438 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 439 compatible = "cdns,at32ap7000-macb", "cdns,macb";
439 reg = <0xfffbc000 0x100>; 440 reg = <0xfffbc000 0x100>;
440 interrupts = <21 4 3>; 441 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
441 pinctrl-names = "default"; 442 pinctrl-names = "default";
442 pinctrl-0 = <&pinctrl_macb_rmii>; 443 pinctrl-0 = <&pinctrl_macb_rmii>;
443 status = "disabled"; 444 status = "disabled";
@@ -446,14 +447,14 @@
446 usb1: gadget@fff78000 { 447 usb1: gadget@fff78000 {
447 compatible = "atmel,at91rm9200-udc"; 448 compatible = "atmel,at91rm9200-udc";
448 reg = <0xfff78000 0x4000>; 449 reg = <0xfff78000 0x4000>;
449 interrupts = <24 4 2>; 450 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
450 status = "disabled"; 451 status = "disabled";
451 }; 452 };
452 453
453 i2c0: i2c@fff88000 { 454 i2c0: i2c@fff88000 {
454 compatible = "atmel,at91sam9263-i2c"; 455 compatible = "atmel,at91sam9263-i2c";
455 reg = <0xfff88000 0x100>; 456 reg = <0xfff88000 0x100>;
456 interrupts = <13 4 6>; 457 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
457 #address-cells = <1>; 458 #address-cells = <1>;
458 #size-cells = <0>; 459 #size-cells = <0>;
459 status = "disabled"; 460 status = "disabled";
@@ -462,7 +463,7 @@
462 mmc0: mmc@fff80000 { 463 mmc0: mmc@fff80000 {
463 compatible = "atmel,hsmci"; 464 compatible = "atmel,hsmci";
464 reg = <0xfff80000 0x600>; 465 reg = <0xfff80000 0x600>;
465 interrupts = <10 4 0>; 466 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
466 #address-cells = <1>; 467 #address-cells = <1>;
467 #size-cells = <0>; 468 #size-cells = <0>;
468 status = "disabled"; 469 status = "disabled";
@@ -471,7 +472,7 @@
471 mmc1: mmc@fff84000 { 472 mmc1: mmc@fff84000 {
472 compatible = "atmel,hsmci"; 473 compatible = "atmel,hsmci";
473 reg = <0xfff84000 0x600>; 474 reg = <0xfff84000 0x600>;
474 interrupts = <11 4 0>; 475 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
475 #address-cells = <1>; 476 #address-cells = <1>;
476 #size-cells = <0>; 477 #size-cells = <0>;
477 status = "disabled"; 478 status = "disabled";
@@ -488,7 +489,7 @@
488 #size-cells = <0>; 489 #size-cells = <0>;
489 compatible = "atmel,at91rm9200-spi"; 490 compatible = "atmel,at91rm9200-spi";
490 reg = <0xfffa4000 0x200>; 491 reg = <0xfffa4000 0x200>;
491 interrupts = <14 4 3>; 492 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
492 pinctrl-names = "default"; 493 pinctrl-names = "default";
493 pinctrl-0 = <&pinctrl_spi0>; 494 pinctrl-0 = <&pinctrl_spi0>;
494 status = "disabled"; 495 status = "disabled";
@@ -499,7 +500,7 @@
499 #size-cells = <0>; 500 #size-cells = <0>;
500 compatible = "atmel,at91rm9200-spi"; 501 compatible = "atmel,at91rm9200-spi";
501 reg = <0xfffa8000 0x200>; 502 reg = <0xfffa8000 0x200>;
502 interrupts = <15 4 3>; 503 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 3>;
503 pinctrl-names = "default"; 504 pinctrl-names = "default";
504 pinctrl-0 = <&pinctrl_spi1>; 505 pinctrl-0 = <&pinctrl_spi1>;
505 status = "disabled"; 506 status = "disabled";
@@ -527,7 +528,7 @@
527 usb0: ohci@00a00000 { 528 usb0: ohci@00a00000 {
528 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 529 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
529 reg = <0x00a00000 0x100000>; 530 reg = <0x00a00000 0x100000>;
530 interrupts = <29 4 2>; 531 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
531 status = "disabled"; 532 status = "disabled";
532 }; 533 };
533 }; 534 };
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi
index 8ba4c71221d9..f0091af6c285 100644
--- a/arch/arm/boot/dts/at91sam9g45.dtsi
+++ b/arch/arm/boot/dts/at91sam9g45.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/ {
@@ -85,7 +86,7 @@
85 pit: timer@fffffd30 { 86 pit: timer@fffffd30 {
86 compatible = "atmel,at91sam9260-pit"; 87 compatible = "atmel,at91sam9260-pit";
87 reg = <0xfffffd30 0xf>; 88 reg = <0xfffffd30 0xf>;
88 interrupts = <1 4 7>; 89 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
89 }; 90 };
90 91
91 92
@@ -97,19 +98,19 @@
97 tcb0: timer@fff7c000 { 98 tcb0: timer@fff7c000 {
98 compatible = "atmel,at91rm9200-tcb"; 99 compatible = "atmel,at91rm9200-tcb";
99 reg = <0xfff7c000 0x100>; 100 reg = <0xfff7c000 0x100>;
100 interrupts = <18 4 0>; 101 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
101 }; 102 };
102 103
103 tcb1: timer@fffd4000 { 104 tcb1: timer@fffd4000 {
104 compatible = "atmel,at91rm9200-tcb"; 105 compatible = "atmel,at91rm9200-tcb";
105 reg = <0xfffd4000 0x100>; 106 reg = <0xfffd4000 0x100>;
106 interrupts = <18 4 0>; 107 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
107 }; 108 };
108 109
109 dma: dma-controller@ffffec00 { 110 dma: dma-controller@ffffec00 {
110 compatible = "atmel,at91sam9g45-dma"; 111 compatible = "atmel,at91sam9g45-dma";
111 reg = <0xffffec00 0x200>; 112 reg = <0xffffec00 0x200>;
112 interrupts = <21 4 0>; 113 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
113 #dma-cells = <2>; 114 #dma-cells = <2>;
114 }; 115 };
115 116
@@ -346,7 +347,7 @@
346 pioA: gpio@fffff200 { 347 pioA: gpio@fffff200 {
347 compatible = "atmel,at91rm9200-gpio"; 348 compatible = "atmel,at91rm9200-gpio";
348 reg = <0xfffff200 0x200>; 349 reg = <0xfffff200 0x200>;
349 interrupts = <2 4 1>; 350 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
350 #gpio-cells = <2>; 351 #gpio-cells = <2>;
351 gpio-controller; 352 gpio-controller;
352 interrupt-controller; 353 interrupt-controller;
@@ -356,7 +357,7 @@
356 pioB: gpio@fffff400 { 357 pioB: gpio@fffff400 {
357 compatible = "atmel,at91rm9200-gpio"; 358 compatible = "atmel,at91rm9200-gpio";
358 reg = <0xfffff400 0x200>; 359 reg = <0xfffff400 0x200>;
359 interrupts = <3 4 1>; 360 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
360 #gpio-cells = <2>; 361 #gpio-cells = <2>;
361 gpio-controller; 362 gpio-controller;
362 interrupt-controller; 363 interrupt-controller;
@@ -366,7 +367,7 @@
366 pioC: gpio@fffff600 { 367 pioC: gpio@fffff600 {
367 compatible = "atmel,at91rm9200-gpio"; 368 compatible = "atmel,at91rm9200-gpio";
368 reg = <0xfffff600 0x200>; 369 reg = <0xfffff600 0x200>;
369 interrupts = <4 4 1>; 370 interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
370 #gpio-cells = <2>; 371 #gpio-cells = <2>;
371 gpio-controller; 372 gpio-controller;
372 interrupt-controller; 373 interrupt-controller;
@@ -376,7 +377,7 @@
376 pioD: gpio@fffff800 { 377 pioD: gpio@fffff800 {
377 compatible = "atmel,at91rm9200-gpio"; 378 compatible = "atmel,at91rm9200-gpio";
378 reg = <0xfffff800 0x200>; 379 reg = <0xfffff800 0x200>;
379 interrupts = <5 4 1>; 380 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
380 #gpio-cells = <2>; 381 #gpio-cells = <2>;
381 gpio-controller; 382 gpio-controller;
382 interrupt-controller; 383 interrupt-controller;
@@ -386,7 +387,7 @@
386 pioE: gpio@fffffa00 { 387 pioE: gpio@fffffa00 {
387 compatible = "atmel,at91rm9200-gpio"; 388 compatible = "atmel,at91rm9200-gpio";
388 reg = <0xfffffa00 0x200>; 389 reg = <0xfffffa00 0x200>;
389 interrupts = <5 4 1>; 390 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
390 #gpio-cells = <2>; 391 #gpio-cells = <2>;
391 gpio-controller; 392 gpio-controller;
392 interrupt-controller; 393 interrupt-controller;
@@ -397,7 +398,7 @@
397 dbgu: serial@ffffee00 { 398 dbgu: serial@ffffee00 {
398 compatible = "atmel,at91sam9260-usart"; 399 compatible = "atmel,at91sam9260-usart";
399 reg = <0xffffee00 0x200>; 400 reg = <0xffffee00 0x200>;
400 interrupts = <1 4 7>; 401 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
401 pinctrl-names = "default"; 402 pinctrl-names = "default";
402 pinctrl-0 = <&pinctrl_dbgu>; 403 pinctrl-0 = <&pinctrl_dbgu>;
403 status = "disabled"; 404 status = "disabled";
@@ -406,7 +407,7 @@
406 usart0: serial@fff8c000 { 407 usart0: serial@fff8c000 {
407 compatible = "atmel,at91sam9260-usart"; 408 compatible = "atmel,at91sam9260-usart";
408 reg = <0xfff8c000 0x200>; 409 reg = <0xfff8c000 0x200>;
409 interrupts = <7 4 5>; 410 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
410 atmel,use-dma-rx; 411 atmel,use-dma-rx;
411 atmel,use-dma-tx; 412 atmel,use-dma-tx;
412 pinctrl-names = "default"; 413 pinctrl-names = "default";
@@ -417,7 +418,7 @@
417 usart1: serial@fff90000 { 418 usart1: serial@fff90000 {
418 compatible = "atmel,at91sam9260-usart"; 419 compatible = "atmel,at91sam9260-usart";
419 reg = <0xfff90000 0x200>; 420 reg = <0xfff90000 0x200>;
420 interrupts = <8 4 5>; 421 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
421 atmel,use-dma-rx; 422 atmel,use-dma-rx;
422 atmel,use-dma-tx; 423 atmel,use-dma-tx;
423 pinctrl-names = "default"; 424 pinctrl-names = "default";
@@ -428,7 +429,7 @@
428 usart2: serial@fff94000 { 429 usart2: serial@fff94000 {
429 compatible = "atmel,at91sam9260-usart"; 430 compatible = "atmel,at91sam9260-usart";
430 reg = <0xfff94000 0x200>; 431 reg = <0xfff94000 0x200>;
431 interrupts = <9 4 5>; 432 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
432 atmel,use-dma-rx; 433 atmel,use-dma-rx;
433 atmel,use-dma-tx; 434 atmel,use-dma-tx;
434 pinctrl-names = "default"; 435 pinctrl-names = "default";
@@ -439,7 +440,7 @@
439 usart3: serial@fff98000 { 440 usart3: serial@fff98000 {
440 compatible = "atmel,at91sam9260-usart"; 441 compatible = "atmel,at91sam9260-usart";
441 reg = <0xfff98000 0x200>; 442 reg = <0xfff98000 0x200>;
442 interrupts = <10 4 5>; 443 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 5>;
443 atmel,use-dma-rx; 444 atmel,use-dma-rx;
444 atmel,use-dma-tx; 445 atmel,use-dma-tx;
445 pinctrl-names = "default"; 446 pinctrl-names = "default";
@@ -450,7 +451,7 @@
450 macb0: ethernet@fffbc000 { 451 macb0: ethernet@fffbc000 {
451 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 452 compatible = "cdns,at32ap7000-macb", "cdns,macb";
452 reg = <0xfffbc000 0x100>; 453 reg = <0xfffbc000 0x100>;
453 interrupts = <25 4 3>; 454 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
454 pinctrl-names = "default"; 455 pinctrl-names = "default";
455 pinctrl-0 = <&pinctrl_macb_rmii>; 456 pinctrl-0 = <&pinctrl_macb_rmii>;
456 status = "disabled"; 457 status = "disabled";
@@ -459,7 +460,7 @@
459 i2c0: i2c@fff84000 { 460 i2c0: i2c@fff84000 {
460 compatible = "atmel,at91sam9g10-i2c"; 461 compatible = "atmel,at91sam9g10-i2c";
461 reg = <0xfff84000 0x100>; 462 reg = <0xfff84000 0x100>;
462 interrupts = <12 4 6>; 463 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
463 #address-cells = <1>; 464 #address-cells = <1>;
464 #size-cells = <0>; 465 #size-cells = <0>;
465 status = "disabled"; 466 status = "disabled";
@@ -468,7 +469,7 @@
468 i2c1: i2c@fff88000 { 469 i2c1: i2c@fff88000 {
469 compatible = "atmel,at91sam9g10-i2c"; 470 compatible = "atmel,at91sam9g10-i2c";
470 reg = <0xfff88000 0x100>; 471 reg = <0xfff88000 0x100>;
471 interrupts = <13 4 6>; 472 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
472 #address-cells = <1>; 473 #address-cells = <1>;
473 #size-cells = <0>; 474 #size-cells = <0>;
474 status = "disabled"; 475 status = "disabled";
@@ -477,7 +478,7 @@
477 ssc0: ssc@fff9c000 { 478 ssc0: ssc@fff9c000 {
478 compatible = "atmel,at91sam9g45-ssc"; 479 compatible = "atmel,at91sam9g45-ssc";
479 reg = <0xfff9c000 0x4000>; 480 reg = <0xfff9c000 0x4000>;
480 interrupts = <16 4 5>; 481 interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
481 pinctrl-names = "default"; 482 pinctrl-names = "default";
482 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 483 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
483 status = "disabled"; 484 status = "disabled";
@@ -486,7 +487,7 @@
486 ssc1: ssc@fffa0000 { 487 ssc1: ssc@fffa0000 {
487 compatible = "atmel,at91sam9g45-ssc"; 488 compatible = "atmel,at91sam9g45-ssc";
488 reg = <0xfffa0000 0x4000>; 489 reg = <0xfffa0000 0x4000>;
489 interrupts = <17 4 5>; 490 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
490 pinctrl-names = "default"; 491 pinctrl-names = "default";
491 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 492 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
492 status = "disabled"; 493 status = "disabled";
@@ -495,7 +496,7 @@
495 adc0: adc@fffb0000 { 496 adc0: adc@fffb0000 {
496 compatible = "atmel,at91sam9260-adc"; 497 compatible = "atmel,at91sam9260-adc";
497 reg = <0xfffb0000 0x100>; 498 reg = <0xfffb0000 0x100>;
498 interrupts = <20 4 0>; 499 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
499 atmel,adc-use-external-triggers; 500 atmel,adc-use-external-triggers;
500 atmel,adc-channels-used = <0xff>; 501 atmel,adc-channels-used = <0xff>;
501 atmel,adc-vref = <3300>; 502 atmel,adc-vref = <3300>;
@@ -535,7 +536,7 @@
535 mmc0: mmc@fff80000 { 536 mmc0: mmc@fff80000 {
536 compatible = "atmel,hsmci"; 537 compatible = "atmel,hsmci";
537 reg = <0xfff80000 0x600>; 538 reg = <0xfff80000 0x600>;
538 interrupts = <11 4 0>; 539 interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
539 dmas = <&dma 1 0>; 540 dmas = <&dma 1 0>;
540 dma-names = "rxtx"; 541 dma-names = "rxtx";
541 #address-cells = <1>; 542 #address-cells = <1>;
@@ -546,7 +547,7 @@
546 mmc1: mmc@fffd0000 { 547 mmc1: mmc@fffd0000 {
547 compatible = "atmel,hsmci"; 548 compatible = "atmel,hsmci";
548 reg = <0xfffd0000 0x600>; 549 reg = <0xfffd0000 0x600>;
549 interrupts = <29 4 0>; 550 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
550 dmas = <&dma 1 13>; 551 dmas = <&dma 1 13>;
551 dma-names = "rxtx"; 552 dma-names = "rxtx";
552 #address-cells = <1>; 553 #address-cells = <1>;
@@ -604,14 +605,14 @@
604 usb0: ohci@00700000 { 605 usb0: ohci@00700000 {
605 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 606 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
606 reg = <0x00700000 0x100000>; 607 reg = <0x00700000 0x100000>;
607 interrupts = <22 4 2>; 608 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
608 status = "disabled"; 609 status = "disabled";
609 }; 610 };
610 611
611 usb1: ehci@00800000 { 612 usb1: ehci@00800000 {
612 compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; 613 compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
613 reg = <0x00800000 0x100000>; 614 reg = <0x00800000 0x100000>;
614 interrupts = <22 4 2>; 615 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
615 status = "disabled"; 616 status = "disabled";
616 }; 617 };
617 }; 618 };
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index e166e0c53f5e..566af323c4f9 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -9,6 +9,7 @@
9 9
10#include "skeleton.dtsi" 10#include "skeleton.dtsi"
11#include <dt-bindings/pinctrl/at91.h> 11#include <dt-bindings/pinctrl/at91.h>
12#include <dt-bindings/interrupt-controller/irq.h>
12#include <dt-bindings/gpio/gpio.h> 13#include <dt-bindings/gpio/gpio.h>
13 14
14/ { 15/ {
@@ -79,7 +80,7 @@
79 pit: timer@fffffe30 { 80 pit: timer@fffffe30 {
80 compatible = "atmel,at91sam9260-pit"; 81 compatible = "atmel,at91sam9260-pit";
81 reg = <0xfffffe30 0xf>; 82 reg = <0xfffffe30 0xf>;
82 interrupts = <1 4 7>; 83 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
83 }; 84 };
84 85
85 shdwc@fffffe10 { 86 shdwc@fffffe10 {
@@ -90,7 +91,7 @@
90 mmc0: mmc@f0008000 { 91 mmc0: mmc@f0008000 {
91 compatible = "atmel,hsmci"; 92 compatible = "atmel,hsmci";
92 reg = <0xf0008000 0x600>; 93 reg = <0xf0008000 0x600>;
93 interrupts = <12 4 0>; 94 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
94 dmas = <&dma 1 0>; 95 dmas = <&dma 1 0>;
95 dma-names = "rxtx"; 96 dma-names = "rxtx";
96 #address-cells = <1>; 97 #address-cells = <1>;
@@ -101,19 +102,19 @@
101 tcb0: timer@f8008000 { 102 tcb0: timer@f8008000 {
102 compatible = "atmel,at91sam9x5-tcb"; 103 compatible = "atmel,at91sam9x5-tcb";
103 reg = <0xf8008000 0x100>; 104 reg = <0xf8008000 0x100>;
104 interrupts = <17 4 0>; 105 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
105 }; 106 };
106 107
107 tcb1: timer@f800c000 { 108 tcb1: timer@f800c000 {
108 compatible = "atmel,at91sam9x5-tcb"; 109 compatible = "atmel,at91sam9x5-tcb";
109 reg = <0xf800c000 0x100>; 110 reg = <0xf800c000 0x100>;
110 interrupts = <17 4 0>; 111 interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
111 }; 112 };
112 113
113 dma: dma-controller@ffffec00 { 114 dma: dma-controller@ffffec00 {
114 compatible = "atmel,at91sam9g45-dma"; 115 compatible = "atmel,at91sam9g45-dma";
115 reg = <0xffffec00 0x200>; 116 reg = <0xffffec00 0x200>;
116 interrupts = <20 4 0>; 117 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
117 #dma-cells = <2>; 118 #dma-cells = <2>;
118 }; 119 };
119 120
@@ -287,7 +288,7 @@
287 pioA: gpio@fffff400 { 288 pioA: gpio@fffff400 {
288 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 289 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
289 reg = <0xfffff400 0x200>; 290 reg = <0xfffff400 0x200>;
290 interrupts = <2 4 1>; 291 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
291 #gpio-cells = <2>; 292 #gpio-cells = <2>;
292 gpio-controller; 293 gpio-controller;
293 interrupt-controller; 294 interrupt-controller;
@@ -297,7 +298,7 @@
297 pioB: gpio@fffff600 { 298 pioB: gpio@fffff600 {
298 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 299 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
299 reg = <0xfffff600 0x200>; 300 reg = <0xfffff600 0x200>;
300 interrupts = <2 4 1>; 301 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
301 #gpio-cells = <2>; 302 #gpio-cells = <2>;
302 gpio-controller; 303 gpio-controller;
303 interrupt-controller; 304 interrupt-controller;
@@ -307,7 +308,7 @@
307 pioC: gpio@fffff800 { 308 pioC: gpio@fffff800 {
308 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 309 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
309 reg = <0xfffff800 0x200>; 310 reg = <0xfffff800 0x200>;
310 interrupts = <3 4 1>; 311 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
311 #gpio-cells = <2>; 312 #gpio-cells = <2>;
312 gpio-controller; 313 gpio-controller;
313 interrupt-controller; 314 interrupt-controller;
@@ -317,7 +318,7 @@
317 pioD: gpio@fffffa00 { 318 pioD: gpio@fffffa00 {
318 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 319 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
319 reg = <0xfffffa00 0x200>; 320 reg = <0xfffffa00 0x200>;
320 interrupts = <3 4 1>; 321 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
321 #gpio-cells = <2>; 322 #gpio-cells = <2>;
322 gpio-controller; 323 gpio-controller;
323 interrupt-controller; 324 interrupt-controller;
@@ -328,7 +329,7 @@
328 dbgu: serial@fffff200 { 329 dbgu: serial@fffff200 {
329 compatible = "atmel,at91sam9260-usart"; 330 compatible = "atmel,at91sam9260-usart";
330 reg = <0xfffff200 0x200>; 331 reg = <0xfffff200 0x200>;
331 interrupts = <1 4 7>; 332 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
332 pinctrl-names = "default"; 333 pinctrl-names = "default";
333 pinctrl-0 = <&pinctrl_dbgu>; 334 pinctrl-0 = <&pinctrl_dbgu>;
334 status = "disabled"; 335 status = "disabled";
@@ -337,7 +338,7 @@
337 ssc0: ssc@f0010000 { 338 ssc0: ssc@f0010000 {
338 compatible = "atmel,at91sam9g45-ssc"; 339 compatible = "atmel,at91sam9g45-ssc";
339 reg = <0xf0010000 0x4000>; 340 reg = <0xf0010000 0x4000>;
340 interrupts = <28 4 5>; 341 interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
341 pinctrl-names = "default"; 342 pinctrl-names = "default";
342 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 343 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
343 status = "disabled"; 344 status = "disabled";
@@ -346,7 +347,7 @@
346 usart0: serial@f801c000 { 347 usart0: serial@f801c000 {
347 compatible = "atmel,at91sam9260-usart"; 348 compatible = "atmel,at91sam9260-usart";
348 reg = <0xf801c000 0x4000>; 349 reg = <0xf801c000 0x4000>;
349 interrupts = <5 4 5>; 350 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>;
350 pinctrl-names = "default"; 351 pinctrl-names = "default";
351 pinctrl-0 = <&pinctrl_usart0>; 352 pinctrl-0 = <&pinctrl_usart0>;
352 status = "disabled"; 353 status = "disabled";
@@ -355,7 +356,7 @@
355 usart1: serial@f8020000 { 356 usart1: serial@f8020000 {
356 compatible = "atmel,at91sam9260-usart"; 357 compatible = "atmel,at91sam9260-usart";
357 reg = <0xf8020000 0x4000>; 358 reg = <0xf8020000 0x4000>;
358 interrupts = <6 4 5>; 359 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
359 pinctrl-names = "default"; 360 pinctrl-names = "default";
360 pinctrl-0 = <&pinctrl_usart1>; 361 pinctrl-0 = <&pinctrl_usart1>;
361 status = "disabled"; 362 status = "disabled";
@@ -364,7 +365,7 @@
364 usart2: serial@f8024000 { 365 usart2: serial@f8024000 {
365 compatible = "atmel,at91sam9260-usart"; 366 compatible = "atmel,at91sam9260-usart";
366 reg = <0xf8024000 0x4000>; 367 reg = <0xf8024000 0x4000>;
367 interrupts = <7 4 5>; 368 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
368 pinctrl-names = "default"; 369 pinctrl-names = "default";
369 pinctrl-0 = <&pinctrl_usart2>; 370 pinctrl-0 = <&pinctrl_usart2>;
370 status = "disabled"; 371 status = "disabled";
@@ -373,7 +374,7 @@
373 usart3: serial@f8028000 { 374 usart3: serial@f8028000 {
374 compatible = "atmel,at91sam9260-usart"; 375 compatible = "atmel,at91sam9260-usart";
375 reg = <0xf8028000 0x4000>; 376 reg = <0xf8028000 0x4000>;
376 interrupts = <8 4 5>; 377 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
377 pinctrl-names = "default"; 378 pinctrl-names = "default";
378 pinctrl-0 = <&pinctrl_usart3>; 379 pinctrl-0 = <&pinctrl_usart3>;
379 status = "disabled"; 380 status = "disabled";
@@ -382,7 +383,7 @@
382 i2c0: i2c@f8010000 { 383 i2c0: i2c@f8010000 {
383 compatible = "atmel,at91sam9x5-i2c"; 384 compatible = "atmel,at91sam9x5-i2c";
384 reg = <0xf8010000 0x100>; 385 reg = <0xf8010000 0x100>;
385 interrupts = <9 4 6>; 386 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
386 dmas = <&dma 1 13>, 387 dmas = <&dma 1 13>,
387 <&dma 1 14>; 388 <&dma 1 14>;
388 dma-names = "tx", "rx"; 389 dma-names = "tx", "rx";
@@ -394,7 +395,7 @@
394 i2c1: i2c@f8014000 { 395 i2c1: i2c@f8014000 {
395 compatible = "atmel,at91sam9x5-i2c"; 396 compatible = "atmel,at91sam9x5-i2c";
396 reg = <0xf8014000 0x100>; 397 reg = <0xf8014000 0x100>;
397 interrupts = <10 4 6>; 398 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
398 dmas = <&dma 1 15>, 399 dmas = <&dma 1 15>,
399 <&dma 1 16>; 400 <&dma 1 16>;
400 dma-names = "tx", "rx"; 401 dma-names = "tx", "rx";
@@ -408,7 +409,7 @@
408 #size-cells = <0>; 409 #size-cells = <0>;
409 compatible = "atmel,at91rm9200-spi"; 410 compatible = "atmel,at91rm9200-spi";
410 reg = <0xf0000000 0x100>; 411 reg = <0xf0000000 0x100>;
411 interrupts = <13 4 3>; 412 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
412 pinctrl-names = "default"; 413 pinctrl-names = "default";
413 pinctrl-0 = <&pinctrl_spi0>; 414 pinctrl-0 = <&pinctrl_spi0>;
414 status = "disabled"; 415 status = "disabled";
@@ -419,7 +420,7 @@
419 #size-cells = <0>; 420 #size-cells = <0>;
420 compatible = "atmel,at91rm9200-spi"; 421 compatible = "atmel,at91rm9200-spi";
421 reg = <0xf0004000 0x100>; 422 reg = <0xf0004000 0x100>;
422 interrupts = <14 4 3>; 423 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
423 pinctrl-names = "default"; 424 pinctrl-names = "default";
424 pinctrl-0 = <&pinctrl_spi1>; 425 pinctrl-0 = <&pinctrl_spi1>;
425 status = "disabled"; 426 status = "disabled";
@@ -450,7 +451,7 @@
450 usb0: ohci@00500000 { 451 usb0: ohci@00500000 {
451 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 452 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
452 reg = <0x00500000 0x00100000>; 453 reg = <0x00500000 0x00100000>;
453 interrupts = <22 4 2>; 454 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
454 status = "disabled"; 455 status = "disabled";
455 }; 456 };
456 }; 457 };
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 };
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index 05a3380e2b47..c00e15872594 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -10,6 +10,7 @@
10 10
11#include "skeleton.dtsi" 11#include "skeleton.dtsi"
12#include <dt-bindings/pinctrl/at91.h> 12#include <dt-bindings/pinctrl/at91.h>
13#include <dt-bindings/interrupt-controller/irq.h>
13#include <dt-bindings/gpio/gpio.h> 14#include <dt-bindings/gpio/gpio.h>
14 15
15/ { 16/ {
@@ -61,7 +62,7 @@
61 mmc0: mmc@f0000000 { 62 mmc0: mmc@f0000000 {
62 compatible = "atmel,hsmci"; 63 compatible = "atmel,hsmci";
63 reg = <0xf0000000 0x600>; 64 reg = <0xf0000000 0x600>;
64 interrupts = <21 4 0>; 65 interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
65 dmas = <&dma0 2 0>; 66 dmas = <&dma0 2 0>;
66 dma-names = "rxtx"; 67 dma-names = "rxtx";
67 pinctrl-names = "default"; 68 pinctrl-names = "default";
@@ -76,7 +77,7 @@
76 #size-cells = <0>; 77 #size-cells = <0>;
77 compatible = "atmel,at91sam9x5-spi"; 78 compatible = "atmel,at91sam9x5-spi";
78 reg = <0xf0004000 0x100>; 79 reg = <0xf0004000 0x100>;
79 interrupts = <24 4 3>; 80 interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
80 cs-gpios = <&pioD 13 0 81 cs-gpios = <&pioD 13 0
81 &pioD 14 0 /* conflicts with SCK0 and CANRX0 */ 82 &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
82 &pioD 15 0 /* conflicts with CTS0 and CANTX0 */ 83 &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
@@ -90,7 +91,7 @@
90 ssc0: ssc@f0008000 { 91 ssc0: ssc@f0008000 {
91 compatible = "atmel,at91sam9g45-ssc"; 92 compatible = "atmel,at91sam9g45-ssc";
92 reg = <0xf0008000 0x4000>; 93 reg = <0xf0008000 0x4000>;
93 interrupts = <38 4 4>; 94 interrupts = <38 IRQ_TYPE_LEVEL_HIGH 4>;
94 pinctrl-names = "default"; 95 pinctrl-names = "default";
95 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>; 96 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
96 status = "disabled"; 97 status = "disabled";
@@ -99,7 +100,7 @@
99 can0: can@f000c000 { 100 can0: can@f000c000 {
100 compatible = "atmel,at91sam9x5-can"; 101 compatible = "atmel,at91sam9x5-can";
101 reg = <0xf000c000 0x300>; 102 reg = <0xf000c000 0x300>;
102 interrupts = <40 4 3>; 103 interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;
103 pinctrl-names = "default"; 104 pinctrl-names = "default";
104 pinctrl-0 = <&pinctrl_can0_rx_tx>; 105 pinctrl-0 = <&pinctrl_can0_rx_tx>;
105 status = "disabled"; 106 status = "disabled";
@@ -108,13 +109,13 @@
108 tcb0: timer@f0010000 { 109 tcb0: timer@f0010000 {
109 compatible = "atmel,at91sam9x5-tcb"; 110 compatible = "atmel,at91sam9x5-tcb";
110 reg = <0xf0010000 0x100>; 111 reg = <0xf0010000 0x100>;
111 interrupts = <26 4 0>; 112 interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
112 }; 113 };
113 114
114 i2c0: i2c@f0014000 { 115 i2c0: i2c@f0014000 {
115 compatible = "atmel,at91sam9x5-i2c"; 116 compatible = "atmel,at91sam9x5-i2c";
116 reg = <0xf0014000 0x4000>; 117 reg = <0xf0014000 0x4000>;
117 interrupts = <18 4 6>; 118 interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>;
118 dmas = <&dma0 2 7>, 119 dmas = <&dma0 2 7>,
119 <&dma0 2 8>; 120 <&dma0 2 8>;
120 dma-names = "tx", "rx"; 121 dma-names = "tx", "rx";
@@ -128,7 +129,7 @@
128 i2c1: i2c@f0018000 { 129 i2c1: i2c@f0018000 {
129 compatible = "atmel,at91sam9x5-i2c"; 130 compatible = "atmel,at91sam9x5-i2c";
130 reg = <0xf0018000 0x4000>; 131 reg = <0xf0018000 0x4000>;
131 interrupts = <19 4 6>; 132 interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>;
132 dmas = <&dma0 2 9>, 133 dmas = <&dma0 2 9>,
133 <&dma0 2 10>; 134 <&dma0 2 10>;
134 dma-names = "tx", "rx"; 135 dma-names = "tx", "rx";
@@ -142,7 +143,7 @@
142 usart0: serial@f001c000 { 143 usart0: serial@f001c000 {
143 compatible = "atmel,at91sam9260-usart"; 144 compatible = "atmel,at91sam9260-usart";
144 reg = <0xf001c000 0x100>; 145 reg = <0xf001c000 0x100>;
145 interrupts = <12 4 5>; 146 interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>;
146 pinctrl-names = "default"; 147 pinctrl-names = "default";
147 pinctrl-0 = <&pinctrl_usart0>; 148 pinctrl-0 = <&pinctrl_usart0>;
148 status = "disabled"; 149 status = "disabled";
@@ -151,7 +152,7 @@
151 usart1: serial@f0020000 { 152 usart1: serial@f0020000 {
152 compatible = "atmel,at91sam9260-usart"; 153 compatible = "atmel,at91sam9260-usart";
153 reg = <0xf0020000 0x100>; 154 reg = <0xf0020000 0x100>;
154 interrupts = <13 4 5>; 155 interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>;
155 pinctrl-names = "default"; 156 pinctrl-names = "default";
156 pinctrl-0 = <&pinctrl_usart1>; 157 pinctrl-0 = <&pinctrl_usart1>;
157 status = "disabled"; 158 status = "disabled";
@@ -160,7 +161,7 @@
160 macb0: ethernet@f0028000 { 161 macb0: ethernet@f0028000 {
161 compatible = "cnds,pc302-gem", "cdns,gem"; 162 compatible = "cnds,pc302-gem", "cdns,gem";
162 reg = <0xf0028000 0x100>; 163 reg = <0xf0028000 0x100>;
163 interrupts = <34 4 3>; 164 interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
164 pinctrl-names = "default"; 165 pinctrl-names = "default";
165 pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>; 166 pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>;
166 status = "disabled"; 167 status = "disabled";
@@ -169,14 +170,14 @@
169 isi: isi@f0034000 { 170 isi: isi@f0034000 {
170 compatible = "atmel,at91sam9g45-isi"; 171 compatible = "atmel,at91sam9g45-isi";
171 reg = <0xf0034000 0x4000>; 172 reg = <0xf0034000 0x4000>;
172 interrupts = <37 4 5>; 173 interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
173 status = "disabled"; 174 status = "disabled";
174 }; 175 };
175 176
176 mmc1: mmc@f8000000 { 177 mmc1: mmc@f8000000 {
177 compatible = "atmel,hsmci"; 178 compatible = "atmel,hsmci";
178 reg = <0xf8000000 0x600>; 179 reg = <0xf8000000 0x600>;
179 interrupts = <22 4 0>; 180 interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>;
180 dmas = <&dma1 2 0>; 181 dmas = <&dma1 2 0>;
181 dma-names = "rxtx"; 182 dma-names = "rxtx";
182 pinctrl-names = "default"; 183 pinctrl-names = "default";
@@ -189,7 +190,7 @@
189 mmc2: mmc@f8004000 { 190 mmc2: mmc@f8004000 {
190 compatible = "atmel,hsmci"; 191 compatible = "atmel,hsmci";
191 reg = <0xf8004000 0x600>; 192 reg = <0xf8004000 0x600>;
192 interrupts = <23 4 0>; 193 interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
193 dmas = <&dma1 2 1>; 194 dmas = <&dma1 2 1>;
194 dma-names = "rxtx"; 195 dma-names = "rxtx";
195 pinctrl-names = "default"; 196 pinctrl-names = "default";
@@ -204,7 +205,7 @@
204 #size-cells = <0>; 205 #size-cells = <0>;
205 compatible = "atmel,at91sam9x5-spi"; 206 compatible = "atmel,at91sam9x5-spi";
206 reg = <0xf8008000 0x100>; 207 reg = <0xf8008000 0x100>;
207 interrupts = <25 4 3>; 208 interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
208 cs-gpios = <&pioC 25 0 209 cs-gpios = <&pioC 25 0
209 &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */ 210 &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
210 &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */ 211 &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
@@ -218,7 +219,7 @@
218 ssc1: ssc@f800c000 { 219 ssc1: ssc@f800c000 {
219 compatible = "atmel,at91sam9g45-ssc"; 220 compatible = "atmel,at91sam9g45-ssc";
220 reg = <0xf800c000 0x4000>; 221 reg = <0xf800c000 0x4000>;
221 interrupts = <39 4 4>; 222 interrupts = <39 IRQ_TYPE_LEVEL_HIGH 4>;
222 pinctrl-names = "default"; 223 pinctrl-names = "default";
223 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>; 224 pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
224 status = "disabled"; 225 status = "disabled";
@@ -227,7 +228,7 @@
227 can1: can@f8010000 { 228 can1: can@f8010000 {
228 compatible = "atmel,at91sam9x5-can"; 229 compatible = "atmel,at91sam9x5-can";
229 reg = <0xf8010000 0x300>; 230 reg = <0xf8010000 0x300>;
230 interrupts = <41 4 3>; 231 interrupts = <41 IRQ_TYPE_LEVEL_HIGH 3>;
231 pinctrl-names = "default"; 232 pinctrl-names = "default";
232 pinctrl-0 = <&pinctrl_can1_rx_tx>; 233 pinctrl-0 = <&pinctrl_can1_rx_tx>;
233 }; 234 };
@@ -235,13 +236,13 @@
235 tcb1: timer@f8014000 { 236 tcb1: timer@f8014000 {
236 compatible = "atmel,at91sam9x5-tcb"; 237 compatible = "atmel,at91sam9x5-tcb";
237 reg = <0xf8014000 0x100>; 238 reg = <0xf8014000 0x100>;
238 interrupts = <27 4 0>; 239 interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
239 }; 240 };
240 241
241 adc0: adc@f8018000 { 242 adc0: adc@f8018000 {
242 compatible = "atmel,at91sam9260-adc"; 243 compatible = "atmel,at91sam9260-adc";
243 reg = <0xf8018000 0x100>; 244 reg = <0xf8018000 0x100>;
244 interrupts = <29 4 5>; 245 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
245 pinctrl-names = "default"; 246 pinctrl-names = "default";
246 pinctrl-0 = < 247 pinctrl-0 = <
247 &pinctrl_adc0_adtrg 248 &pinctrl_adc0_adtrg
@@ -295,7 +296,7 @@
295 tsadcc: tsadcc@f8018000 { 296 tsadcc: tsadcc@f8018000 {
296 compatible = "atmel,at91sam9x5-tsadcc"; 297 compatible = "atmel,at91sam9x5-tsadcc";
297 reg = <0xf8018000 0x4000>; 298 reg = <0xf8018000 0x4000>;
298 interrupts = <29 4 5>; 299 interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
299 atmel,tsadcc_clock = <300000>; 300 atmel,tsadcc_clock = <300000>;
300 atmel,filtering_average = <0x03>; 301 atmel,filtering_average = <0x03>;
301 atmel,pendet_debounce = <0x08>; 302 atmel,pendet_debounce = <0x08>;
@@ -307,7 +308,7 @@
307 i2c2: i2c@f801c000 { 308 i2c2: i2c@f801c000 {
308 compatible = "atmel,at91sam9x5-i2c"; 309 compatible = "atmel,at91sam9x5-i2c";
309 reg = <0xf801c000 0x4000>; 310 reg = <0xf801c000 0x4000>;
310 interrupts = <20 4 6>; 311 interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>;
311 dmas = <&dma1 2 11>, 312 dmas = <&dma1 2 11>,
312 <&dma1 2 12>; 313 <&dma1 2 12>;
313 dma-names = "tx", "rx"; 314 dma-names = "tx", "rx";
@@ -319,7 +320,7 @@
319 usart2: serial@f8020000 { 320 usart2: serial@f8020000 {
320 compatible = "atmel,at91sam9260-usart"; 321 compatible = "atmel,at91sam9260-usart";
321 reg = <0xf8020000 0x100>; 322 reg = <0xf8020000 0x100>;
322 interrupts = <14 4 5>; 323 interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
323 pinctrl-names = "default"; 324 pinctrl-names = "default";
324 pinctrl-0 = <&pinctrl_usart2>; 325 pinctrl-0 = <&pinctrl_usart2>;
325 status = "disabled"; 326 status = "disabled";
@@ -328,7 +329,7 @@
328 usart3: serial@f8024000 { 329 usart3: serial@f8024000 {
329 compatible = "atmel,at91sam9260-usart"; 330 compatible = "atmel,at91sam9260-usart";
330 reg = <0xf8024000 0x100>; 331 reg = <0xf8024000 0x100>;
331 interrupts = <15 4 5>; 332 interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
332 pinctrl-names = "default"; 333 pinctrl-names = "default";
333 pinctrl-0 = <&pinctrl_usart3>; 334 pinctrl-0 = <&pinctrl_usart3>;
334 status = "disabled"; 335 status = "disabled";
@@ -337,7 +338,7 @@
337 macb1: ethernet@f802c000 { 338 macb1: ethernet@f802c000 {
338 compatible = "cdns,at32ap7000-macb", "cdns,macb"; 339 compatible = "cdns,at32ap7000-macb", "cdns,macb";
339 reg = <0xf802c000 0x100>; 340 reg = <0xf802c000 0x100>;
340 interrupts = <35 4 3>; 341 interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
341 pinctrl-names = "default"; 342 pinctrl-names = "default";
342 pinctrl-0 = <&pinctrl_macb1_rmii>; 343 pinctrl-0 = <&pinctrl_macb1_rmii>;
343 status = "disabled"; 344 status = "disabled";
@@ -346,7 +347,7 @@
346 sha@f8034000 { 347 sha@f8034000 {
347 compatible = "atmel,sam9g46-sha"; 348 compatible = "atmel,sam9g46-sha";
348 reg = <0xf8034000 0x100>; 349 reg = <0xf8034000 0x100>;
349 interrupts = <42 4 0>; 350 interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
350 }; 351 };
351 352
352 aes@f8038000 { 353 aes@f8038000 {
@@ -358,20 +359,20 @@
358 tdes@f803c000 { 359 tdes@f803c000 {
359 compatible = "atmel,sam9g46-tdes"; 360 compatible = "atmel,sam9g46-tdes";
360 reg = <0xf803c000 0x100>; 361 reg = <0xf803c000 0x100>;
361 interrupts = <44 4 0>; 362 interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
362 }; 363 };
363 364
364 dma0: dma-controller@ffffe600 { 365 dma0: dma-controller@ffffe600 {
365 compatible = "atmel,at91sam9g45-dma"; 366 compatible = "atmel,at91sam9g45-dma";
366 reg = <0xffffe600 0x200>; 367 reg = <0xffffe600 0x200>;
367 interrupts = <30 4 0>; 368 interrupts = <30 IRQ_TYPE_LEVEL_HIGH 0>;
368 #dma-cells = <2>; 369 #dma-cells = <2>;
369 }; 370 };
370 371
371 dma1: dma-controller@ffffe800 { 372 dma1: dma-controller@ffffe800 {
372 compatible = "atmel,at91sam9g45-dma"; 373 compatible = "atmel,at91sam9g45-dma";
373 reg = <0xffffe800 0x200>; 374 reg = <0xffffe800 0x200>;
374 interrupts = <31 4 0>; 375 interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
375 #dma-cells = <2>; 376 #dma-cells = <2>;
376 }; 377 };
377 378
@@ -383,7 +384,7 @@
383 dbgu: serial@ffffee00 { 384 dbgu: serial@ffffee00 {
384 compatible = "atmel,at91sam9260-usart"; 385 compatible = "atmel,at91sam9260-usart";
385 reg = <0xffffee00 0x200>; 386 reg = <0xffffee00 0x200>;
386 interrupts = <2 4 7>; 387 interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;
387 pinctrl-names = "default"; 388 pinctrl-names = "default";
388 pinctrl-0 = <&pinctrl_dbgu>; 389 pinctrl-0 = <&pinctrl_dbgu>;
389 status = "disabled"; 390 status = "disabled";
@@ -817,7 +818,7 @@
817 pioA: gpio@fffff200 { 818 pioA: gpio@fffff200 {
818 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 819 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
819 reg = <0xfffff200 0x100>; 820 reg = <0xfffff200 0x100>;
820 interrupts = <6 4 1>; 821 interrupts = <6 IRQ_TYPE_LEVEL_HIGH 1>;
821 #gpio-cells = <2>; 822 #gpio-cells = <2>;
822 gpio-controller; 823 gpio-controller;
823 interrupt-controller; 824 interrupt-controller;
@@ -827,7 +828,7 @@
827 pioB: gpio@fffff400 { 828 pioB: gpio@fffff400 {
828 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 829 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
829 reg = <0xfffff400 0x100>; 830 reg = <0xfffff400 0x100>;
830 interrupts = <7 4 1>; 831 interrupts = <7 IRQ_TYPE_LEVEL_HIGH 1>;
831 #gpio-cells = <2>; 832 #gpio-cells = <2>;
832 gpio-controller; 833 gpio-controller;
833 interrupt-controller; 834 interrupt-controller;
@@ -837,7 +838,7 @@
837 pioC: gpio@fffff600 { 838 pioC: gpio@fffff600 {
838 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 839 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
839 reg = <0xfffff600 0x100>; 840 reg = <0xfffff600 0x100>;
840 interrupts = <8 4 1>; 841 interrupts = <8 IRQ_TYPE_LEVEL_HIGH 1>;
841 #gpio-cells = <2>; 842 #gpio-cells = <2>;
842 gpio-controller; 843 gpio-controller;
843 interrupt-controller; 844 interrupt-controller;
@@ -847,7 +848,7 @@
847 pioD: gpio@fffff800 { 848 pioD: gpio@fffff800 {
848 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 849 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
849 reg = <0xfffff800 0x100>; 850 reg = <0xfffff800 0x100>;
850 interrupts = <9 4 1>; 851 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 1>;
851 #gpio-cells = <2>; 852 #gpio-cells = <2>;
852 gpio-controller; 853 gpio-controller;
853 interrupt-controller; 854 interrupt-controller;
@@ -857,7 +858,7 @@
857 pioE: gpio@fffffa00 { 858 pioE: gpio@fffffa00 {
858 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio"; 859 compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
859 reg = <0xfffffa00 0x100>; 860 reg = <0xfffffa00 0x100>;
860 interrupts = <10 4 1>; 861 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 1>;
861 #gpio-cells = <2>; 862 #gpio-cells = <2>;
862 gpio-controller; 863 gpio-controller;
863 interrupt-controller; 864 interrupt-controller;
@@ -878,7 +879,7 @@
878 pit: timer@fffffe30 { 879 pit: timer@fffffe30 {
879 compatible = "atmel,at91sam9260-pit"; 880 compatible = "atmel,at91sam9260-pit";
880 reg = <0xfffffe30 0xf>; 881 reg = <0xfffffe30 0xf>;
881 interrupts = <3 4 5>; 882 interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
882 }; 883 };
883 884
884 watchdog@fffffe40 { 885 watchdog@fffffe40 {
@@ -890,7 +891,7 @@
890 rtc@fffffeb0 { 891 rtc@fffffeb0 {
891 compatible = "atmel,at91rm9200-rtc"; 892 compatible = "atmel,at91rm9200-rtc";
892 reg = <0xfffffeb0 0x30>; 893 reg = <0xfffffeb0 0x30>;
893 interrupts = <1 4 7>; 894 interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
894 }; 895 };
895 }; 896 };
896 897
@@ -900,7 +901,7 @@
900 compatible = "atmel,at91sam9rl-udc"; 901 compatible = "atmel,at91sam9rl-udc";
901 reg = <0x00500000 0x100000 902 reg = <0x00500000 0x100000
902 0xf8030000 0x4000>; 903 0xf8030000 0x4000>;
903 interrupts = <33 4 2>; 904 interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;
904 status = "disabled"; 905 status = "disabled";
905 906
906 ep0 { 907 ep0 {
@@ -1012,14 +1013,14 @@
1012 usb1: ohci@00600000 { 1013 usb1: ohci@00600000 {
1013 compatible = "atmel,at91rm9200-ohci", "usb-ohci"; 1014 compatible = "atmel,at91rm9200-ohci", "usb-ohci";
1014 reg = <0x00600000 0x100000>; 1015 reg = <0x00600000 0x100000>;
1015 interrupts = <32 4 2>; 1016 interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
1016 status = "disabled"; 1017 status = "disabled";
1017 }; 1018 };
1018 1019
1019 usb2: ehci@00700000 { 1020 usb2: ehci@00700000 {
1020 compatible = "atmel,at91sam9g45-ehci", "usb-ehci"; 1021 compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
1021 reg = <0x00700000 0x100000>; 1022 reg = <0x00700000 0x100000>;
1022 interrupts = <32 4 2>; 1023 interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
1023 status = "disabled"; 1024 status = "disabled";
1024 }; 1025 };
1025 1026
@@ -1035,7 +1036,7 @@
1035 0xffffc000 0x00000070 /* NFC HSMC regs */ 1036 0xffffc000 0x00000070 /* NFC HSMC regs */
1036 0x00200000 0x00100000 /* NFC SRAM banks */ 1037 0x00200000 0x00100000 /* NFC SRAM banks */
1037 >; 1038 >;
1038 interrupts = <5 4 6>; 1039 interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
1039 atmel,nand-addr-offset = <21>; 1040 atmel,nand-addr-offset = <21>;
1040 atmel,nand-cmd-offset = <22>; 1041 atmel,nand-cmd-offset = <22>;
1041 pinctrl-names = "default"; 1042 pinctrl-names = "default";