diff options
author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2012-06-20 10:13:30 -0400 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-07-02 08:26:58 -0400 |
commit | f8a073ee378b9893aee0749c3868a6ecfb0c1636 (patch) | |
tree | 7d51d97410bb03bc6ca8b431b3df8592b206b7f7 /arch/arm/boot/dts/at91sam9260.dtsi | |
parent | c65739437045c351a2a0ddb834719b9d616d4d47 (diff) |
ARM: at91: add of irq priorities support
Add a third cell to define irq priority.
Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Reviewed-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/boot/dts/at91sam9260.dtsi')
-rw-r--r-- | arch/arm/boot/dts/at91sam9260.dtsi | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi index f2c96430f9cb..66389c1c6f62 100644 --- a/arch/arm/boot/dts/at91sam9260.dtsi +++ b/arch/arm/boot/dts/at91sam9260.dtsi | |||
@@ -52,7 +52,7 @@ | |||
52 | ranges; | 52 | ranges; |
53 | 53 | ||
54 | aic: interrupt-controller@fffff000 { | 54 | aic: interrupt-controller@fffff000 { |
55 | #interrupt-cells = <2>; | 55 | #interrupt-cells = <3>; |
56 | compatible = "atmel,at91rm9200-aic"; | 56 | compatible = "atmel,at91rm9200-aic"; |
57 | interrupt-controller; | 57 | interrupt-controller; |
58 | reg = <0xfffff000 0x200>; | 58 | reg = <0xfffff000 0x200>; |
@@ -82,25 +82,25 @@ | |||
82 | pit: timer@fffffd30 { | 82 | pit: timer@fffffd30 { |
83 | compatible = "atmel,at91sam9260-pit"; | 83 | compatible = "atmel,at91sam9260-pit"; |
84 | reg = <0xfffffd30 0xf>; | 84 | reg = <0xfffffd30 0xf>; |
85 | interrupts = <1 4>; | 85 | interrupts = <1 4 7>; |
86 | }; | 86 | }; |
87 | 87 | ||
88 | tcb0: timer@fffa0000 { | 88 | tcb0: timer@fffa0000 { |
89 | compatible = "atmel,at91rm9200-tcb"; | 89 | compatible = "atmel,at91rm9200-tcb"; |
90 | reg = <0xfffa0000 0x100>; | 90 | reg = <0xfffa0000 0x100>; |
91 | interrupts = <17 4 18 4 19 4>; | 91 | interrupts = <17 4 0 18 4 0 19 4 0>; |
92 | }; | 92 | }; |
93 | 93 | ||
94 | tcb1: timer@fffdc000 { | 94 | tcb1: timer@fffdc000 { |
95 | compatible = "atmel,at91rm9200-tcb"; | 95 | compatible = "atmel,at91rm9200-tcb"; |
96 | reg = <0xfffdc000 0x100>; | 96 | reg = <0xfffdc000 0x100>; |
97 | interrupts = <26 4 27 4 28 4>; | 97 | interrupts = <26 4 0 27 4 0 28 4 0>; |
98 | }; | 98 | }; |
99 | 99 | ||
100 | pioA: gpio@fffff400 { | 100 | pioA: gpio@fffff400 { |
101 | compatible = "atmel,at91rm9200-gpio"; | 101 | compatible = "atmel,at91rm9200-gpio"; |
102 | reg = <0xfffff400 0x100>; | 102 | reg = <0xfffff400 0x100>; |
103 | interrupts = <2 4>; | 103 | interrupts = <2 4 1>; |
104 | #gpio-cells = <2>; | 104 | #gpio-cells = <2>; |
105 | gpio-controller; | 105 | gpio-controller; |
106 | interrupt-controller; | 106 | interrupt-controller; |
@@ -109,7 +109,7 @@ | |||
109 | pioB: gpio@fffff600 { | 109 | pioB: gpio@fffff600 { |
110 | compatible = "atmel,at91rm9200-gpio"; | 110 | compatible = "atmel,at91rm9200-gpio"; |
111 | reg = <0xfffff600 0x100>; | 111 | reg = <0xfffff600 0x100>; |
112 | interrupts = <3 4>; | 112 | interrupts = <3 4 1>; |
113 | #gpio-cells = <2>; | 113 | #gpio-cells = <2>; |
114 | gpio-controller; | 114 | gpio-controller; |
115 | interrupt-controller; | 115 | interrupt-controller; |
@@ -118,7 +118,7 @@ | |||
118 | pioC: gpio@fffff800 { | 118 | pioC: gpio@fffff800 { |
119 | compatible = "atmel,at91rm9200-gpio"; | 119 | compatible = "atmel,at91rm9200-gpio"; |
120 | reg = <0xfffff800 0x100>; | 120 | reg = <0xfffff800 0x100>; |
121 | interrupts = <4 4>; | 121 | interrupts = <4 4 1>; |
122 | #gpio-cells = <2>; | 122 | #gpio-cells = <2>; |
123 | gpio-controller; | 123 | gpio-controller; |
124 | interrupt-controller; | 124 | interrupt-controller; |
@@ -127,14 +127,14 @@ | |||
127 | dbgu: serial@fffff200 { | 127 | dbgu: serial@fffff200 { |
128 | compatible = "atmel,at91sam9260-usart"; | 128 | compatible = "atmel,at91sam9260-usart"; |
129 | reg = <0xfffff200 0x200>; | 129 | reg = <0xfffff200 0x200>; |
130 | interrupts = <1 4>; | 130 | interrupts = <1 4 7>; |
131 | status = "disabled"; | 131 | status = "disabled"; |
132 | }; | 132 | }; |
133 | 133 | ||
134 | usart0: serial@fffb0000 { | 134 | usart0: serial@fffb0000 { |
135 | compatible = "atmel,at91sam9260-usart"; | 135 | compatible = "atmel,at91sam9260-usart"; |
136 | reg = <0xfffb0000 0x200>; | 136 | reg = <0xfffb0000 0x200>; |
137 | interrupts = <6 4>; | 137 | interrupts = <6 4 5>; |
138 | atmel,use-dma-rx; | 138 | atmel,use-dma-rx; |
139 | atmel,use-dma-tx; | 139 | atmel,use-dma-tx; |
140 | status = "disabled"; | 140 | status = "disabled"; |
@@ -143,7 +143,7 @@ | |||
143 | usart1: serial@fffb4000 { | 143 | usart1: serial@fffb4000 { |
144 | compatible = "atmel,at91sam9260-usart"; | 144 | compatible = "atmel,at91sam9260-usart"; |
145 | reg = <0xfffb4000 0x200>; | 145 | reg = <0xfffb4000 0x200>; |
146 | interrupts = <7 4>; | 146 | interrupts = <7 4 5>; |
147 | atmel,use-dma-rx; | 147 | atmel,use-dma-rx; |
148 | atmel,use-dma-tx; | 148 | atmel,use-dma-tx; |
149 | status = "disabled"; | 149 | status = "disabled"; |
@@ -152,7 +152,7 @@ | |||
152 | usart2: serial@fffb8000 { | 152 | usart2: serial@fffb8000 { |
153 | compatible = "atmel,at91sam9260-usart"; | 153 | compatible = "atmel,at91sam9260-usart"; |
154 | reg = <0xfffb8000 0x200>; | 154 | reg = <0xfffb8000 0x200>; |
155 | interrupts = <8 4>; | 155 | interrupts = <8 4 5>; |
156 | atmel,use-dma-rx; | 156 | atmel,use-dma-rx; |
157 | atmel,use-dma-tx; | 157 | atmel,use-dma-tx; |
158 | status = "disabled"; | 158 | status = "disabled"; |
@@ -161,7 +161,7 @@ | |||
161 | usart3: serial@fffd0000 { | 161 | usart3: serial@fffd0000 { |
162 | compatible = "atmel,at91sam9260-usart"; | 162 | compatible = "atmel,at91sam9260-usart"; |
163 | reg = <0xfffd0000 0x200>; | 163 | reg = <0xfffd0000 0x200>; |
164 | interrupts = <23 4>; | 164 | interrupts = <23 4 5>; |
165 | atmel,use-dma-rx; | 165 | atmel,use-dma-rx; |
166 | atmel,use-dma-tx; | 166 | atmel,use-dma-tx; |
167 | status = "disabled"; | 167 | status = "disabled"; |
@@ -170,7 +170,7 @@ | |||
170 | usart4: serial@fffd4000 { | 170 | usart4: serial@fffd4000 { |
171 | compatible = "atmel,at91sam9260-usart"; | 171 | compatible = "atmel,at91sam9260-usart"; |
172 | reg = <0xfffd4000 0x200>; | 172 | reg = <0xfffd4000 0x200>; |
173 | interrupts = <24 4>; | 173 | interrupts = <24 4 5>; |
174 | atmel,use-dma-rx; | 174 | atmel,use-dma-rx; |
175 | atmel,use-dma-tx; | 175 | atmel,use-dma-tx; |
176 | status = "disabled"; | 176 | status = "disabled"; |
@@ -179,7 +179,7 @@ | |||
179 | usart5: serial@fffd8000 { | 179 | usart5: serial@fffd8000 { |
180 | compatible = "atmel,at91sam9260-usart"; | 180 | compatible = "atmel,at91sam9260-usart"; |
181 | reg = <0xfffd8000 0x200>; | 181 | reg = <0xfffd8000 0x200>; |
182 | interrupts = <25 4>; | 182 | interrupts = <25 4 5>; |
183 | atmel,use-dma-rx; | 183 | atmel,use-dma-rx; |
184 | atmel,use-dma-tx; | 184 | atmel,use-dma-tx; |
185 | status = "disabled"; | 185 | status = "disabled"; |
@@ -188,21 +188,21 @@ | |||
188 | macb0: ethernet@fffc4000 { | 188 | macb0: ethernet@fffc4000 { |
189 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 189 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; |
190 | reg = <0xfffc4000 0x100>; | 190 | reg = <0xfffc4000 0x100>; |
191 | interrupts = <21 4>; | 191 | interrupts = <21 4 3>; |
192 | status = "disabled"; | 192 | status = "disabled"; |
193 | }; | 193 | }; |
194 | 194 | ||
195 | usb1: gadget@fffa4000 { | 195 | usb1: gadget@fffa4000 { |
196 | compatible = "atmel,at91rm9200-udc"; | 196 | compatible = "atmel,at91rm9200-udc"; |
197 | reg = <0xfffa4000 0x4000>; | 197 | reg = <0xfffa4000 0x4000>; |
198 | interrupts = <10 4>; | 198 | interrupts = <10 4 2>; |
199 | status = "disabled"; | 199 | status = "disabled"; |
200 | }; | 200 | }; |
201 | 201 | ||
202 | adc0: adc@fffe0000 { | 202 | adc0: adc@fffe0000 { |
203 | compatible = "atmel,at91sam9260-adc"; | 203 | compatible = "atmel,at91sam9260-adc"; |
204 | reg = <0xfffe0000 0x100>; | 204 | reg = <0xfffe0000 0x100>; |
205 | interrupts = <5 4>; | 205 | interrupts = <5 4 0>; |
206 | atmel,adc-use-external-triggers; | 206 | atmel,adc-use-external-triggers; |
207 | atmel,adc-channels-used = <0xf>; | 207 | atmel,adc-channels-used = <0xf>; |
208 | atmel,adc-vref = <3300>; | 208 | atmel,adc-vref = <3300>; |
@@ -254,7 +254,7 @@ | |||
254 | usb0: ohci@00500000 { | 254 | usb0: ohci@00500000 { |
255 | compatible = "atmel,at91rm9200-ohci", "usb-ohci"; | 255 | compatible = "atmel,at91rm9200-ohci", "usb-ohci"; |
256 | reg = <0x00500000 0x100000>; | 256 | reg = <0x00500000 0x100000>; |
257 | interrupts = <20 4>; | 257 | interrupts = <20 4 2>; |
258 | status = "disabled"; | 258 | status = "disabled"; |
259 | }; | 259 | }; |
260 | }; | 260 | }; |