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/at91sam9n12.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/at91sam9n12.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9n12.dtsi | 41 |
1 files changed, 21 insertions, 20 deletions
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 | }; |