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