diff options
author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2011-11-22 16:26:09 -0500 |
---|---|---|
committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2012-03-01 07:29:00 -0500 |
commit | e261501d05bd2df244d31e0866b1e81776766ecf (patch) | |
tree | c0699ee7b1f2c8a58ff25c5dd2a0ab211a5b423d /arch/arm/boot | |
parent | 89d4a1753b6632327f18d6c8e0842b366b736621 (diff) |
ARM: at91/aic: add irq domain and device tree support
Add an irqdomain for the AIC interrupt controller.
The device tree support is mapping the registers and
is using the irq_domain_add_legacy() to manage hwirq
translation.
The documentation is describing the meaning of the
two cells required for using this "interrupt-controller"
in a device tree node.
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r-- | arch/arm/boot/dts/at91sam9g20.dtsi | 18 | ||||
-rw-r--r-- | arch/arm/boot/dts/at91sam9g45.dtsi | 16 |
2 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20.dtsi b/arch/arm/boot/dts/at91sam9g20.dtsi index 07603b8c9503..9a0aee791a40 100644 --- a/arch/arm/boot/dts/at91sam9g20.dtsi +++ b/arch/arm/boot/dts/at91sam9g20.dtsi | |||
@@ -47,7 +47,7 @@ | |||
47 | ranges; | 47 | ranges; |
48 | 48 | ||
49 | aic: interrupt-controller@fffff000 { | 49 | aic: interrupt-controller@fffff000 { |
50 | #interrupt-cells = <1>; | 50 | #interrupt-cells = <2>; |
51 | compatible = "atmel,at91rm9200-aic"; | 51 | compatible = "atmel,at91rm9200-aic"; |
52 | interrupt-controller; | 52 | interrupt-controller; |
53 | interrupt-parent; | 53 | interrupt-parent; |
@@ -57,14 +57,14 @@ | |||
57 | dbgu: serial@fffff200 { | 57 | dbgu: serial@fffff200 { |
58 | compatible = "atmel,at91sam9260-usart"; | 58 | compatible = "atmel,at91sam9260-usart"; |
59 | reg = <0xfffff200 0x200>; | 59 | reg = <0xfffff200 0x200>; |
60 | interrupts = <1>; | 60 | interrupts = <1 4>; |
61 | status = "disabled"; | 61 | status = "disabled"; |
62 | }; | 62 | }; |
63 | 63 | ||
64 | usart0: serial@fffb0000 { | 64 | usart0: serial@fffb0000 { |
65 | compatible = "atmel,at91sam9260-usart"; | 65 | compatible = "atmel,at91sam9260-usart"; |
66 | reg = <0xfffb0000 0x200>; | 66 | reg = <0xfffb0000 0x200>; |
67 | interrupts = <6>; | 67 | interrupts = <6 4>; |
68 | atmel,use-dma-rx; | 68 | atmel,use-dma-rx; |
69 | atmel,use-dma-tx; | 69 | atmel,use-dma-tx; |
70 | status = "disabled"; | 70 | status = "disabled"; |
@@ -73,7 +73,7 @@ | |||
73 | usart1: serial@fffb4000 { | 73 | usart1: serial@fffb4000 { |
74 | compatible = "atmel,at91sam9260-usart"; | 74 | compatible = "atmel,at91sam9260-usart"; |
75 | reg = <0xfffb4000 0x200>; | 75 | reg = <0xfffb4000 0x200>; |
76 | interrupts = <7>; | 76 | interrupts = <7 4>; |
77 | atmel,use-dma-rx; | 77 | atmel,use-dma-rx; |
78 | atmel,use-dma-tx; | 78 | atmel,use-dma-tx; |
79 | status = "disabled"; | 79 | status = "disabled"; |
@@ -82,7 +82,7 @@ | |||
82 | usart2: serial@fffb8000 { | 82 | usart2: serial@fffb8000 { |
83 | compatible = "atmel,at91sam9260-usart"; | 83 | compatible = "atmel,at91sam9260-usart"; |
84 | reg = <0xfffb8000 0x200>; | 84 | reg = <0xfffb8000 0x200>; |
85 | interrupts = <8>; | 85 | interrupts = <8 4>; |
86 | atmel,use-dma-rx; | 86 | atmel,use-dma-rx; |
87 | atmel,use-dma-tx; | 87 | atmel,use-dma-tx; |
88 | status = "disabled"; | 88 | status = "disabled"; |
@@ -91,7 +91,7 @@ | |||
91 | usart3: serial@fffd0000 { | 91 | usart3: serial@fffd0000 { |
92 | compatible = "atmel,at91sam9260-usart"; | 92 | compatible = "atmel,at91sam9260-usart"; |
93 | reg = <0xfffd0000 0x200>; | 93 | reg = <0xfffd0000 0x200>; |
94 | interrupts = <23>; | 94 | interrupts = <23 4>; |
95 | atmel,use-dma-rx; | 95 | atmel,use-dma-rx; |
96 | atmel,use-dma-tx; | 96 | atmel,use-dma-tx; |
97 | status = "disabled"; | 97 | status = "disabled"; |
@@ -100,7 +100,7 @@ | |||
100 | usart4: serial@fffd4000 { | 100 | usart4: serial@fffd4000 { |
101 | compatible = "atmel,at91sam9260-usart"; | 101 | compatible = "atmel,at91sam9260-usart"; |
102 | reg = <0xfffd4000 0x200>; | 102 | reg = <0xfffd4000 0x200>; |
103 | interrupts = <24>; | 103 | interrupts = <24 4>; |
104 | atmel,use-dma-rx; | 104 | atmel,use-dma-rx; |
105 | atmel,use-dma-tx; | 105 | atmel,use-dma-tx; |
106 | status = "disabled"; | 106 | status = "disabled"; |
@@ -109,7 +109,7 @@ | |||
109 | usart5: serial@fffd8000 { | 109 | usart5: serial@fffd8000 { |
110 | compatible = "atmel,at91sam9260-usart"; | 110 | compatible = "atmel,at91sam9260-usart"; |
111 | reg = <0xfffd8000 0x200>; | 111 | reg = <0xfffd8000 0x200>; |
112 | interrupts = <25>; | 112 | interrupts = <25 4>; |
113 | atmel,use-dma-rx; | 113 | atmel,use-dma-rx; |
114 | atmel,use-dma-tx; | 114 | atmel,use-dma-tx; |
115 | status = "disabled"; | 115 | status = "disabled"; |
@@ -118,7 +118,7 @@ | |||
118 | macb0: ethernet@fffc4000 { | 118 | macb0: ethernet@fffc4000 { |
119 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 119 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; |
120 | reg = <0xfffc4000 0x100>; | 120 | reg = <0xfffc4000 0x100>; |
121 | interrupts = <21>; | 121 | interrupts = <21 4>; |
122 | status = "disabled"; | 122 | status = "disabled"; |
123 | }; | 123 | }; |
124 | }; | 124 | }; |
diff --git a/arch/arm/boot/dts/at91sam9g45.dtsi b/arch/arm/boot/dts/at91sam9g45.dtsi index fffa005300a4..67f94d3698a2 100644 --- a/arch/arm/boot/dts/at91sam9g45.dtsi +++ b/arch/arm/boot/dts/at91sam9g45.dtsi | |||
@@ -46,7 +46,7 @@ | |||
46 | ranges; | 46 | ranges; |
47 | 47 | ||
48 | aic: interrupt-controller@fffff000 { | 48 | aic: interrupt-controller@fffff000 { |
49 | #interrupt-cells = <1>; | 49 | #interrupt-cells = <2>; |
50 | compatible = "atmel,at91rm9200-aic"; | 50 | compatible = "atmel,at91rm9200-aic"; |
51 | interrupt-controller; | 51 | interrupt-controller; |
52 | interrupt-parent; | 52 | interrupt-parent; |
@@ -56,20 +56,20 @@ | |||
56 | dma: dma-controller@ffffec00 { | 56 | dma: dma-controller@ffffec00 { |
57 | compatible = "atmel,at91sam9g45-dma"; | 57 | compatible = "atmel,at91sam9g45-dma"; |
58 | reg = <0xffffec00 0x200>; | 58 | reg = <0xffffec00 0x200>; |
59 | interrupts = <21>; | 59 | interrupts = <21 4>; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | dbgu: serial@ffffee00 { | 62 | dbgu: serial@ffffee00 { |
63 | compatible = "atmel,at91sam9260-usart"; | 63 | compatible = "atmel,at91sam9260-usart"; |
64 | reg = <0xffffee00 0x200>; | 64 | reg = <0xffffee00 0x200>; |
65 | interrupts = <1>; | 65 | interrupts = <1 4>; |
66 | status = "disabled"; | 66 | status = "disabled"; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | usart0: serial@fff8c000 { | 69 | usart0: serial@fff8c000 { |
70 | compatible = "atmel,at91sam9260-usart"; | 70 | compatible = "atmel,at91sam9260-usart"; |
71 | reg = <0xfff8c000 0x200>; | 71 | reg = <0xfff8c000 0x200>; |
72 | interrupts = <7>; | 72 | interrupts = <7 4>; |
73 | atmel,use-dma-rx; | 73 | atmel,use-dma-rx; |
74 | atmel,use-dma-tx; | 74 | atmel,use-dma-tx; |
75 | status = "disabled"; | 75 | status = "disabled"; |
@@ -78,7 +78,7 @@ | |||
78 | usart1: serial@fff90000 { | 78 | usart1: serial@fff90000 { |
79 | compatible = "atmel,at91sam9260-usart"; | 79 | compatible = "atmel,at91sam9260-usart"; |
80 | reg = <0xfff90000 0x200>; | 80 | reg = <0xfff90000 0x200>; |
81 | interrupts = <8>; | 81 | interrupts = <8 4>; |
82 | atmel,use-dma-rx; | 82 | atmel,use-dma-rx; |
83 | atmel,use-dma-tx; | 83 | atmel,use-dma-tx; |
84 | status = "disabled"; | 84 | status = "disabled"; |
@@ -87,7 +87,7 @@ | |||
87 | usart2: serial@fff94000 { | 87 | usart2: serial@fff94000 { |
88 | compatible = "atmel,at91sam9260-usart"; | 88 | compatible = "atmel,at91sam9260-usart"; |
89 | reg = <0xfff94000 0x200>; | 89 | reg = <0xfff94000 0x200>; |
90 | interrupts = <9>; | 90 | interrupts = <9 4>; |
91 | atmel,use-dma-rx; | 91 | atmel,use-dma-rx; |
92 | atmel,use-dma-tx; | 92 | atmel,use-dma-tx; |
93 | status = "disabled"; | 93 | status = "disabled"; |
@@ -96,7 +96,7 @@ | |||
96 | usart3: serial@fff98000 { | 96 | usart3: serial@fff98000 { |
97 | compatible = "atmel,at91sam9260-usart"; | 97 | compatible = "atmel,at91sam9260-usart"; |
98 | reg = <0xfff98000 0x200>; | 98 | reg = <0xfff98000 0x200>; |
99 | interrupts = <10>; | 99 | interrupts = <10 4>; |
100 | atmel,use-dma-rx; | 100 | atmel,use-dma-rx; |
101 | atmel,use-dma-tx; | 101 | atmel,use-dma-tx; |
102 | status = "disabled"; | 102 | status = "disabled"; |
@@ -105,7 +105,7 @@ | |||
105 | macb0: ethernet@fffbc000 { | 105 | macb0: ethernet@fffbc000 { |
106 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; | 106 | compatible = "cdns,at32ap7000-macb", "cdns,macb"; |
107 | reg = <0xfffbc000 0x100>; | 107 | reg = <0xfffbc000 0x100>; |
108 | interrupts = <25>; | 108 | interrupts = <25 4>; |
109 | status = "disabled"; | 109 | status = "disabled"; |
110 | }; | 110 | }; |
111 | }; | 111 | }; |