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/at91rm9200.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/at91rm9200.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91rm9200.dtsi | 45 |
1 files changed, 25 insertions, 20 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 | }; |