aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2014-09-30 06:19:40 -0400
committerLinus Walleij <linus.walleij@linaro.org>2014-10-20 03:08:26 -0400
commit0564f7d946efc2948999cc26cc0831fdf81c895e (patch)
treeca5b2d2ed9d7df26c7a1e17c245d98fbeec21136 /arch
parent1637d480f873ca305f7f090e3b3bc92430b5892f (diff)
pinctrl: abx500: force-convert to generic config bindings
This converts the ABx500 pin controller and all associated device trees to use the standard, generic config bindings for pin controllers. There are no such device trees deployed in the wild so this is safe to do to set a good example. Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boot/dts/ste-href-ab8500.dtsi54
-rw-r--r--arch/arm/boot/dts/ste-href-ab8505.dtsi30
2 files changed, 42 insertions, 42 deletions
diff --git a/arch/arm/boot/dts/ste-href-ab8500.dtsi b/arch/arm/boot/dts/ste-href-ab8500.dtsi
index 8be3c471d097..9b69bce9297d 100644
--- a/arch/arm/boot/dts/ste-href-ab8500.dtsi
+++ b/arch/arm/boot/dts/ste-href-ab8500.dtsi
@@ -51,7 +51,7 @@
51 groups = "gpio2_a_1"; 51 groups = "gpio2_a_1";
52 }; 52 };
53 default_cfg { 53 default_cfg {
54 ste,pins = "GPIO2_T9"; 54 pins = "GPIO2_T9";
55 input-enable; 55 input-enable;
56 bias-pull-down; 56 bias-pull-down;
57 }; 57 };
@@ -64,7 +64,7 @@
64 groups = "gpio4_a_1"; 64 groups = "gpio4_a_1";
65 }; 65 };
66 default_cfg { 66 default_cfg {
67 ste,pins = "GPIO4_W2"; 67 pins = "GPIO4_W2";
68 input-enable; 68 input-enable;
69 bias-pull-down; 69 bias-pull-down;
70 }; 70 };
@@ -77,7 +77,7 @@
77 groups = "gpio10_d_1"; 77 groups = "gpio10_d_1";
78 }; 78 };
79 default_cfg { 79 default_cfg {
80 ste,pins = "GPIO10_U17"; 80 pins = "GPIO10_U17";
81 input-enable; 81 input-enable;
82 bias-pull-down; 82 bias-pull-down;
83 }; 83 };
@@ -90,7 +90,7 @@
90 groups = "gpio11_d_1"; 90 groups = "gpio11_d_1";
91 }; 91 };
92 default_cfg { 92 default_cfg {
93 ste,pins = "GPIO11_AA18"; 93 pins = "GPIO11_AA18";
94 input-enable; 94 input-enable;
95 bias-pull-down; 95 bias-pull-down;
96 }; 96 };
@@ -103,7 +103,7 @@
103 groups = "gpio12_d_1"; 103 groups = "gpio12_d_1";
104 }; 104 };
105 default_cfg { 105 default_cfg {
106 ste,pins = "GPIO12_U16"; 106 pins = "GPIO12_U16";
107 input-enable; 107 input-enable;
108 bias-pull-down; 108 bias-pull-down;
109 }; 109 };
@@ -116,7 +116,7 @@
116 groups = "gpio13_d_1"; 116 groups = "gpio13_d_1";
117 }; 117 };
118 default_cfg { 118 default_cfg {
119 ste,pins = "GPIO13_W17"; 119 pins = "GPIO13_W17";
120 input-enable; 120 input-enable;
121 bias-pull-down; 121 bias-pull-down;
122 }; 122 };
@@ -129,7 +129,7 @@
129 groups = "gpio16_a_1"; 129 groups = "gpio16_a_1";
130 }; 130 };
131 default_cfg { 131 default_cfg {
132 ste,pins = "GPIO16_F15"; 132 pins = "GPIO16_F15";
133 input-enable; 133 input-enable;
134 bias-pull-down; 134 bias-pull-down;
135 }; 135 };
@@ -142,7 +142,7 @@
142 groups = "gpio24_a_1"; 142 groups = "gpio24_a_1";
143 }; 143 };
144 default_cfg { 144 default_cfg {
145 ste,pins = "GPIO24_T14"; 145 pins = "GPIO24_T14";
146 input-enable; 146 input-enable;
147 bias-pull-down; 147 bias-pull-down;
148 }; 148 };
@@ -155,7 +155,7 @@
155 groups = "gpio25_a_1"; 155 groups = "gpio25_a_1";
156 }; 156 };
157 default_cfg { 157 default_cfg {
158 ste,pins = "GPIO25_R16"; 158 pins = "GPIO25_R16";
159 input-enable; 159 input-enable;
160 bias-pull-down; 160 bias-pull-down;
161 }; 161 };
@@ -168,7 +168,7 @@
168 groups = "gpio36_a_1"; 168 groups = "gpio36_a_1";
169 }; 169 };
170 default_cfg { 170 default_cfg {
171 ste,pins = "GPIO36_A17"; 171 pins = "GPIO36_A17";
172 input-enable; 172 input-enable;
173 bias-pull-down; 173 bias-pull-down;
174 }; 174 };
@@ -181,7 +181,7 @@
181 groups = "gpio37_a_1"; 181 groups = "gpio37_a_1";
182 }; 182 };
183 default_cfg { 183 default_cfg {
184 ste,pins = "GPIO37_E15"; 184 pins = "GPIO37_E15";
185 input-enable; 185 input-enable;
186 bias-pull-down; 186 bias-pull-down;
187 }; 187 };
@@ -194,7 +194,7 @@
194 groups = "gpio38_a_1"; 194 groups = "gpio38_a_1";
195 }; 195 };
196 default_cfg { 196 default_cfg {
197 ste,pins = "GPIO38_C17"; 197 pins = "GPIO38_C17";
198 input-enable; 198 input-enable;
199 bias-pull-down; 199 bias-pull-down;
200 }; 200 };
@@ -207,7 +207,7 @@
207 groups = "gpio39_a_1"; 207 groups = "gpio39_a_1";
208 }; 208 };
209 default_cfg { 209 default_cfg {
210 ste,pins = "GPIO39_E16"; 210 pins = "GPIO39_E16";
211 input-enable; 211 input-enable;
212 bias-pull-down; 212 bias-pull-down;
213 }; 213 };
@@ -220,7 +220,7 @@
220 groups = "gpio42_a_1"; 220 groups = "gpio42_a_1";
221 }; 221 };
222 default_cfg { 222 default_cfg {
223 ste,pins = "GPIO42_U2"; 223 pins = "GPIO42_U2";
224 input-enable; 224 input-enable;
225 bias-pull-down; 225 bias-pull-down;
226 }; 226 };
@@ -236,7 +236,7 @@
236 groups = "gpio26_d_1"; 236 groups = "gpio26_d_1";
237 }; 237 };
238 default_cfg { 238 default_cfg {
239 ste,pins = "GPIO26_M16"; 239 pins = "GPIO26_M16";
240 output-low; 240 output-low;
241 }; 241 };
242 }; 242 };
@@ -248,7 +248,7 @@
248 groups = "gpio35_d_1"; 248 groups = "gpio35_d_1";
249 }; 249 };
250 default_cfg { 250 default_cfg {
251 ste,pins = "GPIO35_W15"; 251 pins = "GPIO35_W15";
252 output-low; 252 output-low;
253 }; 253 };
254 }; 254 };
@@ -264,7 +264,7 @@
264 groups = "ycbcr0123_d_1"; 264 groups = "ycbcr0123_d_1";
265 }; 265 };
266 default_cfg { 266 default_cfg {
267 ste,pins = "GPIO6_Y18", 267 pins = "GPIO6_Y18",
268 "GPIO7_AA20", 268 "GPIO7_AA20",
269 "GPIO8_W18", 269 "GPIO8_W18",
270 "GPIO9_AA19"; 270 "GPIO9_AA19";
@@ -281,7 +281,7 @@
281 groups = "pwmout1_d_1", "pwmout2_d_1"; 281 groups = "pwmout1_d_1", "pwmout2_d_1";
282 }; 282 };
283 default_cfg { 283 default_cfg {
284 ste,pins = "GPIO14_F14", 284 pins = "GPIO14_F14",
285 "GPIO15_B17"; 285 "GPIO15_B17";
286 input-enable; 286 input-enable;
287 bias-pull-down; 287 bias-pull-down;
@@ -296,7 +296,7 @@
296 groups = "adi1_d_1"; 296 groups = "adi1_d_1";
297 }; 297 };
298 default_cfg { 298 default_cfg {
299 ste,pins = "GPIO17_P5", 299 pins = "GPIO17_P5",
300 "GPIO18_R5", 300 "GPIO18_R5",
301 "GPIO19_U5", 301 "GPIO19_U5",
302 "GPIO20_T5"; 302 "GPIO20_T5";
@@ -313,7 +313,7 @@
313 groups = "usbuicc_d_1"; 313 groups = "usbuicc_d_1";
314 }; 314 };
315 default_cfg { 315 default_cfg {
316 ste,pins = "GPIO21_H19", 316 pins = "GPIO21_H19",
317 "GPIO22_G20", 317 "GPIO22_G20",
318 "GPIO23_G19"; 318 "GPIO23_G19";
319 input-enable; 319 input-enable;
@@ -331,7 +331,7 @@
331 "dmic56_d_1"; 331 "dmic56_d_1";
332 }; 332 };
333 default_cfg { 333 default_cfg {
334 ste,pins = "GPIO27_J6", 334 pins = "GPIO27_J6",
335 "GPIO28_K6", 335 "GPIO28_K6",
336 "GPIO29_G6", 336 "GPIO29_G6",
337 "GPIO30_H6", 337 "GPIO30_H6",
@@ -349,7 +349,7 @@
349 groups = "extcpena_d_1"; 349 groups = "extcpena_d_1";
350 }; 350 };
351 default_cfg { 351 default_cfg {
352 ste,pins = "GPIO34_R17"; 352 pins = "GPIO34_R17";
353 input-enable; 353 input-enable;
354 bias-pull-down; 354 bias-pull-down;
355 }; 355 };
@@ -363,7 +363,7 @@
363 groups = "modsclsda_d_1"; 363 groups = "modsclsda_d_1";
364 }; 364 };
365 default_cfg { 365 default_cfg {
366 ste,pins = "GPIO40_T19", 366 pins = "GPIO40_T19",
367 "GPIO41_U19"; 367 "GPIO41_U19";
368 input-enable; 368 input-enable;
369 bias-pull-down; 369 bias-pull-down;
@@ -380,7 +380,7 @@
380 groups = "sysclkreq2_d_1"; 380 groups = "sysclkreq2_d_1";
381 }; 381 };
382 default_cfg { 382 default_cfg {
383 ste,pins = "GPIO1_T10"; 383 pins = "GPIO1_T10";
384 input-enable; 384 input-enable;
385 bias-disable; 385 bias-disable;
386 }; 386 };
@@ -391,7 +391,7 @@
391 groups = "gpio1_a_1"; 391 groups = "gpio1_a_1";
392 }; 392 };
393 default_cfg { 393 default_cfg {
394 ste,pins = "GPIO1_T10"; 394 pins = "GPIO1_T10";
395 input-enable; 395 input-enable;
396 bias-pull-down; 396 bias-pull-down;
397 }; 397 };
@@ -404,7 +404,7 @@
404 groups = "sysclkreq4_d_1"; 404 groups = "sysclkreq4_d_1";
405 }; 405 };
406 default_cfg { 406 default_cfg {
407 ste,pins = "GPIO3_U9"; 407 pins = "GPIO3_U9";
408 input-enable; 408 input-enable;
409 bias-disable; 409 bias-disable;
410 }; 410 };
@@ -415,7 +415,7 @@
415 groups = "gpio3_a_1"; 415 groups = "gpio3_a_1";
416 }; 416 };
417 default_cfg { 417 default_cfg {
418 ste,pins = "GPIO3_U9"; 418 pins = "GPIO3_U9";
419 input-enable; 419 input-enable;
420 bias-pull-down; 420 bias-pull-down;
421 }; 421 };
diff --git a/arch/arm/boot/dts/ste-href-ab8505.dtsi b/arch/arm/boot/dts/ste-href-ab8505.dtsi
index 112053c7aa51..ccf37a9df050 100644
--- a/arch/arm/boot/dts/ste-href-ab8505.dtsi
+++ b/arch/arm/boot/dts/ste-href-ab8505.dtsi
@@ -39,7 +39,7 @@
39 groups = "gpio2_a_1"; 39 groups = "gpio2_a_1";
40 }; 40 };
41 default_cfg { 41 default_cfg {
42 ste,pins = "GPIO2_R5"; 42 pins = "GPIO2_R5";
43 input-enable; 43 input-enable;
44 bias-pull-down; 44 bias-pull-down;
45 }; 45 };
@@ -52,7 +52,7 @@
52 groups = "gpio10_d_1"; 52 groups = "gpio10_d_1";
53 }; 53 };
54 default_cfg { 54 default_cfg {
55 ste,pins = "GPIO10_B16"; 55 pins = "GPIO10_B16";
56 input-enable; 56 input-enable;
57 bias-pull-down; 57 bias-pull-down;
58 }; 58 };
@@ -65,7 +65,7 @@
65 groups = "gpio11_d_1"; 65 groups = "gpio11_d_1";
66 }; 66 };
67 default_cfg { 67 default_cfg {
68 ste,pins = "GPIO11_B17"; 68 pins = "GPIO11_B17";
69 input-enable; 69 input-enable;
70 bias-pull-down; 70 bias-pull-down;
71 }; 71 };
@@ -78,7 +78,7 @@
78 groups = "gpio13_d_1"; 78 groups = "gpio13_d_1";
79 }; 79 };
80 default_cfg { 80 default_cfg {
81 ste,pins = "GPIO13_D17"; 81 pins = "GPIO13_D17";
82 input-enable; 82 input-enable;
83 bias-disable; 83 bias-disable;
84 }; 84 };
@@ -91,7 +91,7 @@
91 groups = "gpio34_a_1"; 91 groups = "gpio34_a_1";
92 }; 92 };
93 default_cfg { 93 default_cfg {
94 ste,pins = "GPIO34_H14"; 94 pins = "GPIO34_H14";
95 input-enable; 95 input-enable;
96 bias-pull-down; 96 bias-pull-down;
97 }; 97 };
@@ -104,7 +104,7 @@
104 groups = "gpio50_d_1"; 104 groups = "gpio50_d_1";
105 }; 105 };
106 default_cfg { 106 default_cfg {
107 ste,pins = "GPIO50_L4"; 107 pins = "GPIO50_L4";
108 input-enable; 108 input-enable;
109 bias-disable; 109 bias-disable;
110 }; 110 };
@@ -118,7 +118,7 @@
118 groups = "pwmout1_d_1"; 118 groups = "pwmout1_d_1";
119 }; 119 };
120 default_cfg { 120 default_cfg {
121 ste,pins = "GPIO14_C16"; 121 pins = "GPIO14_C16";
122 input-enable; 122 input-enable;
123 bias-pull-down; 123 bias-pull-down;
124 }; 124 };
@@ -132,7 +132,7 @@
132 groups = "adi2_d_1"; 132 groups = "adi2_d_1";
133 }; 133 };
134 default_cfg { 134 default_cfg {
135 ste,pins = "GPIO17_P2", 135 pins = "GPIO17_P2",
136 "GPIO18_N3", 136 "GPIO18_N3",
137 "GPIO19_T1", 137 "GPIO19_T1",
138 "GPIO20_P3"; 138 "GPIO20_P3";
@@ -149,7 +149,7 @@
149 groups = "modsclsda_d_1"; 149 groups = "modsclsda_d_1";
150 }; 150 };
151 default_cfg { 151 default_cfg {
152 ste,pins = "GPIO40_J15", 152 pins = "GPIO40_J15",
153 "GPIO41_J14"; 153 "GPIO41_J14";
154 input-enable; 154 input-enable;
155 bias-pull-down; 155 bias-pull-down;
@@ -163,7 +163,7 @@
163 groups = "resethw_d_1"; 163 groups = "resethw_d_1";
164 }; 164 };
165 default_cfg { 165 default_cfg {
166 ste,pins = "GPIO52_D16"; 166 pins = "GPIO52_D16";
167 input-enable; 167 input-enable;
168 bias-pull-down; 168 bias-pull-down;
169 }; 169 };
@@ -176,7 +176,7 @@
176 groups = "service_d_1"; 176 groups = "service_d_1";
177 }; 177 };
178 default_cfg { 178 default_cfg {
179 ste,pins = "GPIO53_D15"; 179 pins = "GPIO53_D15";
180 input-enable; 180 input-enable;
181 bias-pull-down; 181 bias-pull-down;
182 }; 182 };
@@ -192,7 +192,7 @@
192 groups = "sysclkreq2_d_1"; 192 groups = "sysclkreq2_d_1";
193 }; 193 };
194 default_cfg { 194 default_cfg {
195 ste,pins = "GPIO1_N4"; 195 pins = "GPIO1_N4";
196 input-enable; 196 input-enable;
197 bias-disable; 197 bias-disable;
198 }; 198 };
@@ -203,7 +203,7 @@
203 groups = "gpio1_a_1"; 203 groups = "gpio1_a_1";
204 }; 204 };
205 default_cfg { 205 default_cfg {
206 ste,pins = "GPIO1_N4"; 206 pins = "GPIO1_N4";
207 input-enable; 207 input-enable;
208 bias-pull-down; 208 bias-pull-down;
209 }; 209 };
@@ -216,7 +216,7 @@
216 groups = "sysclkreq4_d_1"; 216 groups = "sysclkreq4_d_1";
217 }; 217 };
218 default_cfg { 218 default_cfg {
219 ste,pins = "GPIO3_P5"; 219 pins = "GPIO3_P5";
220 input-enable; 220 input-enable;
221 bias-disable; 221 bias-disable;
222 }; 222 };
@@ -227,7 +227,7 @@
227 groups = "gpio3_a_1"; 227 groups = "gpio3_a_1";
228 }; 228 };
229 default_cfg { 229 default_cfg {
230 ste,pins = "GPIO3_P5"; 230 pins = "GPIO3_P5";
231 input-enable; 231 input-enable;
232 bias-pull-down; 232 bias-pull-down;
233 }; 233 };