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/at91sam9260.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/at91sam9260.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 49 |
1 files changed, 27 insertions, 22 deletions
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 | }; |