ARM: at91: dt: switch to standard IRQ flag defines
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Wed, 24 Apr 2013 00:34:25 +0000 (08:34 +0800)
committerNicolas Ferre <nicolas.ferre@atmel.com>
Fri, 17 May 2013 10:11:50 +0000 (12:11 +0200)
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
arch/arm/boot/dts/at91rm9200.dtsi
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi
arch/arm/boot/dts/sama5d3.dtsi

index 361a957..4aad0d9 100644 (file)
@@ -12,6 +12,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                        st: timer@fffffd00 {
                                compatible = "atmel,at91rm9200-st";
                                reg = <0xfffffd00 0x100>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
                        tcb0: timer@fffa0000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffa0000 0x100>;
-                               interrupts = <17 4 0 18 4 0 19 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
+                                             18 IRQ_TYPE_LEVEL_HIGH 0
+                                             19 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        tcb1: timer@fffa4000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffa4000 0x100>;
-                               interrupts = <20 4 0 21 4 0 22 4 0>;
+                               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0
+                                             21 IRQ_TYPE_LEVEL_HIGH 0
+                                             22 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        i2c0: i2c@fffb8000 {
                                compatible = "atmel,at91rm9200-i2c";
                                reg = <0xfffb8000 0x4000>;
-                               interrupts = <12 4 6>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_twi>;
                                #address-cells = <1>;
                        mmc0: mmc@fffb4000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfffb4000 0x4000>;
-                               interrupts = <10 4 0>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        ssc0: ssc@fffd0000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfffd0000 0x4000>;
-                               interrupts = <14 4 5>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disable";
                        ssc1: ssc@fffd4000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfffd4000 0x4000>;
-                               interrupts = <15 4 5>;
+                               interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
                                status = "disable";
                        ssc2: ssc@fffd8000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfffd8000 0x4000>;
-                               interrupts = <16 4 5>;
+                               interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc2_tx &pinctrl_ssc2_rx>;
                                status = "disable";
                        macb0: ethernet@fffbc000 {
                                compatible = "cdns,at91rm9200-emac", "cdns,emac";
                                reg = <0xfffbc000 0x4000>;
-                               interrupts = <24 4 3>;
+                               interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
                                phy-mode = "rmii";
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff600 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff800 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffffa00 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x200>;
-                                       interrupts = <5 4 1>;
+                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        dbgu: serial@fffff200 {
                                compatible = "atmel,at91rm9200-usart";
                                reg = <0xfffff200 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        usart0: serial@fffc0000 {
                                compatible = "atmel,at91rm9200-usart";
                                reg = <0xfffc0000 0x200>;
-                               interrupts = <6 4 5>;
+                               interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart1: serial@fffc4000 {
                                compatible = "atmel,at91rm9200-usart";
                                reg = <0xfffc4000 0x200>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart2: serial@fffc8000 {
                                compatible = "atmel,at91rm9200-usart";
                                reg = <0xfffc8000 0x200>;
-                               interrupts = <8 4 5>;
+                               interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart3: serial@fffcc000 {
                                compatible = "atmel,at91rm9200-usart";
                                reg = <0xfffcc000 0x200>;
-                               interrupts = <23 4 5>;
+                               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usb1: gadget@fffb0000 {
                                compatible = "atmel,at91rm9200-udc";
                                reg = <0xfffb0000 0x4000>;
-                               interrupts = <11 4 2>;
+                               interrupts = <11 IRQ_TYPE_LEVEL_HIGH 2>;
                                status = "disabled";
                        };
                };
                usb0: ohci@00300000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00300000 0x100000>;
-                       interrupts = <23 4 2>;
+                       interrupts = <23 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index 7edadf3..a776f50 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                        pit: timer@fffffd30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffd30 0xf>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
                        tcb0: timer@fffa0000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffa0000 0x100>;
-                               interrupts = <17 4 0 18 4 0 19 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0
+                                             18 IRQ_TYPE_LEVEL_HIGH 0
+                                             19 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        tcb1: timer@fffdc000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffdc000 0x100>;
-                               interrupts = <26 4 0 27 4 0 28 4 0>;
+                               interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0
+                                             27 IRQ_TYPE_LEVEL_HIGH 0
+                                             28 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        pinctrl@fffff400 {
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff600 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff800 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        dbgu: serial@fffff200 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffff200 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        usart0: serial@fffb0000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffb0000 0x200>;
-                               interrupts = <6 4 5>;
+                               interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart1: serial@fffb4000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffb4000 0x200>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart2: serial@fffb8000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffb8000 0x200>;
-                               interrupts = <8 4 5>;
+                               interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart3: serial@fffd0000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffd0000 0x200>;
-                               interrupts = <23 4 5>;
+                               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        uart0: serial@fffd4000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffd4000 0x200>;
-                               interrupts = <24 4 5>;
+                               interrupts = <24 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        uart1: serial@fffd8000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffd8000 0x200>;
-                               interrupts = <25 4 5>;
+                               interrupts = <25 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        macb0: ethernet@fffc4000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xfffc4000 0x100>;
-                               interrupts = <21 4 3>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
                                status = "disabled";
                        usb1: gadget@fffa4000 {
                                compatible = "atmel,at91rm9200-udc";
                                reg = <0xfffa4000 0x4000>;
-                               interrupts = <10 4 2>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 2>;
                                status = "disabled";
                        };
 
                        i2c0: i2c@fffac000 {
                                compatible = "atmel,at91sam9260-i2c";
                                reg = <0xfffac000 0x100>;
-                               interrupts = <11 4 6>;
+                               interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        mmc0: mmc@fffa8000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfffa8000 0x600>;
-                               interrupts = <9 4 0>;
+                               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        ssc0: ssc@fffbc000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfffbc000 0x4000>;
-                               interrupts = <14 4 5>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xfffc8000 0x200>;
-                               interrupts = <12 4 3>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xfffcc000 0x200>;
-                               interrupts = <13 4 3>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                        adc0: adc@fffe0000 {
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffe0000 0x100>;
-                               interrupts = <5 4 0>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-channels-used = <0xf>;
                                atmel,adc-vref = <3300>;
                usb0: ohci@00500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x100000>;
-                       interrupts = <20 4 2>;
+                       interrupts = <20 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index bb4d7ca..d9cf51a 100644 (file)
@@ -8,6 +8,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                        pit: timer@fffffd30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffd30 0xf>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
                        tcb0: timer@fff7c000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfff7c000 0x100>;
-                               interrupts = <19 4 0>;
+                               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        rstc@fffffd00 {
                                pioA: gpio@fffff200 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff200 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff600 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffff800 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioE: gpio@fffffa00 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        dbgu: serial@ffffee00 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xffffee00 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        usart0: serial@fff8c000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff8c000 0x200>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart1: serial@fff90000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff90000 0x200>;
-                               interrupts = <8 4 5>;
+                               interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart2: serial@fff94000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff94000 0x200>;
-                               interrupts = <9 4 5>;
+                               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        ssc0: ssc@fff98000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfff98000 0x4000>;
-                               interrupts = <16 4 5>;
+                               interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                        ssc1: ssc@fff9c000 {
                                compatible = "atmel,at91rm9200-ssc";
                                reg = <0xfff9c000 0x4000>;
-                               interrupts = <17 4 5>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
                                status = "disabled";
                        macb0: ethernet@fffbc000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xfffbc000 0x100>;
-                               interrupts = <21 4 3>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
                                status = "disabled";
                        usb1: gadget@fff78000 {
                                compatible = "atmel,at91rm9200-udc";
                                reg = <0xfff78000 0x4000>;
-                               interrupts = <24 4 2>;
+                               interrupts = <24 IRQ_TYPE_LEVEL_HIGH 2>;
                                status = "disabled";
                        };
 
                        i2c0: i2c@fff88000 {
                                compatible = "atmel,at91sam9263-i2c";
                                reg = <0xfff88000 0x100>;
-                               interrupts = <13 4 6>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        mmc0: mmc@fff80000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
-                               interrupts = <10 4 0>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        mmc1: mmc@fff84000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfff84000 0x600>;
-                               interrupts = <11 4 0>;
+                               interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xfffa4000 0x200>;
-                               interrupts = <14 4 3>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xfffa8000 0x200>;
-                               interrupts = <15 4 3>;
+                               interrupts = <15 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                usb0: ohci@00a00000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00a00000 0x100000>;
-                       interrupts = <29 4 2>;
+                       interrupts = <29 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index 8ba4c71..f0091af 100644 (file)
@@ -11,6 +11,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
@@ -85,7 +86,7 @@
                        pit: timer@fffffd30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffd30 0xf>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
 
                        tcb0: timer@fff7c000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfff7c000 0x100>;
-                               interrupts = <18 4 0>;
+                               interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        tcb1: timer@fffd4000 {
                                compatible = "atmel,at91rm9200-tcb";
                                reg = <0xfffd4000 0x100>;
-                               interrupts = <18 4 0>;
+                               interrupts = <18 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        dma: dma-controller@ffffec00 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffec00 0x200>;
-                               interrupts = <21 4 0>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                                pioA: gpio@fffff200 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff200 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff400 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff600 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <4 4 1>;
+                                       interrupts = <4 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffff800 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <5 4 1>;
+                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioE: gpio@fffffa00 {
                                        compatible = "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x200>;
-                                       interrupts = <5 4 1>;
+                                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        dbgu: serial@ffffee00 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xffffee00 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        usart0: serial@fff8c000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff8c000 0x200>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart1: serial@fff90000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff90000 0x200>;
-                               interrupts = <8 4 5>;
+                               interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart2: serial@fff94000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff94000 0x200>;
-                               interrupts = <9 4 5>;
+                               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        usart3: serial@fff98000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfff98000 0x200>;
-                               interrupts = <10 4 5>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
                        macb0: ethernet@fffbc000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xfffbc000 0x100>;
-                               interrupts = <25 4 3>;
+                               interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb_rmii>;
                                status = "disabled";
                        i2c0: i2c@fff84000 {
                                compatible = "atmel,at91sam9g10-i2c";
                                reg = <0xfff84000 0x100>;
-                               interrupts = <12 4 6>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        i2c1: i2c@fff88000 {
                                compatible = "atmel,at91sam9g10-i2c";
                                reg = <0xfff88000 0x100>;
-                               interrupts = <13 4 6>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 6>;
                                #address-cells = <1>;
                                #size-cells = <0>;
                                status = "disabled";
                        ssc0: ssc@fff9c000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xfff9c000 0x4000>;
-                               interrupts = <16 4 5>;
+                               interrupts = <16 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                        ssc1: ssc@fffa0000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xfffa0000 0x4000>;
-                               interrupts = <17 4 5>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
                                status = "disabled";
                        adc0: adc@fffb0000 {
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xfffb0000 0x100>;
-                               interrupts = <20 4 0>;
+                               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-use-external-triggers;
                                atmel,adc-channels-used = <0xff>;
                                atmel,adc-vref = <3300>;
                        mmc0: mmc@fff80000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfff80000 0x600>;
-                               interrupts = <11 4 0>;
+                               interrupts = <11 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma 1 0>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                        mmc1: mmc@fffd0000 {
                                compatible = "atmel,hsmci";
                                reg = <0xfffd0000 0x600>;
-                               interrupts = <29 4 0>;
+                               interrupts = <29 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma 1 13>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                usb0: ohci@00700000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00700000 0x100000>;
-                       interrupts = <22 4 2>;
+                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
 
                usb1: ehci@00800000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00800000 0x100000>;
-                       interrupts = <22 4 2>;
+                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index e166e0c..566af32 100644 (file)
@@ -9,6 +9,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
@@ -79,7 +80,7 @@
                        pit: timer@fffffe30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffe30 0xf>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
                        shdwc@fffffe10 {
@@ -90,7 +91,7 @@
                        mmc0: mmc@f0008000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf0008000 0x600>;
-                               interrupts = <12 4 0>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma 1 0>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                        tcb0: timer@f8008000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf8008000 0x100>;
-                               interrupts = <17 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        tcb1: timer@f800c000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf800c000 0x100>;
-                               interrupts = <17 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        dma: dma-controller@ffffec00 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffec00 0x200>;
-                               interrupts = <20 4 0>;
+                               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff600 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff800 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffffa00 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        dbgu: serial@fffff200 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffff200 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        ssc0: ssc@f0010000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xf0010000 0x4000>;
-                               interrupts = <28 4 5>;
+                               interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                        usart0: serial@f801c000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf801c000 0x4000>;
-                               interrupts = <5 4 5>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        usart1: serial@f8020000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8020000 0x4000>;
-                               interrupts = <6 4 5>;
+                               interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        usart2: serial@f8024000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8024000 0x4000>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        usart3: serial@f8028000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8028000 0x4000>;
-                               interrupts = <8 4 5>;
+                               interrupts = <8 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart3>;
                                status = "disabled";
                        i2c0: i2c@f8010000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8010000 0x100>;
-                               interrupts = <9 4 6>;
+                               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma 1 13>,
                                       <&dma 1 14>;
                                dma-names = "tx", "rx";
                        i2c1: i2c@f8014000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8014000 0x100>;
-                               interrupts = <10 4 6>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma 1 15>,
                                       <&dma 1 16>;
                                dma-names = "tx", "rx";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0000000 0x100>;
-                               interrupts = <13 4 3>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0004000 0x100>;
-                               interrupts = <14 4 3>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                usb0: ohci@00500000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00500000 0x00100000>;
-                       interrupts = <22 4 2>;
+                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index cfbf923..af91599 100644 (file)
@@ -11,6 +11,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
                        pit: timer@fffffe30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffe30 0xf>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
 
                        tcb0: timer@f8008000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf8008000 0x100>;
-                               interrupts = <17 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        tcb1: timer@f800c000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf800c000 0x100>;
-                               interrupts = <17 4 0>;
+                               interrupts = <17 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        dma0: dma-controller@ffffec00 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffec00 0x200>;
-                               interrupts = <20 4 0>;
+                               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                        dma1: dma-controller@ffffee00 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffee00 0x200>;
-                               interrupts = <21 4 0>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                                pioA: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff600 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x200>;
-                                       interrupts = <2 4 1>;
+                                       interrupts = <2 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        #gpio-lines = <19>;
                                pioC: gpio@fffff800 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffffa00 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x200>;
-                                       interrupts = <3 4 1>;
+                                       interrupts = <3 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        #gpio-lines = <22>;
                        ssc0: ssc@f0010000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xf0010000 0x4000>;
-                               interrupts = <28 4 5>;
+                               interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                        mmc0: mmc@f0008000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf0008000 0x600>;
-                               interrupts = <12 4 0>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma0 1 0>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                        mmc1: mmc@f000c000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf000c000 0x600>;
-                               interrupts = <26 4 0>;
+                               interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma1 1 0>;
                                dma-names = "rxtx";
                                #address-cells = <1>;
                        dbgu: serial@fffff200 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffff200 0x200>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                        usart0: serial@f801c000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf801c000 0x200>;
-                               interrupts = <5 4 5>;
+                               interrupts = <5 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        usart1: serial@f8020000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8020000 0x200>;
-                               interrupts = <6 4 5>;
+                               interrupts = <6 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        usart2: serial@f8024000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8024000 0x200>;
-                               interrupts = <7 4 5>;
+                               interrupts = <7 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        macb0: ethernet@f802c000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xf802c000 0x100>;
-                               interrupts = <24 4 3>;
+                               interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb0_rmii>;
                                status = "disabled";
                        macb1: ethernet@f8030000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xf8030000 0x100>;
-                               interrupts = <27 4 3>;
+                               interrupts = <27 IRQ_TYPE_LEVEL_HIGH 3>;
                                status = "disabled";
                        };
 
                        i2c0: i2c@f8010000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8010000 0x100>;
-                               interrupts = <9 4 6>;
+                               interrupts = <9 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma0 1 7>,
                                       <&dma0 1 8>;
                                dma-names = "tx", "rx";
                        i2c1: i2c@f8014000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8014000 0x100>;
-                               interrupts = <10 4 6>;
+                               interrupts = <10 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma1 1 5>,
                                       <&dma1 1 6>;
                                dma-names = "tx", "rx";
                        i2c2: i2c@f8018000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf8018000 0x100>;
-                               interrupts = <11 4 6>;
+                               interrupts = <11 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma0 1 9>,
                                       <&dma0 1 10>;
                                dma-names = "tx", "rx";
                        adc0: adc@f804c000 {
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xf804c000 0x100>;
-                               interrupts = <19 4 0>;
+                               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 0>;
                                atmel,adc-use-external;
                                atmel,adc-channels-used = <0xffff>;
                                atmel,adc-vref = <3300>;
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0000000 0x100>;
-                               interrupts = <13 4 3>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi0>;
                                status = "disabled";
                                #size-cells = <0>;
                                compatible = "atmel,at91rm9200-spi";
                                reg = <0xf0004000 0x100>;
-                               interrupts = <14 4 3>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_spi1>;
                                status = "disabled";
                        rtc@fffffeb0 {
                                compatible = "atmel,at91rm9200-rtc";
                                reg = <0xfffffeb0 0x40>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                                status = "disabled";
                        };
                };
                usb0: ohci@00600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
-                       interrupts = <22 4 2>;
+                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
 
                usb1: ehci@00700000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
-                       interrupts = <22 4 2>;
+                       interrupts = <22 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
        };
index 05a3380..c00e158 100644 (file)
@@ -10,6 +10,7 @@
 
 #include "skeleton.dtsi"
 #include <dt-bindings/pinctrl/at91.h>
+#include <dt-bindings/interrupt-controller/irq.h>
 #include <dt-bindings/gpio/gpio.h>
 
 / {
@@ -61,7 +62,7 @@
                        mmc0: mmc@f0000000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf0000000 0x600>;
-                               interrupts = <21 4 0>;
+                               interrupts = <21 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma0 2 0>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
@@ -76,7 +77,7 @@
                                #size-cells = <0>;
                                compatible = "atmel,at91sam9x5-spi";
                                reg = <0xf0004000 0x100>;
-                               interrupts = <24 4 3>;
+                               interrupts = <24 IRQ_TYPE_LEVEL_HIGH 3>;
                                cs-gpios = <&pioD 13 0
                                            &pioD 14 0 /* conflicts with SCK0 and CANRX0 */
                                            &pioD 15 0 /* conflicts with CTS0 and CANTX0 */
@@ -90,7 +91,7 @@
                        ssc0: ssc@f0008000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xf0008000 0x4000>;
-                               interrupts = <38 4 4>;
+                               interrupts = <38 IRQ_TYPE_LEVEL_HIGH 4>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                status = "disabled";
                        can0: can@f000c000 {
                                compatible = "atmel,at91sam9x5-can";
                                reg = <0xf000c000 0x300>;
-                               interrupts = <40 4 3>;
+                               interrupts = <40 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_can0_rx_tx>;
                                status = "disabled";
                        tcb0: timer@f0010000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf0010000 0x100>;
-                               interrupts = <26 4 0>;
+                               interrupts = <26 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        i2c0: i2c@f0014000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf0014000 0x4000>;
-                               interrupts = <18 4 6>;
+                               interrupts = <18 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma0 2 7>,
                                       <&dma0 2 8>;
                                dma-names = "tx", "rx";
                        i2c1: i2c@f0018000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf0018000 0x4000>;
-                               interrupts = <19 4 6>;
+                               interrupts = <19 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma0 2 9>,
                                       <&dma0 2 10>;
                                dma-names = "tx", "rx";
                        usart0: serial@f001c000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf001c000 0x100>;
-                               interrupts = <12 4 5>;
+                               interrupts = <12 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        usart1: serial@f0020000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf0020000 0x100>;
-                               interrupts = <13 4 5>;
+                               interrupts = <13 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        macb0: ethernet@f0028000 {
                                compatible = "cnds,pc302-gem", "cdns,gem";
                                reg = <0xf0028000 0x100>;
-                               interrupts = <34 4 3>;
+                               interrupts = <34 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb0_data_rgmii &pinctrl_macb0_signal_rgmii>;
                                status = "disabled";
                        isi: isi@f0034000 {
                                compatible = "atmel,at91sam9g45-isi";
                                reg = <0xf0034000 0x4000>;
-                               interrupts = <37 4 5>;
+                               interrupts = <37 IRQ_TYPE_LEVEL_HIGH 5>;
                                status = "disabled";
                        };
 
                        mmc1: mmc@f8000000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf8000000 0x600>;
-                               interrupts = <22 4 0>;
+                               interrupts = <22 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma1 2 0>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
                        mmc2: mmc@f8004000 {
                                compatible = "atmel,hsmci";
                                reg = <0xf8004000 0x600>;
-                               interrupts = <23 4 0>;
+                               interrupts = <23 IRQ_TYPE_LEVEL_HIGH 0>;
                                dmas = <&dma1 2 1>;
                                dma-names = "rxtx";
                                pinctrl-names = "default";
                                #size-cells = <0>;
                                compatible = "atmel,at91sam9x5-spi";
                                reg = <0xf8008000 0x100>;
-                               interrupts = <25 4 3>;
+                               interrupts = <25 IRQ_TYPE_LEVEL_HIGH 3>;
                                cs-gpios = <&pioC 25 0
                                            &pioC 26 0 /* conflitcs with TWD1 and ISI_D11 */
                                            &pioC 27 0 /* conflitcs with TWCK1 and ISI_D10 */
                        ssc1: ssc@f800c000 {
                                compatible = "atmel,at91sam9g45-ssc";
                                reg = <0xf800c000 0x4000>;
-                               interrupts = <39 4 4>;
+                               interrupts = <39 IRQ_TYPE_LEVEL_HIGH 4>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_ssc1_tx &pinctrl_ssc1_rx>;
                                status = "disabled";
                        can1: can@f8010000 {
                                compatible = "atmel,at91sam9x5-can";
                                reg = <0xf8010000 0x300>;
-                               interrupts = <41 4 3>;
+                               interrupts = <41 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_can1_rx_tx>;
                        };
                        tcb1: timer@f8014000 {
                                compatible = "atmel,at91sam9x5-tcb";
                                reg = <0xf8014000 0x100>;
-                               interrupts = <27 4 0>;
+                               interrupts = <27 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        adc0: adc@f8018000 {
                                compatible = "atmel,at91sam9260-adc";
                                reg = <0xf8018000 0x100>;
-                               interrupts = <29 4 5>;
+                               interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <
                                        &pinctrl_adc0_adtrg
                        tsadcc: tsadcc@f8018000 {
                                compatible = "atmel,at91sam9x5-tsadcc";
                                reg = <0xf8018000 0x4000>;
-                               interrupts = <29 4 5>;
+                               interrupts = <29 IRQ_TYPE_LEVEL_HIGH 5>;
                                atmel,tsadcc_clock = <300000>;
                                atmel,filtering_average = <0x03>;
                                atmel,pendet_debounce = <0x08>;
                        i2c2: i2c@f801c000 {
                                compatible = "atmel,at91sam9x5-i2c";
                                reg = <0xf801c000 0x4000>;
-                               interrupts = <20 4 6>;
+                               interrupts = <20 IRQ_TYPE_LEVEL_HIGH 6>;
                                dmas = <&dma1 2 11>,
                                       <&dma1 2 12>;
                                dma-names = "tx", "rx";
                        usart2: serial@f8020000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8020000 0x100>;
-                               interrupts = <14 4 5>;
+                               interrupts = <14 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        usart3: serial@f8024000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8024000 0x100>;
-                               interrupts = <15 4 5>;
+                               interrupts = <15 IRQ_TYPE_LEVEL_HIGH 5>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart3>;
                                status = "disabled";
                        macb1: ethernet@f802c000 {
                                compatible = "cdns,at32ap7000-macb", "cdns,macb";
                                reg = <0xf802c000 0x100>;
-                               interrupts = <35 4 3>;
+                               interrupts = <35 IRQ_TYPE_LEVEL_HIGH 3>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_macb1_rmii>;
                                status = "disabled";
                        sha@f8034000 {
                                compatible = "atmel,sam9g46-sha";
                                reg = <0xf8034000 0x100>;
-                               interrupts = <42 4 0>;
+                               interrupts = <42 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        aes@f8038000 {
                        tdes@f803c000 {
                                compatible = "atmel,sam9g46-tdes";
                                reg = <0xf803c000 0x100>;
-                               interrupts = <44 4 0>;
+                               interrupts = <44 IRQ_TYPE_LEVEL_HIGH 0>;
                        };
 
                        dma0: dma-controller@ffffe600 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffe600 0x200>;
-                               interrupts = <30 4 0>;
+                               interrupts = <30 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                        dma1: dma-controller@ffffe800 {
                                compatible = "atmel,at91sam9g45-dma";
                                reg = <0xffffe800 0x200>;
-                               interrupts = <31 4 0>;
+                               interrupts = <31 IRQ_TYPE_LEVEL_HIGH 0>;
                                #dma-cells = <2>;
                        };
 
                        dbgu: serial@ffffee00 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xffffee00 0x200>;
-                               interrupts = <2 4 7>;
+                               interrupts = <2 IRQ_TYPE_LEVEL_HIGH 7>;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_dbgu>;
                                status = "disabled";
                                pioA: gpio@fffff200 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff200 0x100>;
-                                       interrupts = <6 4 1>;
+                                       interrupts = <6 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioB: gpio@fffff400 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff400 0x100>;
-                                       interrupts = <7 4 1>;
+                                       interrupts = <7 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioC: gpio@fffff600 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff600 0x100>;
-                                       interrupts = <8 4 1>;
+                                       interrupts = <8 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioD: gpio@fffff800 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffff800 0x100>;
-                                       interrupts = <9 4 1>;
+                                       interrupts = <9 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                                pioE: gpio@fffffa00 {
                                        compatible = "atmel,at91sam9x5-gpio", "atmel,at91rm9200-gpio";
                                        reg = <0xfffffa00 0x100>;
-                                       interrupts = <10 4 1>;
+                                       interrupts = <10 IRQ_TYPE_LEVEL_HIGH 1>;
                                        #gpio-cells = <2>;
                                        gpio-controller;
                                        interrupt-controller;
                        pit: timer@fffffe30 {
                                compatible = "atmel,at91sam9260-pit";
                                reg = <0xfffffe30 0xf>;
-                               interrupts = <3 4 5>;
+                               interrupts = <3 IRQ_TYPE_LEVEL_HIGH 5>;
                        };
 
                        watchdog@fffffe40 {
                        rtc@fffffeb0 {
                                compatible = "atmel,at91rm9200-rtc";
                                reg = <0xfffffeb0 0x30>;
-                               interrupts = <1 4 7>;
+                               interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
                        };
                };
 
                        compatible = "atmel,at91sam9rl-udc";
                        reg = <0x00500000 0x100000
                               0xf8030000 0x4000>;
-                       interrupts = <33 4 2>;
+                       interrupts = <33 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
 
                        ep0 {
                usb1: ohci@00600000 {
                        compatible = "atmel,at91rm9200-ohci", "usb-ohci";
                        reg = <0x00600000 0x100000>;
-                       interrupts = <32 4 2>;
+                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
 
                usb2: ehci@00700000 {
                        compatible = "atmel,at91sam9g45-ehci", "usb-ehci";
                        reg = <0x00700000 0x100000>;
-                       interrupts = <32 4 2>;
+                       interrupts = <32 IRQ_TYPE_LEVEL_HIGH 2>;
                        status = "disabled";
                };
 
                                0xffffc000 0x00000070   /* NFC HSMC regs */
                                0x00200000 0x00100000   /* NFC SRAM banks */
                                >;
-                       interrupts = <5 4 6>;
+                       interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
                        atmel,nand-addr-offset = <21>;
                        atmel,nand-cmd-offset = <22>;
                        pinctrl-names = "default";