diff options
author | Christian Ruppert <christian.ruppert@abilis.com> | 2013-10-31 08:58:27 -0400 |
---|---|---|
committer | Vineet Gupta <vgupta@synopsys.com> | 2013-11-10 23:27:44 -0500 |
commit | 9c8e612d9d622d6e094d67489f5a7da225eb0ea3 (patch) | |
tree | bc17bc443a40b924049dd3b3c4a52848a8abe403 /arch/arc/boot | |
parent | 5e01dc7b26d9f24f39abace5da98ccbd6a5ceb52 (diff) |
ARC: [TB10x] Updates for GPIO and pinctrl
Device tree and Kconfig updates for GPIO and pinctrl drivers.
Signed-off-by: Christian Ruppert <christian.ruppert@abilis.com>
Signed-off-by: Vineet Gupta <vgupta@synopsys.com>
Diffstat (limited to 'arch/arc/boot')
-rw-r--r-- | arch/arc/boot/dts/abilis_tb100.dtsi | 172 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb100_dvk.dts | 24 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb101.dtsi | 178 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb101_dvk.dts | 24 | ||||
-rw-r--r-- | arch/arc/boot/dts/abilis_tb10x.dtsi | 3 |
5 files changed, 214 insertions, 187 deletions
diff --git a/arch/arc/boot/dts/abilis_tb100.dtsi b/arch/arc/boot/dts/abilis_tb100.dtsi index d9f8249aa66e..3942634f805a 100644 --- a/arch/arc/boot/dts/abilis_tb100.dtsi +++ b/arch/arc/boot/dts/abilis_tb100.dtsi | |||
@@ -43,124 +43,124 @@ | |||
43 | iomux: iomux@FF10601c { | 43 | iomux: iomux@FF10601c { |
44 | /* Port 1 */ | 44 | /* Port 1 */ |
45 | pctl_tsin_s0: pctl-tsin-s0 { /* Serial TS-in 0 */ | 45 | pctl_tsin_s0: pctl-tsin-s0 { /* Serial TS-in 0 */ |
46 | pingrp = "mis0_pins"; | 46 | abilis,function = "mis0"; |
47 | }; | 47 | }; |
48 | pctl_tsin_s1: pctl-tsin-s1 { /* Serial TS-in 1 */ | 48 | pctl_tsin_s1: pctl-tsin-s1 { /* Serial TS-in 1 */ |
49 | pingrp = "mis1_pins"; | 49 | abilis,function = "mis1"; |
50 | }; | 50 | }; |
51 | pctl_gpio_a: pctl-gpio-a { /* GPIO bank A */ | 51 | pctl_gpio_a: pctl-gpio-a { /* GPIO bank A */ |
52 | pingrp = "gpioa_pins"; | 52 | abilis,function = "gpioa"; |
53 | }; | 53 | }; |
54 | pctl_tsin_p1: pctl-tsin-p1 { /* Parallel TS-in 1 */ | 54 | pctl_tsin_p1: pctl-tsin-p1 { /* Parallel TS-in 1 */ |
55 | pingrp = "mip1_pins"; | 55 | abilis,function = "mip1"; |
56 | }; | 56 | }; |
57 | /* Port 2 */ | 57 | /* Port 2 */ |
58 | pctl_tsin_s2: pctl-tsin-s2 { /* Serial TS-in 2 */ | 58 | pctl_tsin_s2: pctl-tsin-s2 { /* Serial TS-in 2 */ |
59 | pingrp = "mis2_pins"; | 59 | abilis,function = "mis2"; |
60 | }; | 60 | }; |
61 | pctl_tsin_s3: pctl-tsin-s3 { /* Serial TS-in 3 */ | 61 | pctl_tsin_s3: pctl-tsin-s3 { /* Serial TS-in 3 */ |
62 | pingrp = "mis3_pins"; | 62 | abilis,function = "mis3"; |
63 | }; | 63 | }; |
64 | pctl_gpio_c: pctl-gpio-c { /* GPIO bank C */ | 64 | pctl_gpio_c: pctl-gpio-c { /* GPIO bank C */ |
65 | pingrp = "gpioc_pins"; | 65 | abilis,function = "gpioc"; |
66 | }; | 66 | }; |
67 | pctl_tsin_p3: pctl-tsin-p3 { /* Parallel TS-in 3 */ | 67 | pctl_tsin_p3: pctl-tsin-p3 { /* Parallel TS-in 3 */ |
68 | pingrp = "mip3_pins"; | 68 | abilis,function = "mip3"; |
69 | }; | 69 | }; |
70 | /* Port 3 */ | 70 | /* Port 3 */ |
71 | pctl_tsin_s4: pctl-tsin-s4 { /* Serial TS-in 4 */ | 71 | pctl_tsin_s4: pctl-tsin-s4 { /* Serial TS-in 4 */ |
72 | pingrp = "mis4_pins"; | 72 | abilis,function = "mis4"; |
73 | }; | 73 | }; |
74 | pctl_tsin_s5: pctl-tsin-s5 { /* Serial TS-in 5 */ | 74 | pctl_tsin_s5: pctl-tsin-s5 { /* Serial TS-in 5 */ |
75 | pingrp = "mis5_pins"; | 75 | abilis,function = "mis5"; |
76 | }; | 76 | }; |
77 | pctl_gpio_e: pctl-gpio-e { /* GPIO bank E */ | 77 | pctl_gpio_e: pctl-gpio-e { /* GPIO bank E */ |
78 | pingrp = "gpioe_pins"; | 78 | abilis,function = "gpioe"; |
79 | }; | 79 | }; |
80 | pctl_tsin_p5: pctl-tsin-p5 { /* Parallel TS-in 5 */ | 80 | pctl_tsin_p5: pctl-tsin-p5 { /* Parallel TS-in 5 */ |
81 | pingrp = "mip5_pins"; | 81 | abilis,function = "mip5"; |
82 | }; | 82 | }; |
83 | /* Port 4 */ | 83 | /* Port 4 */ |
84 | pctl_tsin_s6: pctl-tsin-s6 { /* Serial TS-in 6 */ | 84 | pctl_tsin_s6: pctl-tsin-s6 { /* Serial TS-in 6 */ |
85 | pingrp = "mis6_pins"; | 85 | abilis,function = "mis6"; |
86 | }; | 86 | }; |
87 | pctl_tsin_s7: pctl-tsin-s7 { /* Serial TS-in 7 */ | 87 | pctl_tsin_s7: pctl-tsin-s7 { /* Serial TS-in 7 */ |
88 | pingrp = "mis7_pins"; | 88 | abilis,function = "mis7"; |
89 | }; | 89 | }; |
90 | pctl_gpio_g: pctl-gpio-g { /* GPIO bank G */ | 90 | pctl_gpio_g: pctl-gpio-g { /* GPIO bank G */ |
91 | pingrp = "gpiog_pins"; | 91 | abilis,function = "gpiog"; |
92 | }; | 92 | }; |
93 | pctl_tsin_p7: pctl-tsin-p7 { /* Parallel TS-in 7 */ | 93 | pctl_tsin_p7: pctl-tsin-p7 { /* Parallel TS-in 7 */ |
94 | pingrp = "mip7_pins"; | 94 | abilis,function = "mip7"; |
95 | }; | 95 | }; |
96 | /* Port 5 */ | 96 | /* Port 5 */ |
97 | pctl_gpio_j: pctl-gpio-j { /* GPIO bank J */ | 97 | pctl_gpio_j: pctl-gpio-j { /* GPIO bank J */ |
98 | pingrp = "gpioj_pins"; | 98 | abilis,function = "gpioj"; |
99 | }; | 99 | }; |
100 | pctl_gpio_k: pctl-gpio-k { /* GPIO bank K */ | 100 | pctl_gpio_k: pctl-gpio-k { /* GPIO bank K */ |
101 | pingrp = "gpiok_pins"; | 101 | abilis,function = "gpiok"; |
102 | }; | 102 | }; |
103 | pctl_ciplus: pctl-ciplus { /* CI+ interface */ | 103 | pctl_ciplus: pctl-ciplus { /* CI+ interface */ |
104 | pingrp = "ciplus_pins"; | 104 | abilis,function = "ciplus"; |
105 | }; | 105 | }; |
106 | pctl_mcard: pctl-mcard { /* M-Card interface */ | 106 | pctl_mcard: pctl-mcard { /* M-Card interface */ |
107 | pingrp = "mcard_pins"; | 107 | abilis,function = "mcard"; |
108 | }; | 108 | }; |
109 | /* Port 6 */ | 109 | /* Port 6 */ |
110 | pctl_tsout_p: pctl-tsout-p { /* Parallel TS-out */ | 110 | pctl_tsout_p: pctl-tsout-p { /* Parallel TS-out */ |
111 | pingrp = "mop_pins"; | 111 | abilis,function = "mop"; |
112 | }; | 112 | }; |
113 | pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */ | 113 | pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */ |
114 | pingrp = "mos0_pins"; | 114 | abilis,function = "mos0"; |
115 | }; | 115 | }; |
116 | pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */ | 116 | pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */ |
117 | pingrp = "mos1_pins"; | 117 | abilis,function = "mos1"; |
118 | }; | 118 | }; |
119 | pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */ | 119 | pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */ |
120 | pingrp = "mos2_pins"; | 120 | abilis,function = "mos2"; |
121 | }; | 121 | }; |
122 | pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */ | 122 | pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */ |
123 | pingrp = "mos3_pins"; | 123 | abilis,function = "mos3"; |
124 | }; | 124 | }; |
125 | /* Port 7 */ | 125 | /* Port 7 */ |
126 | pctl_uart0: pctl-uart0 { /* UART 0 */ | 126 | pctl_uart0: pctl-uart0 { /* UART 0 */ |
127 | pingrp = "uart0_pins"; | 127 | abilis,function = "uart0"; |
128 | }; | 128 | }; |
129 | pctl_uart1: pctl-uart1 { /* UART 1 */ | 129 | pctl_uart1: pctl-uart1 { /* UART 1 */ |
130 | pingrp = "uart1_pins"; | 130 | abilis,function = "uart1"; |
131 | }; | 131 | }; |
132 | pctl_gpio_l: pctl-gpio-l { /* GPIO bank L */ | 132 | pctl_gpio_l: pctl-gpio-l { /* GPIO bank L */ |
133 | pingrp = "gpiol_pins"; | 133 | abilis,function = "gpiol"; |
134 | }; | 134 | }; |
135 | pctl_gpio_m: pctl-gpio-m { /* GPIO bank M */ | 135 | pctl_gpio_m: pctl-gpio-m { /* GPIO bank M */ |
136 | pingrp = "gpiom_pins"; | 136 | abilis,function = "gpiom"; |
137 | }; | 137 | }; |
138 | /* Port 8 */ | 138 | /* Port 8 */ |
139 | pctl_spi3: pctl-spi3 { | 139 | pctl_spi3: pctl-spi3 { |
140 | pingrp = "spi3_pins"; | 140 | abilis,function = "spi3"; |
141 | }; | 141 | }; |
142 | /* Port 9 */ | 142 | /* Port 9 */ |
143 | pctl_spi1: pctl-spi1 { | 143 | pctl_spi1: pctl-spi1 { |
144 | pingrp = "spi1_pins"; | 144 | abilis,function = "spi1"; |
145 | }; | 145 | }; |
146 | pctl_gpio_n: pctl-gpio-n { | 146 | pctl_gpio_n: pctl-gpio-n { |
147 | pingrp = "gpion_pins"; | 147 | abilis,function = "gpion"; |
148 | }; | 148 | }; |
149 | /* Unmuxed GPIOs */ | 149 | /* Unmuxed GPIOs */ |
150 | pctl_gpio_b: pctl-gpio-b { | 150 | pctl_gpio_b: pctl-gpio-b { |
151 | pingrp = "gpiob_pins"; | 151 | abilis,function = "gpiob"; |
152 | }; | 152 | }; |
153 | pctl_gpio_d: pctl-gpio-d { | 153 | pctl_gpio_d: pctl-gpio-d { |
154 | pingrp = "gpiod_pins"; | 154 | abilis,function = "gpiod"; |
155 | }; | 155 | }; |
156 | pctl_gpio_f: pctl-gpio-f { | 156 | pctl_gpio_f: pctl-gpio-f { |
157 | pingrp = "gpiof_pins"; | 157 | abilis,function = "gpiof"; |
158 | }; | 158 | }; |
159 | pctl_gpio_h: pctl-gpio-h { | 159 | pctl_gpio_h: pctl-gpio-h { |
160 | pingrp = "gpioh_pins"; | 160 | abilis,function = "gpioh"; |
161 | }; | 161 | }; |
162 | pctl_gpio_i: pctl-gpio-i { | 162 | pctl_gpio_i: pctl-gpio-i { |
163 | pingrp = "gpioi_pins"; | 163 | abilis,function = "gpioi"; |
164 | }; | 164 | }; |
165 | }; | 165 | }; |
166 | 166 | ||
@@ -172,9 +172,10 @@ | |||
172 | interrupts = <27 2>; | 172 | interrupts = <27 2>; |
173 | reg = <0xFF140000 0x1000>; | 173 | reg = <0xFF140000 0x1000>; |
174 | gpio-controller; | 174 | gpio-controller; |
175 | #gpio-cells = <1>; | 175 | #gpio-cells = <2>; |
176 | gpio-base = <0>; | 176 | abilis,ngpio = <3>; |
177 | gpio-pins = <&pctl_gpio_a>; | 177 | gpio-ranges = <&iomux 0 0 0>; |
178 | gpio-ranges-group-names = "gpioa"; | ||
178 | }; | 179 | }; |
179 | gpiob: gpio@FF141000 { | 180 | gpiob: gpio@FF141000 { |
180 | compatible = "abilis,tb10x-gpio"; | 181 | compatible = "abilis,tb10x-gpio"; |
@@ -184,9 +185,10 @@ | |||
184 | interrupts = <27 2>; | 185 | interrupts = <27 2>; |
185 | reg = <0xFF141000 0x1000>; | 186 | reg = <0xFF141000 0x1000>; |
186 | gpio-controller; | 187 | gpio-controller; |
187 | #gpio-cells = <1>; | 188 | #gpio-cells = <2>; |
188 | gpio-base = <3>; | 189 | abilis,ngpio = <2>; |
189 | gpio-pins = <&pctl_gpio_b>; | 190 | gpio-ranges = <&iomux 0 0 0>; |
191 | gpio-ranges-group-names = "gpiob"; | ||
190 | }; | 192 | }; |
191 | gpioc: gpio@FF142000 { | 193 | gpioc: gpio@FF142000 { |
192 | compatible = "abilis,tb10x-gpio"; | 194 | compatible = "abilis,tb10x-gpio"; |
@@ -196,9 +198,10 @@ | |||
196 | interrupts = <27 2>; | 198 | interrupts = <27 2>; |
197 | reg = <0xFF142000 0x1000>; | 199 | reg = <0xFF142000 0x1000>; |
198 | gpio-controller; | 200 | gpio-controller; |
199 | #gpio-cells = <1>; | 201 | #gpio-cells = <2>; |
200 | gpio-base = <5>; | 202 | abilis,ngpio = <3>; |
201 | gpio-pins = <&pctl_gpio_c>; | 203 | gpio-ranges = <&iomux 0 0 0>; |
204 | gpio-ranges-group-names = "gpioc"; | ||
202 | }; | 205 | }; |
203 | gpiod: gpio@FF143000 { | 206 | gpiod: gpio@FF143000 { |
204 | compatible = "abilis,tb10x-gpio"; | 207 | compatible = "abilis,tb10x-gpio"; |
@@ -208,9 +211,10 @@ | |||
208 | interrupts = <27 2>; | 211 | interrupts = <27 2>; |
209 | reg = <0xFF143000 0x1000>; | 212 | reg = <0xFF143000 0x1000>; |
210 | gpio-controller; | 213 | gpio-controller; |
211 | #gpio-cells = <1>; | 214 | #gpio-cells = <2>; |
212 | gpio-base = <8>; | 215 | abilis,ngpio = <2>; |
213 | gpio-pins = <&pctl_gpio_d>; | 216 | gpio-ranges = <&iomux 0 0 0>; |
217 | gpio-ranges-group-names = "gpiod"; | ||
214 | }; | 218 | }; |
215 | gpioe: gpio@FF144000 { | 219 | gpioe: gpio@FF144000 { |
216 | compatible = "abilis,tb10x-gpio"; | 220 | compatible = "abilis,tb10x-gpio"; |
@@ -220,9 +224,10 @@ | |||
220 | interrupts = <27 2>; | 224 | interrupts = <27 2>; |
221 | reg = <0xFF144000 0x1000>; | 225 | reg = <0xFF144000 0x1000>; |
222 | gpio-controller; | 226 | gpio-controller; |
223 | #gpio-cells = <1>; | 227 | #gpio-cells = <2>; |
224 | gpio-base = <10>; | 228 | abilis,ngpio = <3>; |
225 | gpio-pins = <&pctl_gpio_e>; | 229 | gpio-ranges = <&iomux 0 0 0>; |
230 | gpio-ranges-group-names = "gpioe"; | ||
226 | }; | 231 | }; |
227 | gpiof: gpio@FF145000 { | 232 | gpiof: gpio@FF145000 { |
228 | compatible = "abilis,tb10x-gpio"; | 233 | compatible = "abilis,tb10x-gpio"; |
@@ -232,9 +237,10 @@ | |||
232 | interrupts = <27 2>; | 237 | interrupts = <27 2>; |
233 | reg = <0xFF145000 0x1000>; | 238 | reg = <0xFF145000 0x1000>; |
234 | gpio-controller; | 239 | gpio-controller; |
235 | #gpio-cells = <1>; | 240 | #gpio-cells = <2>; |
236 | gpio-base = <13>; | 241 | abilis,ngpio = <2>; |
237 | gpio-pins = <&pctl_gpio_f>; | 242 | gpio-ranges = <&iomux 0 0 0>; |
243 | gpio-ranges-group-names = "gpiof"; | ||
238 | }; | 244 | }; |
239 | gpiog: gpio@FF146000 { | 245 | gpiog: gpio@FF146000 { |
240 | compatible = "abilis,tb10x-gpio"; | 246 | compatible = "abilis,tb10x-gpio"; |
@@ -244,9 +250,10 @@ | |||
244 | interrupts = <27 2>; | 250 | interrupts = <27 2>; |
245 | reg = <0xFF146000 0x1000>; | 251 | reg = <0xFF146000 0x1000>; |
246 | gpio-controller; | 252 | gpio-controller; |
247 | #gpio-cells = <1>; | 253 | #gpio-cells = <2>; |
248 | gpio-base = <15>; | 254 | abilis,ngpio = <3>; |
249 | gpio-pins = <&pctl_gpio_g>; | 255 | gpio-ranges = <&iomux 0 0 0>; |
256 | gpio-ranges-group-names = "gpiog"; | ||
250 | }; | 257 | }; |
251 | gpioh: gpio@FF147000 { | 258 | gpioh: gpio@FF147000 { |
252 | compatible = "abilis,tb10x-gpio"; | 259 | compatible = "abilis,tb10x-gpio"; |
@@ -256,9 +263,10 @@ | |||
256 | interrupts = <27 2>; | 263 | interrupts = <27 2>; |
257 | reg = <0xFF147000 0x1000>; | 264 | reg = <0xFF147000 0x1000>; |
258 | gpio-controller; | 265 | gpio-controller; |
259 | #gpio-cells = <1>; | 266 | #gpio-cells = <2>; |
260 | gpio-base = <18>; | 267 | abilis,ngpio = <2>; |
261 | gpio-pins = <&pctl_gpio_h>; | 268 | gpio-ranges = <&iomux 0 0 0>; |
269 | gpio-ranges-group-names = "gpioh"; | ||
262 | }; | 270 | }; |
263 | gpioi: gpio@FF148000 { | 271 | gpioi: gpio@FF148000 { |
264 | compatible = "abilis,tb10x-gpio"; | 272 | compatible = "abilis,tb10x-gpio"; |
@@ -268,9 +276,10 @@ | |||
268 | interrupts = <27 2>; | 276 | interrupts = <27 2>; |
269 | reg = <0xFF148000 0x1000>; | 277 | reg = <0xFF148000 0x1000>; |
270 | gpio-controller; | 278 | gpio-controller; |
271 | #gpio-cells = <1>; | 279 | #gpio-cells = <2>; |
272 | gpio-base = <20>; | 280 | abilis,ngpio = <12>; |
273 | gpio-pins = <&pctl_gpio_i>; | 281 | gpio-ranges = <&iomux 0 0 0>; |
282 | gpio-ranges-group-names = "gpioi"; | ||
274 | }; | 283 | }; |
275 | gpioj: gpio@FF149000 { | 284 | gpioj: gpio@FF149000 { |
276 | compatible = "abilis,tb10x-gpio"; | 285 | compatible = "abilis,tb10x-gpio"; |
@@ -280,9 +289,10 @@ | |||
280 | interrupts = <27 2>; | 289 | interrupts = <27 2>; |
281 | reg = <0xFF149000 0x1000>; | 290 | reg = <0xFF149000 0x1000>; |
282 | gpio-controller; | 291 | gpio-controller; |
283 | #gpio-cells = <1>; | 292 | #gpio-cells = <2>; |
284 | gpio-base = <32>; | 293 | abilis,ngpio = <32>; |
285 | gpio-pins = <&pctl_gpio_j>; | 294 | gpio-ranges = <&iomux 0 0 0>; |
295 | gpio-ranges-group-names = "gpioj"; | ||
286 | }; | 296 | }; |
287 | gpiok: gpio@FF14a000 { | 297 | gpiok: gpio@FF14a000 { |
288 | compatible = "abilis,tb10x-gpio"; | 298 | compatible = "abilis,tb10x-gpio"; |
@@ -292,9 +302,10 @@ | |||
292 | interrupts = <27 2>; | 302 | interrupts = <27 2>; |
293 | reg = <0xFF14A000 0x1000>; | 303 | reg = <0xFF14A000 0x1000>; |
294 | gpio-controller; | 304 | gpio-controller; |
295 | #gpio-cells = <1>; | 305 | #gpio-cells = <2>; |
296 | gpio-base = <64>; | 306 | abilis,ngpio = <22>; |
297 | gpio-pins = <&pctl_gpio_k>; | 307 | gpio-ranges = <&iomux 0 0 0>; |
308 | gpio-ranges-group-names = "gpiok"; | ||
298 | }; | 309 | }; |
299 | gpiol: gpio@FF14b000 { | 310 | gpiol: gpio@FF14b000 { |
300 | compatible = "abilis,tb10x-gpio"; | 311 | compatible = "abilis,tb10x-gpio"; |
@@ -304,9 +315,10 @@ | |||
304 | interrupts = <27 2>; | 315 | interrupts = <27 2>; |
305 | reg = <0xFF14B000 0x1000>; | 316 | reg = <0xFF14B000 0x1000>; |
306 | gpio-controller; | 317 | gpio-controller; |
307 | #gpio-cells = <1>; | 318 | #gpio-cells = <2>; |
308 | gpio-base = <86>; | 319 | abilis,ngpio = <4>; |
309 | gpio-pins = <&pctl_gpio_l>; | 320 | gpio-ranges = <&iomux 0 0 0>; |
321 | gpio-ranges-group-names = "gpiol"; | ||
310 | }; | 322 | }; |
311 | gpiom: gpio@FF14c000 { | 323 | gpiom: gpio@FF14c000 { |
312 | compatible = "abilis,tb10x-gpio"; | 324 | compatible = "abilis,tb10x-gpio"; |
@@ -316,9 +328,10 @@ | |||
316 | interrupts = <27 2>; | 328 | interrupts = <27 2>; |
317 | reg = <0xFF14C000 0x1000>; | 329 | reg = <0xFF14C000 0x1000>; |
318 | gpio-controller; | 330 | gpio-controller; |
319 | #gpio-cells = <1>; | 331 | #gpio-cells = <2>; |
320 | gpio-base = <90>; | 332 | abilis,ngpio = <4>; |
321 | gpio-pins = <&pctl_gpio_m>; | 333 | gpio-ranges = <&iomux 0 0 0>; |
334 | gpio-ranges-group-names = "gpiom"; | ||
322 | }; | 335 | }; |
323 | gpion: gpio@FF14d000 { | 336 | gpion: gpio@FF14d000 { |
324 | compatible = "abilis,tb10x-gpio"; | 337 | compatible = "abilis,tb10x-gpio"; |
@@ -328,9 +341,10 @@ | |||
328 | interrupts = <27 2>; | 341 | interrupts = <27 2>; |
329 | reg = <0xFF14D000 0x1000>; | 342 | reg = <0xFF14D000 0x1000>; |
330 | gpio-controller; | 343 | gpio-controller; |
331 | #gpio-cells = <1>; | 344 | #gpio-cells = <2>; |
332 | gpio-base = <94>; | 345 | abilis,ngpio = <5>; |
333 | gpio-pins = <&pctl_gpio_n>; | 346 | gpio-ranges = <&iomux 0 0 0>; |
347 | gpio-ranges-group-names = "gpion"; | ||
334 | }; | 348 | }; |
335 | }; | 349 | }; |
336 | }; | 350 | }; |
diff --git a/arch/arc/boot/dts/abilis_tb100_dvk.dts b/arch/arc/boot/dts/abilis_tb100_dvk.dts index ebc313a9f5b2..3dd6ed941464 100644 --- a/arch/arc/boot/dts/abilis_tb100_dvk.dts +++ b/arch/arc/boot/dts/abilis_tb100_dvk.dts | |||
@@ -64,62 +64,62 @@ | |||
64 | compatible = "gpio-leds"; | 64 | compatible = "gpio-leds"; |
65 | power { | 65 | power { |
66 | label = "Power"; | 66 | label = "Power"; |
67 | gpios = <&gpioi 0>; | 67 | gpios = <&gpioi 0 0>; |
68 | linux,default-trigger = "default-on"; | 68 | linux,default-trigger = "default-on"; |
69 | }; | 69 | }; |
70 | heartbeat { | 70 | heartbeat { |
71 | label = "Heartbeat"; | 71 | label = "Heartbeat"; |
72 | gpios = <&gpioi 1>; | 72 | gpios = <&gpioi 1 0>; |
73 | linux,default-trigger = "heartbeat"; | 73 | linux,default-trigger = "heartbeat"; |
74 | }; | 74 | }; |
75 | led2 { | 75 | led2 { |
76 | label = "LED2"; | 76 | label = "LED2"; |
77 | gpios = <&gpioi 2>; | 77 | gpios = <&gpioi 2 0>; |
78 | default-state = "off"; | 78 | default-state = "off"; |
79 | }; | 79 | }; |
80 | led3 { | 80 | led3 { |
81 | label = "LED3"; | 81 | label = "LED3"; |
82 | gpios = <&gpioi 3>; | 82 | gpios = <&gpioi 3 0>; |
83 | default-state = "off"; | 83 | default-state = "off"; |
84 | }; | 84 | }; |
85 | led4 { | 85 | led4 { |
86 | label = "LED4"; | 86 | label = "LED4"; |
87 | gpios = <&gpioi 4>; | 87 | gpios = <&gpioi 4 0>; |
88 | default-state = "off"; | 88 | default-state = "off"; |
89 | }; | 89 | }; |
90 | led5 { | 90 | led5 { |
91 | label = "LED5"; | 91 | label = "LED5"; |
92 | gpios = <&gpioi 5>; | 92 | gpios = <&gpioi 5 0>; |
93 | default-state = "off"; | 93 | default-state = "off"; |
94 | }; | 94 | }; |
95 | led6 { | 95 | led6 { |
96 | label = "LED6"; | 96 | label = "LED6"; |
97 | gpios = <&gpioi 6>; | 97 | gpios = <&gpioi 6 0>; |
98 | default-state = "off"; | 98 | default-state = "off"; |
99 | }; | 99 | }; |
100 | led7 { | 100 | led7 { |
101 | label = "LED7"; | 101 | label = "LED7"; |
102 | gpios = <&gpioi 7>; | 102 | gpios = <&gpioi 7 0>; |
103 | default-state = "off"; | 103 | default-state = "off"; |
104 | }; | 104 | }; |
105 | led8 { | 105 | led8 { |
106 | label = "LED8"; | 106 | label = "LED8"; |
107 | gpios = <&gpioi 8>; | 107 | gpios = <&gpioi 8 0>; |
108 | default-state = "off"; | 108 | default-state = "off"; |
109 | }; | 109 | }; |
110 | led9 { | 110 | led9 { |
111 | label = "LED9"; | 111 | label = "LED9"; |
112 | gpios = <&gpioi 9>; | 112 | gpios = <&gpioi 9 0>; |
113 | default-state = "off"; | 113 | default-state = "off"; |
114 | }; | 114 | }; |
115 | led10 { | 115 | led10 { |
116 | label = "LED10"; | 116 | label = "LED10"; |
117 | gpios = <&gpioi 10>; | 117 | gpios = <&gpioi 10 0>; |
118 | default-state = "off"; | 118 | default-state = "off"; |
119 | }; | 119 | }; |
120 | led11 { | 120 | led11 { |
121 | label = "LED11"; | 121 | label = "LED11"; |
122 | gpios = <&gpioi 11>; | 122 | gpios = <&gpioi 11 0>; |
123 | default-state = "off"; | 123 | default-state = "off"; |
124 | }; | 124 | }; |
125 | }; | 125 | }; |
diff --git a/arch/arc/boot/dts/abilis_tb101.dtsi b/arch/arc/boot/dts/abilis_tb101.dtsi index da8ca7941e67..b0467229a5c4 100644 --- a/arch/arc/boot/dts/abilis_tb101.dtsi +++ b/arch/arc/boot/dts/abilis_tb101.dtsi | |||
@@ -43,133 +43,133 @@ | |||
43 | iomux: iomux@FF10601c { | 43 | iomux: iomux@FF10601c { |
44 | /* Port 1 */ | 44 | /* Port 1 */ |
45 | pctl_tsin_s0: pctl-tsin-s0 { /* Serial TS-in 0 */ | 45 | pctl_tsin_s0: pctl-tsin-s0 { /* Serial TS-in 0 */ |
46 | pingrp = "mis0_pins"; | 46 | abilis,function = "mis0"; |
47 | }; | 47 | }; |
48 | pctl_tsin_s1: pctl-tsin-s1 { /* Serial TS-in 1 */ | 48 | pctl_tsin_s1: pctl-tsin-s1 { /* Serial TS-in 1 */ |
49 | pingrp = "mis1_pins"; | 49 | abilis,function = "mis1"; |
50 | }; | 50 | }; |
51 | pctl_gpio_a: pctl-gpio-a { /* GPIO bank A */ | 51 | pctl_gpio_a: pctl-gpio-a { /* GPIO bank A */ |
52 | pingrp = "gpioa_pins"; | 52 | abilis,function = "gpioa"; |
53 | }; | 53 | }; |
54 | pctl_tsin_p1: pctl-tsin-p1 { /* Parallel TS-in 1 */ | 54 | pctl_tsin_p1: pctl-tsin-p1 { /* Parallel TS-in 1 */ |
55 | pingrp = "mip1_pins"; | 55 | abilis,function = "mip1"; |
56 | }; | 56 | }; |
57 | /* Port 2 */ | 57 | /* Port 2 */ |
58 | pctl_tsin_s2: pctl-tsin-s2 { /* Serial TS-in 2 */ | 58 | pctl_tsin_s2: pctl-tsin-s2 { /* Serial TS-in 2 */ |
59 | pingrp = "mis2_pins"; | 59 | abilis,function = "mis2"; |
60 | }; | 60 | }; |
61 | pctl_tsin_s3: pctl-tsin-s3 { /* Serial TS-in 3 */ | 61 | pctl_tsin_s3: pctl-tsin-s3 { /* Serial TS-in 3 */ |
62 | pingrp = "mis3_pins"; | 62 | abilis,function = "mis3"; |
63 | }; | 63 | }; |
64 | pctl_gpio_c: pctl-gpio-c { /* GPIO bank C */ | 64 | pctl_gpio_c: pctl-gpio-c { /* GPIO bank C */ |
65 | pingrp = "gpioc_pins"; | 65 | abilis,function = "gpioc"; |
66 | }; | 66 | }; |
67 | pctl_tsin_p3: pctl-tsin-p3 { /* Parallel TS-in 3 */ | 67 | pctl_tsin_p3: pctl-tsin-p3 { /* Parallel TS-in 3 */ |
68 | pingrp = "mip3_pins"; | 68 | abilis,function = "mip3"; |
69 | }; | 69 | }; |
70 | /* Port 3 */ | 70 | /* Port 3 */ |
71 | pctl_tsin_s4: pctl-tsin-s4 { /* Serial TS-in 4 */ | 71 | pctl_tsin_s4: pctl-tsin-s4 { /* Serial TS-in 4 */ |
72 | pingrp = "mis4_pins"; | 72 | abilis,function = "mis4"; |
73 | }; | 73 | }; |
74 | pctl_tsin_s5: pctl-tsin-s5 { /* Serial TS-in 5 */ | 74 | pctl_tsin_s5: pctl-tsin-s5 { /* Serial TS-in 5 */ |
75 | pingrp = "mis5_pins"; | 75 | abilis,function = "mis5"; |
76 | }; | 76 | }; |
77 | pctl_gpio_e: pctl-gpio-e { /* GPIO bank E */ | 77 | pctl_gpio_e: pctl-gpio-e { /* GPIO bank E */ |
78 | pingrp = "gpioe_pins"; | 78 | abilis,function = "gpioe"; |
79 | }; | 79 | }; |
80 | pctl_tsin_p5: pctl-tsin-p5 { /* Parallel TS-in 5 */ | 80 | pctl_tsin_p5: pctl-tsin-p5 { /* Parallel TS-in 5 */ |
81 | pingrp = "mip5_pins"; | 81 | abilis,function = "mip5"; |
82 | }; | 82 | }; |
83 | /* Port 4 */ | 83 | /* Port 4 */ |
84 | pctl_tsin_s6: pctl-tsin-s6 { /* Serial TS-in 6 */ | 84 | pctl_tsin_s6: pctl-tsin-s6 { /* Serial TS-in 6 */ |
85 | pingrp = "mis6_pins"; | 85 | abilis,function = "mis6"; |
86 | }; | 86 | }; |
87 | pctl_tsin_s7: pctl-tsin-s7 { /* Serial TS-in 7 */ | 87 | pctl_tsin_s7: pctl-tsin-s7 { /* Serial TS-in 7 */ |
88 | pingrp = "mis7_pins"; | 88 | abilis,function = "mis7"; |
89 | }; | 89 | }; |
90 | pctl_gpio_g: pctl-gpio-g { /* GPIO bank G */ | 90 | pctl_gpio_g: pctl-gpio-g { /* GPIO bank G */ |
91 | pingrp = "gpiog_pins"; | 91 | abilis,function = "gpiog"; |
92 | }; | 92 | }; |
93 | pctl_tsin_p7: pctl-tsin-p7 { /* Parallel TS-in 7 */ | 93 | pctl_tsin_p7: pctl-tsin-p7 { /* Parallel TS-in 7 */ |
94 | pingrp = "mip7_pins"; | 94 | abilis,function = "mip7"; |
95 | }; | 95 | }; |
96 | /* Port 5 */ | 96 | /* Port 5 */ |
97 | pctl_gpio_j: pctl-gpio-j { /* GPIO bank J */ | 97 | pctl_gpio_j: pctl-gpio-j { /* GPIO bank J */ |
98 | pingrp = "gpioj_pins"; | 98 | abilis,function = "gpioj"; |
99 | }; | 99 | }; |
100 | pctl_gpio_k: pctl-gpio-k { /* GPIO bank K */ | 100 | pctl_gpio_k: pctl-gpio-k { /* GPIO bank K */ |
101 | pingrp = "gpiok_pins"; | 101 | abilis,function = "gpiok"; |
102 | }; | 102 | }; |
103 | pctl_ciplus: pctl-ciplus { /* CI+ interface */ | 103 | pctl_ciplus: pctl-ciplus { /* CI+ interface */ |
104 | pingrp = "ciplus_pins"; | 104 | abilis,function = "ciplus"; |
105 | }; | 105 | }; |
106 | pctl_mcard: pctl-mcard { /* M-Card interface */ | 106 | pctl_mcard: pctl-mcard { /* M-Card interface */ |
107 | pingrp = "mcard_pins"; | 107 | abilis,function = "mcard"; |
108 | }; | 108 | }; |
109 | pctl_stc0: pctl-stc0 { /* Smart card I/F 0 */ | 109 | pctl_stc0: pctl-stc0 { /* Smart card I/F 0 */ |
110 | pingrp = "stc0_pins"; | 110 | abilis,function = "stc0"; |
111 | }; | 111 | }; |
112 | pctl_stc1: pctl-stc1 { /* Smart card I/F 1 */ | 112 | pctl_stc1: pctl-stc1 { /* Smart card I/F 1 */ |
113 | pingrp = "stc1_pins"; | 113 | abilis,function = "stc1"; |
114 | }; | 114 | }; |
115 | /* Port 6 */ | 115 | /* Port 6 */ |
116 | pctl_tsout_p: pctl-tsout-p { /* Parallel TS-out */ | 116 | pctl_tsout_p: pctl-tsout-p { /* Parallel TS-out */ |
117 | pingrp = "mop_pins"; | 117 | abilis,function = "mop"; |
118 | }; | 118 | }; |
119 | pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */ | 119 | pctl_tsout_s0: pctl-tsout-s0 { /* Serial TS-out 0 */ |
120 | pingrp = "mos0_pins"; | 120 | abilis,function = "mos0"; |
121 | }; | 121 | }; |
122 | pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */ | 122 | pctl_tsout_s1: pctl-tsout-s1 { /* Serial TS-out 1 */ |
123 | pingrp = "mos1_pins"; | 123 | abilis,function = "mos1"; |
124 | }; | 124 | }; |
125 | pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */ | 125 | pctl_tsout_s2: pctl-tsout-s2 { /* Serial TS-out 2 */ |
126 | pingrp = "mos2_pins"; | 126 | abilis,function = "mos2"; |
127 | }; | 127 | }; |
128 | pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */ | 128 | pctl_tsout_s3: pctl-tsout-s3 { /* Serial TS-out 3 */ |
129 | pingrp = "mos3_pins"; | 129 | abilis,function = "mos3"; |
130 | }; | 130 | }; |
131 | /* Port 7 */ | 131 | /* Port 7 */ |
132 | pctl_uart0: pctl-uart0 { /* UART 0 */ | 132 | pctl_uart0: pctl-uart0 { /* UART 0 */ |
133 | pingrp = "uart0_pins"; | 133 | abilis,function = "uart0"; |
134 | }; | 134 | }; |
135 | pctl_uart1: pctl-uart1 { /* UART 1 */ | 135 | pctl_uart1: pctl-uart1 { /* UART 1 */ |
136 | pingrp = "uart1_pins"; | 136 | abilis,function = "uart1"; |
137 | }; | 137 | }; |
138 | pctl_gpio_l: pctl-gpio-l { /* GPIO bank L */ | 138 | pctl_gpio_l: pctl-gpio-l { /* GPIO bank L */ |
139 | pingrp = "gpiol_pins"; | 139 | abilis,function = "gpiol"; |
140 | }; | 140 | }; |
141 | pctl_gpio_m: pctl-gpio-m { /* GPIO bank M */ | 141 | pctl_gpio_m: pctl-gpio-m { /* GPIO bank M */ |
142 | pingrp = "gpiom_pins"; | 142 | abilis,function = "gpiom"; |
143 | }; | 143 | }; |
144 | /* Port 8 */ | 144 | /* Port 8 */ |
145 | pctl_spi3: pctl-spi3 { | 145 | pctl_spi3: pctl-spi3 { |
146 | pingrp = "spi3_pins"; | 146 | abilis,function = "spi3"; |
147 | }; | 147 | }; |
148 | pctl_jtag: pctl-jtag { | 148 | pctl_jtag: pctl-jtag { |
149 | pingrp = "jtag_pins"; | 149 | abilis,function = "jtag"; |
150 | }; | 150 | }; |
151 | /* Port 9 */ | 151 | /* Port 9 */ |
152 | pctl_spi1: pctl-spi1 { | 152 | pctl_spi1: pctl-spi1 { |
153 | pingrp = "spi1_pins"; | 153 | abilis,function = "spi1"; |
154 | }; | 154 | }; |
155 | pctl_gpio_n: pctl-gpio-n { | 155 | pctl_gpio_n: pctl-gpio-n { |
156 | pingrp = "gpion_pins"; | 156 | abilis,function = "gpion"; |
157 | }; | 157 | }; |
158 | /* Unmuxed GPIOs */ | 158 | /* Unmuxed GPIOs */ |
159 | pctl_gpio_b: pctl-gpio-b { | 159 | pctl_gpio_b: pctl-gpio-b { |
160 | pingrp = "gpiob_pins"; | 160 | abilis,function = "gpiob"; |
161 | }; | 161 | }; |
162 | pctl_gpio_d: pctl-gpio-d { | 162 | pctl_gpio_d: pctl-gpio-d { |
163 | pingrp = "gpiod_pins"; | 163 | abilis,function = "gpiod"; |
164 | }; | 164 | }; |
165 | pctl_gpio_f: pctl-gpio-f { | 165 | pctl_gpio_f: pctl-gpio-f { |
166 | pingrp = "gpiof_pins"; | 166 | abilis,function = "gpiof"; |
167 | }; | 167 | }; |
168 | pctl_gpio_h: pctl-gpio-h { | 168 | pctl_gpio_h: pctl-gpio-h { |
169 | pingrp = "gpioh_pins"; | 169 | abilis,function = "gpioh"; |
170 | }; | 170 | }; |
171 | pctl_gpio_i: pctl-gpio-i { | 171 | pctl_gpio_i: pctl-gpio-i { |
172 | pingrp = "gpioi_pins"; | 172 | abilis,function = "gpioi"; |
173 | }; | 173 | }; |
174 | }; | 174 | }; |
175 | 175 | ||
@@ -181,9 +181,10 @@ | |||
181 | interrupts = <27 2>; | 181 | interrupts = <27 2>; |
182 | reg = <0xFF140000 0x1000>; | 182 | reg = <0xFF140000 0x1000>; |
183 | gpio-controller; | 183 | gpio-controller; |
184 | #gpio-cells = <1>; | 184 | #gpio-cells = <2>; |
185 | gpio-base = <0>; | 185 | abilis,ngpio = <3>; |
186 | gpio-pins = <&pctl_gpio_a>; | 186 | gpio-ranges = <&iomux 0 0 0>; |
187 | gpio-ranges-group-names = "gpioa"; | ||
187 | }; | 188 | }; |
188 | gpiob: gpio@FF141000 { | 189 | gpiob: gpio@FF141000 { |
189 | compatible = "abilis,tb10x-gpio"; | 190 | compatible = "abilis,tb10x-gpio"; |
@@ -193,9 +194,10 @@ | |||
193 | interrupts = <27 2>; | 194 | interrupts = <27 2>; |
194 | reg = <0xFF141000 0x1000>; | 195 | reg = <0xFF141000 0x1000>; |
195 | gpio-controller; | 196 | gpio-controller; |
196 | #gpio-cells = <1>; | 197 | #gpio-cells = <2>; |
197 | gpio-base = <3>; | 198 | abilis,ngpio = <2>; |
198 | gpio-pins = <&pctl_gpio_b>; | 199 | gpio-ranges = <&iomux 0 0 0>; |
200 | gpio-ranges-group-names = "gpiob"; | ||
199 | }; | 201 | }; |
200 | gpioc: gpio@FF142000 { | 202 | gpioc: gpio@FF142000 { |
201 | compatible = "abilis,tb10x-gpio"; | 203 | compatible = "abilis,tb10x-gpio"; |
@@ -205,9 +207,10 @@ | |||
205 | interrupts = <27 2>; | 207 | interrupts = <27 2>; |
206 | reg = <0xFF142000 0x1000>; | 208 | reg = <0xFF142000 0x1000>; |
207 | gpio-controller; | 209 | gpio-controller; |
208 | #gpio-cells = <1>; | 210 | #gpio-cells = <2>; |
209 | gpio-base = <5>; | 211 | abilis,ngpio = <3>; |
210 | gpio-pins = <&pctl_gpio_c>; | 212 | gpio-ranges = <&iomux 0 0 0>; |
213 | gpio-ranges-group-names = "gpioc"; | ||
211 | }; | 214 | }; |
212 | gpiod: gpio@FF143000 { | 215 | gpiod: gpio@FF143000 { |
213 | compatible = "abilis,tb10x-gpio"; | 216 | compatible = "abilis,tb10x-gpio"; |
@@ -217,9 +220,10 @@ | |||
217 | interrupts = <27 2>; | 220 | interrupts = <27 2>; |
218 | reg = <0xFF143000 0x1000>; | 221 | reg = <0xFF143000 0x1000>; |
219 | gpio-controller; | 222 | gpio-controller; |
220 | #gpio-cells = <1>; | 223 | #gpio-cells = <2>; |
221 | gpio-base = <8>; | 224 | abilis,ngpio = <2>; |
222 | gpio-pins = <&pctl_gpio_d>; | 225 | gpio-ranges = <&iomux 0 0 0>; |
226 | gpio-ranges-group-names = "gpiod"; | ||
223 | }; | 227 | }; |
224 | gpioe: gpio@FF144000 { | 228 | gpioe: gpio@FF144000 { |
225 | compatible = "abilis,tb10x-gpio"; | 229 | compatible = "abilis,tb10x-gpio"; |
@@ -229,9 +233,10 @@ | |||
229 | interrupts = <27 2>; | 233 | interrupts = <27 2>; |
230 | reg = <0xFF144000 0x1000>; | 234 | reg = <0xFF144000 0x1000>; |
231 | gpio-controller; | 235 | gpio-controller; |
232 | #gpio-cells = <1>; | 236 | #gpio-cells = <2>; |
233 | gpio-base = <10>; | 237 | abilis,ngpio = <3>; |
234 | gpio-pins = <&pctl_gpio_e>; | 238 | gpio-ranges = <&iomux 0 0 0>; |
239 | gpio-ranges-group-names = "gpioe"; | ||
235 | }; | 240 | }; |
236 | gpiof: gpio@FF145000 { | 241 | gpiof: gpio@FF145000 { |
237 | compatible = "abilis,tb10x-gpio"; | 242 | compatible = "abilis,tb10x-gpio"; |
@@ -241,9 +246,10 @@ | |||
241 | interrupts = <27 2>; | 246 | interrupts = <27 2>; |
242 | reg = <0xFF145000 0x1000>; | 247 | reg = <0xFF145000 0x1000>; |
243 | gpio-controller; | 248 | gpio-controller; |
244 | #gpio-cells = <1>; | 249 | #gpio-cells = <2>; |
245 | gpio-base = <13>; | 250 | abilis,ngpio = <2>; |
246 | gpio-pins = <&pctl_gpio_f>; | 251 | gpio-ranges = <&iomux 0 0 0>; |
252 | gpio-ranges-group-names = "gpiof"; | ||
247 | }; | 253 | }; |
248 | gpiog: gpio@FF146000 { | 254 | gpiog: gpio@FF146000 { |
249 | compatible = "abilis,tb10x-gpio"; | 255 | compatible = "abilis,tb10x-gpio"; |
@@ -253,9 +259,10 @@ | |||
253 | interrupts = <27 2>; | 259 | interrupts = <27 2>; |
254 | reg = <0xFF146000 0x1000>; | 260 | reg = <0xFF146000 0x1000>; |
255 | gpio-controller; | 261 | gpio-controller; |
256 | #gpio-cells = <1>; | 262 | #gpio-cells = <2>; |
257 | gpio-base = <15>; | 263 | abilis,ngpio = <3>; |
258 | gpio-pins = <&pctl_gpio_g>; | 264 | gpio-ranges = <&iomux 0 0 0>; |
265 | gpio-ranges-group-names = "gpiog"; | ||
259 | }; | 266 | }; |
260 | gpioh: gpio@FF147000 { | 267 | gpioh: gpio@FF147000 { |
261 | compatible = "abilis,tb10x-gpio"; | 268 | compatible = "abilis,tb10x-gpio"; |
@@ -265,9 +272,10 @@ | |||
265 | interrupts = <27 2>; | 272 | interrupts = <27 2>; |
266 | reg = <0xFF147000 0x1000>; | 273 | reg = <0xFF147000 0x1000>; |
267 | gpio-controller; | 274 | gpio-controller; |
268 | #gpio-cells = <1>; | 275 | #gpio-cells = <2>; |
269 | gpio-base = <18>; | 276 | abilis,ngpio = <2>; |
270 | gpio-pins = <&pctl_gpio_h>; | 277 | gpio-ranges = <&iomux 0 0 0>; |
278 | gpio-ranges-group-names = "gpioh"; | ||
271 | }; | 279 | }; |
272 | gpioi: gpio@FF148000 { | 280 | gpioi: gpio@FF148000 { |
273 | compatible = "abilis,tb10x-gpio"; | 281 | compatible = "abilis,tb10x-gpio"; |
@@ -277,9 +285,10 @@ | |||
277 | interrupts = <27 2>; | 285 | interrupts = <27 2>; |
278 | reg = <0xFF148000 0x1000>; | 286 | reg = <0xFF148000 0x1000>; |
279 | gpio-controller; | 287 | gpio-controller; |
280 | #gpio-cells = <1>; | 288 | #gpio-cells = <2>; |
281 | gpio-base = <20>; | 289 | abilis,ngpio = <12>; |
282 | gpio-pins = <&pctl_gpio_i>; | 290 | gpio-ranges = <&iomux 0 0 0>; |
291 | gpio-ranges-group-names = "gpioi"; | ||
283 | }; | 292 | }; |
284 | gpioj: gpio@FF149000 { | 293 | gpioj: gpio@FF149000 { |
285 | compatible = "abilis,tb10x-gpio"; | 294 | compatible = "abilis,tb10x-gpio"; |
@@ -289,9 +298,10 @@ | |||
289 | interrupts = <27 2>; | 298 | interrupts = <27 2>; |
290 | reg = <0xFF149000 0x1000>; | 299 | reg = <0xFF149000 0x1000>; |
291 | gpio-controller; | 300 | gpio-controller; |
292 | #gpio-cells = <1>; | 301 | #gpio-cells = <2>; |
293 | gpio-base = <32>; | 302 | abilis,ngpio = <32>; |
294 | gpio-pins = <&pctl_gpio_j>; | 303 | gpio-ranges = <&iomux 0 0 0>; |
304 | gpio-ranges-group-names = "gpioj"; | ||
295 | }; | 305 | }; |
296 | gpiok: gpio@FF14a000 { | 306 | gpiok: gpio@FF14a000 { |
297 | compatible = "abilis,tb10x-gpio"; | 307 | compatible = "abilis,tb10x-gpio"; |
@@ -301,9 +311,10 @@ | |||
301 | interrupts = <27 2>; | 311 | interrupts = <27 2>; |
302 | reg = <0xFF14A000 0x1000>; | 312 | reg = <0xFF14A000 0x1000>; |
303 | gpio-controller; | 313 | gpio-controller; |
304 | #gpio-cells = <1>; | 314 | #gpio-cells = <2>; |
305 | gpio-base = <64>; | 315 | abilis,ngpio = <22>; |
306 | gpio-pins = <&pctl_gpio_k>; | 316 | gpio-ranges = <&iomux 0 0 0>; |
317 | gpio-ranges-group-names = "gpiok"; | ||
307 | }; | 318 | }; |
308 | gpiol: gpio@FF14b000 { | 319 | gpiol: gpio@FF14b000 { |
309 | compatible = "abilis,tb10x-gpio"; | 320 | compatible = "abilis,tb10x-gpio"; |
@@ -313,9 +324,10 @@ | |||
313 | interrupts = <27 2>; | 324 | interrupts = <27 2>; |
314 | reg = <0xFF14B000 0x1000>; | 325 | reg = <0xFF14B000 0x1000>; |
315 | gpio-controller; | 326 | gpio-controller; |
316 | #gpio-cells = <1>; | 327 | #gpio-cells = <2>; |
317 | gpio-base = <86>; | 328 | abilis,ngpio = <4>; |
318 | gpio-pins = <&pctl_gpio_l>; | 329 | gpio-ranges = <&iomux 0 0 0>; |
330 | gpio-ranges-group-names = "gpiol"; | ||
319 | }; | 331 | }; |
320 | gpiom: gpio@FF14c000 { | 332 | gpiom: gpio@FF14c000 { |
321 | compatible = "abilis,tb10x-gpio"; | 333 | compatible = "abilis,tb10x-gpio"; |
@@ -325,9 +337,10 @@ | |||
325 | interrupts = <27 2>; | 337 | interrupts = <27 2>; |
326 | reg = <0xFF14C000 0x1000>; | 338 | reg = <0xFF14C000 0x1000>; |
327 | gpio-controller; | 339 | gpio-controller; |
328 | #gpio-cells = <1>; | 340 | #gpio-cells = <2>; |
329 | gpio-base = <90>; | 341 | abilis,ngpio = <4>; |
330 | gpio-pins = <&pctl_gpio_m>; | 342 | gpio-ranges = <&iomux 0 0 0>; |
343 | gpio-ranges-group-names = "gpiom"; | ||
331 | }; | 344 | }; |
332 | gpion: gpio@FF14d000 { | 345 | gpion: gpio@FF14d000 { |
333 | compatible = "abilis,tb10x-gpio"; | 346 | compatible = "abilis,tb10x-gpio"; |
@@ -337,9 +350,10 @@ | |||
337 | interrupts = <27 2>; | 350 | interrupts = <27 2>; |
338 | reg = <0xFF14D000 0x1000>; | 351 | reg = <0xFF14D000 0x1000>; |
339 | gpio-controller; | 352 | gpio-controller; |
340 | #gpio-cells = <1>; | 353 | #gpio-cells = <2>; |
341 | gpio-base = <94>; | 354 | abilis,ngpio = <5>; |
342 | gpio-pins = <&pctl_gpio_n>; | 355 | gpio-ranges = <&iomux 0 0 0>; |
356 | gpio-ranges-group-names = "gpion"; | ||
343 | }; | 357 | }; |
344 | }; | 358 | }; |
345 | }; | 359 | }; |
diff --git a/arch/arc/boot/dts/abilis_tb101_dvk.dts b/arch/arc/boot/dts/abilis_tb101_dvk.dts index b204657993aa..1cf51c280f28 100644 --- a/arch/arc/boot/dts/abilis_tb101_dvk.dts +++ b/arch/arc/boot/dts/abilis_tb101_dvk.dts | |||
@@ -64,62 +64,62 @@ | |||
64 | compatible = "gpio-leds"; | 64 | compatible = "gpio-leds"; |
65 | power { | 65 | power { |
66 | label = "Power"; | 66 | label = "Power"; |
67 | gpios = <&gpioi 0>; | 67 | gpios = <&gpioi 0 0>; |
68 | linux,default-trigger = "default-on"; | 68 | linux,default-trigger = "default-on"; |
69 | }; | 69 | }; |
70 | heartbeat { | 70 | heartbeat { |
71 | label = "Heartbeat"; | 71 | label = "Heartbeat"; |
72 | gpios = <&gpioi 1>; | 72 | gpios = <&gpioi 1 0>; |
73 | linux,default-trigger = "heartbeat"; | 73 | linux,default-trigger = "heartbeat"; |
74 | }; | 74 | }; |
75 | led2 { | 75 | led2 { |
76 | label = "LED2"; | 76 | label = "LED2"; |
77 | gpios = <&gpioi 2>; | 77 | gpios = <&gpioi 2 0>; |
78 | default-state = "off"; | 78 | default-state = "off"; |
79 | }; | 79 | }; |
80 | led3 { | 80 | led3 { |
81 | label = "LED3"; | 81 | label = "LED3"; |
82 | gpios = <&gpioi 3>; | 82 | gpios = <&gpioi 3 0>; |
83 | default-state = "off"; | 83 | default-state = "off"; |
84 | }; | 84 | }; |
85 | led4 { | 85 | led4 { |
86 | label = "LED4"; | 86 | label = "LED4"; |
87 | gpios = <&gpioi 4>; | 87 | gpios = <&gpioi 4 0>; |
88 | default-state = "off"; | 88 | default-state = "off"; |
89 | }; | 89 | }; |
90 | led5 { | 90 | led5 { |
91 | label = "LED5"; | 91 | label = "LED5"; |
92 | gpios = <&gpioi 5>; | 92 | gpios = <&gpioi 5 0>; |
93 | default-state = "off"; | 93 | default-state = "off"; |
94 | }; | 94 | }; |
95 | led6 { | 95 | led6 { |
96 | label = "LED6"; | 96 | label = "LED6"; |
97 | gpios = <&gpioi 6>; | 97 | gpios = <&gpioi 6 0>; |
98 | default-state = "off"; | 98 | default-state = "off"; |
99 | }; | 99 | }; |
100 | led7 { | 100 | led7 { |
101 | label = "LED7"; | 101 | label = "LED7"; |
102 | gpios = <&gpioi 7>; | 102 | gpios = <&gpioi 7 0>; |
103 | default-state = "off"; | 103 | default-state = "off"; |
104 | }; | 104 | }; |
105 | led8 { | 105 | led8 { |
106 | label = "LED8"; | 106 | label = "LED8"; |
107 | gpios = <&gpioi 8>; | 107 | gpios = <&gpioi 8 0>; |
108 | default-state = "off"; | 108 | default-state = "off"; |
109 | }; | 109 | }; |
110 | led9 { | 110 | led9 { |
111 | label = "LED9"; | 111 | label = "LED9"; |
112 | gpios = <&gpioi 9>; | 112 | gpios = <&gpioi 9 0>; |
113 | default-state = "off"; | 113 | default-state = "off"; |
114 | }; | 114 | }; |
115 | led10 { | 115 | led10 { |
116 | label = "LED10"; | 116 | label = "LED10"; |
117 | gpios = <&gpioi 10>; | 117 | gpios = <&gpioi 10 0>; |
118 | default-state = "off"; | 118 | default-state = "off"; |
119 | }; | 119 | }; |
120 | led11 { | 120 | led11 { |
121 | label = "LED11"; | 121 | label = "LED11"; |
122 | gpios = <&gpioi 11>; | 122 | gpios = <&gpioi 11 0>; |
123 | default-state = "off"; | 123 | default-state = "off"; |
124 | }; | 124 | }; |
125 | }; | 125 | }; |
diff --git a/arch/arc/boot/dts/abilis_tb10x.dtsi b/arch/arc/boot/dts/abilis_tb10x.dtsi index edf56f4749e1..a098d7c05e96 100644 --- a/arch/arc/boot/dts/abilis_tb10x.dtsi +++ b/arch/arc/boot/dts/abilis_tb10x.dtsi | |||
@@ -62,9 +62,8 @@ | |||
62 | }; | 62 | }; |
63 | 63 | ||
64 | iomux: iomux@FF10601c { | 64 | iomux: iomux@FF10601c { |
65 | #address-cells = <1>; | ||
66 | #size-cells = <1>; | ||
67 | compatible = "abilis,tb10x-iomux"; | 65 | compatible = "abilis,tb10x-iomux"; |
66 | #gpio-range-cells = <3>; | ||
68 | reg = <0xFF10601c 0x4>; | 67 | reg = <0xFF10601c 0x4>; |
69 | }; | 68 | }; |
70 | 69 | ||