aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <k.kozlowski@samsung.com>2016-09-04 07:04:06 -0400
committerKrzysztof Kozlowski <k.kozlowski@samsung.com>2016-09-16 07:31:37 -0400
commit90c6e35383dd02ef68a71f8373bdc9fbd0684a26 (patch)
treefbb865ca08d2b0b3c71724a8c266bb37a01fdcef /arch/arm/boot
parentc0fee590160637e1306dd4bc1018e89ff99ef00d (diff)
ARM: dts: exynos: Use common macros for pinctrl configuration
Replace duplicated macros in each DTSI file with a common macro coming from header. Include the header in each pinctrl DTSI so further changes could use it. Although PIN_FUNC_SPC_2 does not bring much information about the function itself, it still is more descriptive then hard-coded number <2>. Signed-off-by: Krzysztof Kozlowski <k.kozlowski@samsung.com> Reviewed-by: Javier Martinez Canillas <javier@osg.samsung.com> Acked-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/exynos3250-pinctrl.dtsi76
-rw-r--r--arch/arm/boot/dts/exynos4210-pinctrl.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4415-pinctrl.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos4x12-pinctrl.dtsi21
-rw-r--r--arch/arm/boot/dts/exynos5250-pinctrl.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5260-pinctrl.dtsi96
-rw-r--r--arch/arm/boot/dts/exynos5410-pinctrl.dtsi2
-rw-r--r--arch/arm/boot/dts/exynos5420-pinctrl.dtsi2
8 files changed, 96 insertions, 107 deletions
diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
index 40ea7de44933..ed22d94f4fe5 100644
--- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi
@@ -12,58 +12,46 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13*/ 13*/
14 14
15#define PIN_PULL_NONE 0 15#include <dt-bindings/pinctrl/samsung.h>
16#define PIN_PULL_DOWN 1 16
17#define PIN_PULL_UP 3 17#define PIN_IN(_pin, _pull, _drv) \
18 18 _pin { \
19#define PIN_DRV_LV1 0 19 samsung,pins = #_pin; \
20#define PIN_DRV_LV2 2 20 samsung,pin-function = <EXYNOS_PIN_FUNC_INPUT>; \
21#define PIN_DRV_LV3 1 21 samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>; \
22#define PIN_DRV_LV4 3 22 samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>; \
23
24#define PIN_PDN_OUT0 0
25#define PIN_PDN_OUT1 1
26#define PIN_PDN_INPUT 2
27#define PIN_PDN_PREV 3
28
29#define PIN_IN(_pin, _pull, _drv) \
30 _pin { \
31 samsung,pins = #_pin; \
32 samsung,pin-function = <0>; \
33 samsung,pin-pud = <PIN_PULL_ ##_pull>; \
34 samsung,pin-drv = <PIN_DRV_ ##_drv>; \
35 } 23 }
36 24
37#define PIN_OUT(_pin, _drv) \ 25#define PIN_OUT(_pin, _drv) \
38 _pin { \ 26 _pin { \
39 samsung,pins = #_pin; \ 27 samsung,pins = #_pin; \
40 samsung,pin-function = <1>; \ 28 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; \
41 samsung,pin-pud = <0>; \ 29 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; \
42 samsung,pin-drv = <PIN_DRV_ ##_drv>; \ 30 samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>; \
43 } 31 }
44 32
45#define PIN_OUT_SET(_pin, _val, _drv) \ 33#define PIN_OUT_SET(_pin, _val, _drv) \
46 _pin { \ 34 _pin { \
47 samsung,pins = #_pin; \ 35 samsung,pins = #_pin; \
48 samsung,pin-function = <1>; \ 36 samsung,pin-function = <EXYNOS_PIN_FUNC_OUTPUT>; \
49 samsung,pin-pud = <0>; \ 37 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>; \
50 samsung,pin-drv = <PIN_DRV_ ##_drv>; \ 38 samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>; \
51 samsung,pin-val = <_val>; \ 39 samsung,pin-val = <_val>; \
52 } 40 }
53 41
54#define PIN_CFG(_pin, _sel, _pull, _drv) \ 42#define PIN_CFG(_pin, _sel, _pull, _drv) \
55 _pin { \ 43 _pin { \
56 samsung,pins = #_pin; \ 44 samsung,pins = #_pin; \
57 samsung,pin-function = <_sel>; \ 45 samsung,pin-function = <_sel>; \
58 samsung,pin-pud = <PIN_PULL_ ##_pull>; \ 46 samsung,pin-pud = <EXYNOS_PIN_PULL_ ##_pull>; \
59 samsung,pin-drv = <PIN_DRV_ ##_drv>; \ 47 samsung,pin-drv = <EXYNOS4_PIN_DRV_ ##_drv>; \
60 } 48 }
61 49
62#define PIN_SLP(_pin, _mode, _pull) \ 50#define PIN_SLP(_pin, _mode, _pull) \
63 _pin { \ 51 _pin { \
64 samsung,pins = #_pin; \ 52 samsung,pins = #_pin; \
65 samsung,pin-con-pdn = <PIN_PDN_ ##_mode>; \ 53 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_ ##_mode>; \
66 samsung,pin-pud-pdn = <PIN_PULL_ ##_pull>; \ 54 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_ ##_pull>; \
67 } 55 }
68 56
69&pinctrl_0 { 57&pinctrl_0 {
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 9331c6252eff..cc65537ff79b 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -14,6 +14,8 @@
14 * published by the Free Software Foundation. 14 * published by the Free Software Foundation.
15*/ 15*/
16 16
17#include <dt-bindings/pinctrl/samsung.h>
18
17/ { 19/ {
18 pinctrl@11400000 { 20 pinctrl@11400000 {
19 gpa0: gpa0 { 21 gpa0: gpa0 {
diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
index 75af9c56123e..63714445dddb 100644
--- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi
@@ -11,6 +11,8 @@
11 * published by the Free Software Foundation. 11 * published by the Free Software Foundation.
12*/ 12*/
13 13
14#include <dt-bindings/pinctrl/samsung.h>
15
14&pinctrl_0 { 16&pinctrl_0 {
15 gpa0: gpa0 { 17 gpa0: gpa0 {
16 gpio-controller; 18 gpio-controller;
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 856b29254374..b5ded0ccce07 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -12,20 +12,13 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13*/ 13*/
14 14
15#define PIN_PULL_NONE 0 15#include <dt-bindings/pinctrl/samsung.h>
16#define PIN_PULL_DOWN 1 16
17#define PIN_PULL_UP 3 17#define PIN_SLP(_pin, _mode, _pull) \
18 18 _pin { \
19#define PIN_PDN_OUT0 0 19 samsung,pins = #_pin; \
20#define PIN_PDN_OUT1 1 20 samsung,pin-con-pdn = <EXYNOS_PIN_PDN_ ##_mode>; \
21#define PIN_PDN_INPUT 2 21 samsung,pin-pud-pdn = <EXYNOS_PIN_PULL_ ##_pull>; \
22#define PIN_PDN_PREV 3
23
24#define PIN_SLP(_pin, _mode, _pull) \
25 _pin { \
26 samsung,pins = #_pin; \
27 samsung,pin-con-pdn = <PIN_PDN_ ##_mode>; \
28 samsung,pin-pud-pdn = <PIN_PULL_ ##_pull>; \
29 } 22 }
30 23
31/ { 24/ {
diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
index 880917e508b2..d1a4ea0fb838 100644
--- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi
@@ -12,6 +12,8 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13*/ 13*/
14 14
15#include <dt-bindings/pinctrl/samsung.h>
16
15&pinctrl_0 { 17&pinctrl_0 {
16 gpa0: gpa0 { 18 gpa0: gpa0 {
17 gpio-controller; 19 gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
index f6ee55ea0708..39c046758029 100644
--- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi
@@ -12,9 +12,7 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13*/ 13*/
14 14
15#define PIN_PULL_NONE 0 15#include <dt-bindings/pinctrl/samsung.h>
16#define PIN_PULL_DOWN 1
17#define PIN_PULL_UP 3
18 16
19&pinctrl_0 { 17&pinctrl_0 {
20 gpa0: gpa0 { 18 gpa0: gpa0 {
@@ -188,56 +186,56 @@
188 uart0_data: uart0-data { 186 uart0_data: uart0-data {
189 samsung,pins = "gpa0-0", "gpa0-1"; 187 samsung,pins = "gpa0-0", "gpa0-1";
190 samsung,pin-function = <2>; 188 samsung,pin-function = <2>;
191 samsung,pin-pud = <PIN_PULL_NONE>; 189 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
192 samsung,pin-drv = <0>; 190 samsung,pin-drv = <0>;
193 }; 191 };
194 192
195 uart0_fctl: uart0-fctl { 193 uart0_fctl: uart0-fctl {
196 samsung,pins = "gpa0-2", "gpa0-3"; 194 samsung,pins = "gpa0-2", "gpa0-3";
197 samsung,pin-function = <2>; 195 samsung,pin-function = <2>;
198 samsung,pin-pud = <PIN_PULL_NONE>; 196 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
199 samsung,pin-drv = <0>; 197 samsung,pin-drv = <0>;
200 }; 198 };
201 199
202 uart1_data: uart1-data { 200 uart1_data: uart1-data {
203 samsung,pins = "gpa1-0", "gpa1-1"; 201 samsung,pins = "gpa1-0", "gpa1-1";
204 samsung,pin-function = <2>; 202 samsung,pin-function = <2>;
205 samsung,pin-pud = <PIN_PULL_NONE>; 203 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
206 samsung,pin-drv = <0>; 204 samsung,pin-drv = <0>;
207 }; 205 };
208 206
209 uart1_fctl: uart1-fctl { 207 uart1_fctl: uart1-fctl {
210 samsung,pins = "gpa1-2", "gpa1-3"; 208 samsung,pins = "gpa1-2", "gpa1-3";
211 samsung,pin-function = <2>; 209 samsung,pin-function = <2>;
212 samsung,pin-pud = <PIN_PULL_NONE>; 210 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
213 samsung,pin-drv = <0>; 211 samsung,pin-drv = <0>;
214 }; 212 };
215 213
216 uart2_data: uart2-data { 214 uart2_data: uart2-data {
217 samsung,pins = "gpa1-4", "gpa1-5"; 215 samsung,pins = "gpa1-4", "gpa1-5";
218 samsung,pin-function = <2>; 216 samsung,pin-function = <2>;
219 samsung,pin-pud = <PIN_PULL_NONE>; 217 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
220 samsung,pin-drv = <0>; 218 samsung,pin-drv = <0>;
221 }; 219 };
222 220
223 spi0_bus: spi0-bus { 221 spi0_bus: spi0-bus {
224 samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3"; 222 samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3";
225 samsung,pin-function = <2>; 223 samsung,pin-function = <2>;
226 samsung,pin-pud = <PIN_PULL_UP>; 224 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
227 samsung,pin-drv = <0>; 225 samsung,pin-drv = <0>;
228 }; 226 };
229 227
230 spi1_bus: spi1-bus { 228 spi1_bus: spi1-bus {
231 samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7"; 229 samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7";
232 samsung,pin-function = <2>; 230 samsung,pin-function = <2>;
233 samsung,pin-pud = <PIN_PULL_UP>; 231 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
234 samsung,pin-drv = <0>; 232 samsung,pin-drv = <0>;
235 }; 233 };
236 234
237 usb3_vbus0_en: usb3-vbus0-en { 235 usb3_vbus0_en: usb3-vbus0-en {
238 samsung,pins = "gpa2-4"; 236 samsung,pins = "gpa2-4";
239 samsung,pin-function = <1>; 237 samsung,pin-function = <1>;
240 samsung,pin-pud = <PIN_PULL_NONE>; 238 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
241 samsung,pin-drv = <0>; 239 samsung,pin-drv = <0>;
242 }; 240 };
243 241
@@ -245,7 +243,7 @@
245 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3", 243 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
246 "gpb0-4"; 244 "gpb0-4";
247 samsung,pin-function = <2>; 245 samsung,pin-function = <2>;
248 samsung,pin-pud = <PIN_PULL_NONE>; 246 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
249 samsung,pin-drv = <0>; 247 samsung,pin-drv = <0>;
250 }; 248 };
251 249
@@ -253,105 +251,105 @@
253 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3", 251 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3",
254 "gpb0-4"; 252 "gpb0-4";
255 samsung,pin-function = <3>; 253 samsung,pin-function = <3>;
256 samsung,pin-pud = <PIN_PULL_NONE>; 254 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
257 samsung,pin-drv = <0>; 255 samsung,pin-drv = <0>;
258 }; 256 };
259 257
260 spdif1_bus: spdif1-bus { 258 spdif1_bus: spdif1-bus {
261 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2"; 259 samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2";
262 samsung,pin-function = <4>; 260 samsung,pin-function = <4>;
263 samsung,pin-pud = <PIN_PULL_NONE>; 261 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
264 samsung,pin-drv = <0>; 262 samsung,pin-drv = <0>;
265 }; 263 };
266 264
267 spi2_bus: spi2-bus { 265 spi2_bus: spi2-bus {
268 samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3"; 266 samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3";
269 samsung,pin-function = <2>; 267 samsung,pin-function = <2>;
270 samsung,pin-pud = <PIN_PULL_UP>; 268 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
271 samsung,pin-drv = <0>; 269 samsung,pin-drv = <0>;
272 }; 270 };
273 271
274 i2c0_hs_bus: i2c0-hs-bus { 272 i2c0_hs_bus: i2c0-hs-bus {
275 samsung,pins = "gpb3-0", "gpb3-1"; 273 samsung,pins = "gpb3-0", "gpb3-1";
276 samsung,pin-function = <2>; 274 samsung,pin-function = <2>;
277 samsung,pin-pud = <PIN_PULL_UP>; 275 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
278 samsung,pin-drv = <0>; 276 samsung,pin-drv = <0>;
279 }; 277 };
280 278
281 i2c1_hs_bus: i2c1-hs-bus { 279 i2c1_hs_bus: i2c1-hs-bus {
282 samsung,pins = "gpb3-2", "gpb3-3"; 280 samsung,pins = "gpb3-2", "gpb3-3";
283 samsung,pin-function = <2>; 281 samsung,pin-function = <2>;
284 samsung,pin-pud = <PIN_PULL_UP>; 282 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
285 samsung,pin-drv = <0>; 283 samsung,pin-drv = <0>;
286 }; 284 };
287 285
288 i2c2_hs_bus: i2c2-hs-bus { 286 i2c2_hs_bus: i2c2-hs-bus {
289 samsung,pins = "gpb3-4", "gpb3-5"; 287 samsung,pins = "gpb3-4", "gpb3-5";
290 samsung,pin-function = <2>; 288 samsung,pin-function = <2>;
291 samsung,pin-pud = <PIN_PULL_UP>; 289 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
292 samsung,pin-drv = <0>; 290 samsung,pin-drv = <0>;
293 }; 291 };
294 292
295 i2c3_hs_bus: i2c3-hs-bus { 293 i2c3_hs_bus: i2c3-hs-bus {
296 samsung,pins = "gpb3-6", "gpb3-7"; 294 samsung,pins = "gpb3-6", "gpb3-7";
297 samsung,pin-function = <2>; 295 samsung,pin-function = <2>;
298 samsung,pin-pud = <PIN_PULL_UP>; 296 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
299 samsung,pin-drv = <0>; 297 samsung,pin-drv = <0>;
300 }; 298 };
301 299
302 i2c4_bus: i2c4-bus { 300 i2c4_bus: i2c4-bus {
303 samsung,pins = "gpb4-0", "gpb4-1"; 301 samsung,pins = "gpb4-0", "gpb4-1";
304 samsung,pin-function = <2>; 302 samsung,pin-function = <2>;
305 samsung,pin-pud = <PIN_PULL_UP>; 303 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
306 samsung,pin-drv = <0>; 304 samsung,pin-drv = <0>;
307 }; 305 };
308 306
309 i2c5_bus: i2c5-bus { 307 i2c5_bus: i2c5-bus {
310 samsung,pins = "gpb4-2", "gpb4-3"; 308 samsung,pins = "gpb4-2", "gpb4-3";
311 samsung,pin-function = <2>; 309 samsung,pin-function = <2>;
312 samsung,pin-pud = <PIN_PULL_UP>; 310 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
313 samsung,pin-drv = <0>; 311 samsung,pin-drv = <0>;
314 }; 312 };
315 313
316 i2c6_bus: i2c6-bus { 314 i2c6_bus: i2c6-bus {
317 samsung,pins = "gpb4-4", "gpb4-5"; 315 samsung,pins = "gpb4-4", "gpb4-5";
318 samsung,pin-function = <2>; 316 samsung,pin-function = <2>;
319 samsung,pin-pud = <PIN_PULL_UP>; 317 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
320 samsung,pin-drv = <0>; 318 samsung,pin-drv = <0>;
321 }; 319 };
322 320
323 i2c7_bus: i2c7-bus { 321 i2c7_bus: i2c7-bus {
324 samsung,pins = "gpb4-6", "gpb4-7"; 322 samsung,pins = "gpb4-6", "gpb4-7";
325 samsung,pin-function = <2>; 323 samsung,pin-function = <2>;
326 samsung,pin-pud = <PIN_PULL_UP>; 324 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
327 samsung,pin-drv = <0>; 325 samsung,pin-drv = <0>;
328 }; 326 };
329 327
330 i2c8_bus: i2c8-bus { 328 i2c8_bus: i2c8-bus {
331 samsung,pins = "gpb5-0", "gpb5-1"; 329 samsung,pins = "gpb5-0", "gpb5-1";
332 samsung,pin-function = <2>; 330 samsung,pin-function = <2>;
333 samsung,pin-pud = <PIN_PULL_UP>; 331 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
334 samsung,pin-drv = <0>; 332 samsung,pin-drv = <0>;
335 }; 333 };
336 334
337 i2c9_bus: i2c9-bus { 335 i2c9_bus: i2c9-bus {
338 samsung,pins = "gpb5-2", "gpb5-3"; 336 samsung,pins = "gpb5-2", "gpb5-3";
339 samsung,pin-function = <2>; 337 samsung,pin-function = <2>;
340 samsung,pin-pud = <PIN_PULL_UP>; 338 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
341 samsung,pin-drv = <0>; 339 samsung,pin-drv = <0>;
342 }; 340 };
343 341
344 i2c10_bus: i2c10-bus { 342 i2c10_bus: i2c10-bus {
345 samsung,pins = "gpb5-4", "gpb5-5"; 343 samsung,pins = "gpb5-4", "gpb5-5";
346 samsung,pin-function = <2>; 344 samsung,pin-function = <2>;
347 samsung,pin-pud = <PIN_PULL_UP>; 345 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
348 samsung,pin-drv = <0>; 346 samsung,pin-drv = <0>;
349 }; 347 };
350 348
351 i2c11_bus: i2c11-bus { 349 i2c11_bus: i2c11-bus {
352 samsung,pins = "gpb5-6", "gpb5-7"; 350 samsung,pins = "gpb5-6", "gpb5-7";
353 samsung,pin-function = <2>; 351 samsung,pin-function = <2>;
354 samsung,pin-pud = <PIN_PULL_UP>; 352 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
355 samsung,pin-drv = <0>; 353 samsung,pin-drv = <0>;
356 }; 354 };
357 355
@@ -360,7 +358,7 @@
360 "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7", 358 "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7",
361 "gpe1-0", "gpe1-1"; 359 "gpe1-0", "gpe1-1";
362 samsung,pin-function = <2>; 360 samsung,pin-function = <2>;
363 samsung,pin-pud = <PIN_PULL_NONE>; 361 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
364 samsung,pin-drv = <0>; 362 samsung,pin-drv = <0>;
365 }; 363 };
366 364
@@ -368,35 +366,35 @@
368 samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3", 366 samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3",
369 "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3"; 367 "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
370 samsung,pin-function = <3>; 368 samsung,pin-function = <3>;
371 samsung,pin-pud = <PIN_PULL_NONE>; 369 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
372 samsung,pin-drv = <0>; 370 samsung,pin-drv = <0>;
373 }; 371 };
374 372
375 cam_i2c1_bus: cam-i2c1-bus { 373 cam_i2c1_bus: cam-i2c1-bus {
376 samsung,pins = "gpf0-2", "gpf0-3"; 374 samsung,pins = "gpf0-2", "gpf0-3";
377 samsung,pin-function = <2>; 375 samsung,pin-function = <2>;
378 samsung,pin-pud = <PIN_PULL_UP>; 376 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
379 samsung,pin-drv = <0>; 377 samsung,pin-drv = <0>;
380 }; 378 };
381 379
382 cam_i2c0_bus: cam-i2c0-bus { 380 cam_i2c0_bus: cam-i2c0-bus {
383 samsung,pins = "gpf0-0", "gpf0-1"; 381 samsung,pins = "gpf0-0", "gpf0-1";
384 samsung,pin-function = <2>; 382 samsung,pin-function = <2>;
385 samsung,pin-pud = <PIN_PULL_UP>; 383 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
386 samsung,pin-drv = <0>; 384 samsung,pin-drv = <0>;
387 }; 385 };
388 386
389 cam_spi0_bus: cam-spi0-bus { 387 cam_spi0_bus: cam-spi0-bus {
390 samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3"; 388 samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3";
391 samsung,pin-function = <2>; 389 samsung,pin-function = <2>;
392 samsung,pin-pud = <PIN_PULL_NONE>; 390 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
393 samsung,pin-drv = <0>; 391 samsung,pin-drv = <0>;
394 }; 392 };
395 393
396 cam_spi1_bus: cam-spi1-bus { 394 cam_spi1_bus: cam-spi1-bus {
397 samsung,pins = "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7"; 395 samsung,pins = "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7";
398 samsung,pin-function = <2>; 396 samsung,pin-function = <2>;
399 samsung,pin-pud = <PIN_PULL_NONE>; 397 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
400 samsung,pin-drv = <0>; 398 samsung,pin-drv = <0>;
401 }; 399 };
402}; 400};
@@ -445,112 +443,112 @@
445 sd0_clk: sd0-clk { 443 sd0_clk: sd0-clk {
446 samsung,pins = "gpc0-0"; 444 samsung,pins = "gpc0-0";
447 samsung,pin-function = <2>; 445 samsung,pin-function = <2>;
448 samsung,pin-pud = <PIN_PULL_NONE>; 446 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
449 samsung,pin-drv = <3>; 447 samsung,pin-drv = <3>;
450 }; 448 };
451 449
452 sd0_cmd: sd0-cmd { 450 sd0_cmd: sd0-cmd {
453 samsung,pins = "gpc0-1"; 451 samsung,pins = "gpc0-1";
454 samsung,pin-function = <2>; 452 samsung,pin-function = <2>;
455 samsung,pin-pud = <PIN_PULL_NONE>; 453 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
456 samsung,pin-drv = <3>; 454 samsung,pin-drv = <3>;
457 }; 455 };
458 456
459 sd0_bus1: sd0-bus-width1 { 457 sd0_bus1: sd0-bus-width1 {
460 samsung,pins = "gpc0-2"; 458 samsung,pins = "gpc0-2";
461 samsung,pin-function = <2>; 459 samsung,pin-function = <2>;
462 samsung,pin-pud = <PIN_PULL_UP>; 460 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
463 samsung,pin-drv = <3>; 461 samsung,pin-drv = <3>;
464 }; 462 };
465 463
466 sd0_bus4: sd0-bus-width4 { 464 sd0_bus4: sd0-bus-width4 {
467 samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5"; 465 samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5";
468 samsung,pin-function = <2>; 466 samsung,pin-function = <2>;
469 samsung,pin-pud = <PIN_PULL_UP>; 467 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
470 samsung,pin-drv = <3>; 468 samsung,pin-drv = <3>;
471 }; 469 };
472 470
473 sd0_bus8: sd0-bus-width8 { 471 sd0_bus8: sd0-bus-width8 {
474 samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3"; 472 samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3";
475 samsung,pin-function = <2>; 473 samsung,pin-function = <2>;
476 samsung,pin-pud = <PIN_PULL_UP>; 474 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
477 samsung,pin-drv = <3>; 475 samsung,pin-drv = <3>;
478 }; 476 };
479 477
480 sd0_rdqs: sd0-rdqs { 478 sd0_rdqs: sd0-rdqs {
481 samsung,pins = "gpc0-6"; 479 samsung,pins = "gpc0-6";
482 samsung,pin-function = <2>; 480 samsung,pin-function = <2>;
483 samsung,pin-pud = <PIN_PULL_UP>; 481 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
484 samsung,pin-drv = <3>; 482 samsung,pin-drv = <3>;
485 }; 483 };
486 484
487 sd1_clk: sd1-clk { 485 sd1_clk: sd1-clk {
488 samsung,pins = "gpc1-0"; 486 samsung,pins = "gpc1-0";
489 samsung,pin-function = <2>; 487 samsung,pin-function = <2>;
490 samsung,pin-pud = <PIN_PULL_NONE>; 488 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
491 samsung,pin-drv = <3>; 489 samsung,pin-drv = <3>;
492 }; 490 };
493 491
494 sd1_cmd: sd1-cmd { 492 sd1_cmd: sd1-cmd {
495 samsung,pins = "gpc1-1"; 493 samsung,pins = "gpc1-1";
496 samsung,pin-function = <2>; 494 samsung,pin-function = <2>;
497 samsung,pin-pud = <PIN_PULL_NONE>; 495 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
498 samsung,pin-drv = <3>; 496 samsung,pin-drv = <3>;
499 }; 497 };
500 498
501 sd1_bus1: sd1-bus-width1 { 499 sd1_bus1: sd1-bus-width1 {
502 samsung,pins = "gpc1-2"; 500 samsung,pins = "gpc1-2";
503 samsung,pin-function = <2>; 501 samsung,pin-function = <2>;
504 samsung,pin-pud = <PIN_PULL_UP>; 502 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
505 samsung,pin-drv = <3>; 503 samsung,pin-drv = <3>;
506 }; 504 };
507 505
508 sd1_bus4: sd1-bus-width4 { 506 sd1_bus4: sd1-bus-width4 {
509 samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5"; 507 samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5";
510 samsung,pin-function = <2>; 508 samsung,pin-function = <2>;
511 samsung,pin-pud = <PIN_PULL_UP>; 509 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
512 samsung,pin-drv = <3>; 510 samsung,pin-drv = <3>;
513 }; 511 };
514 512
515 sd1_bus8: sd1-bus-width8 { 513 sd1_bus8: sd1-bus-width8 {
516 samsung,pins = "gpc4-0", "gpc4-1", "gpc4-2", "gpc4-3"; 514 samsung,pins = "gpc4-0", "gpc4-1", "gpc4-2", "gpc4-3";
517 samsung,pin-function = <2>; 515 samsung,pin-function = <2>;
518 samsung,pin-pud = <PIN_PULL_UP>; 516 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
519 samsung,pin-drv = <3>; 517 samsung,pin-drv = <3>;
520 }; 518 };
521 519
522 sd2_clk: sd2-clk { 520 sd2_clk: sd2-clk {
523 samsung,pins = "gpc2-0"; 521 samsung,pins = "gpc2-0";
524 samsung,pin-function = <2>; 522 samsung,pin-function = <2>;
525 samsung,pin-pud = <PIN_PULL_NONE>; 523 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
526 samsung,pin-drv = <3>; 524 samsung,pin-drv = <3>;
527 }; 525 };
528 526
529 sd2_cmd: sd2-cmd { 527 sd2_cmd: sd2-cmd {
530 samsung,pins = "gpc2-1"; 528 samsung,pins = "gpc2-1";
531 samsung,pin-function = <2>; 529 samsung,pin-function = <2>;
532 samsung,pin-pud = <PIN_PULL_NONE>; 530 samsung,pin-pud = <EXYNOS_PIN_PULL_NONE>;
533 samsung,pin-drv = <3>; 531 samsung,pin-drv = <3>;
534 }; 532 };
535 533
536 sd2_cd: sd2-cd { 534 sd2_cd: sd2-cd {
537 samsung,pins = "gpc2-2"; 535 samsung,pins = "gpc2-2";
538 samsung,pin-function = <2>; 536 samsung,pin-function = <2>;
539 samsung,pin-pud = <PIN_PULL_UP>; 537 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
540 samsung,pin-drv = <3>; 538 samsung,pin-drv = <3>;
541 }; 539 };
542 540
543 sd2_bus1: sd2-bus-width1 { 541 sd2_bus1: sd2-bus-width1 {
544 samsung,pins = "gpc2-3"; 542 samsung,pins = "gpc2-3";
545 samsung,pin-function = <2>; 543 samsung,pin-function = <2>;
546 samsung,pin-pud = <PIN_PULL_UP>; 544 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
547 samsung,pin-drv = <3>; 545 samsung,pin-drv = <3>;
548 }; 546 };
549 547
550 sd2_bus4: sd2-bus-width4 { 548 sd2_bus4: sd2-bus-width4 {
551 samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6"; 549 samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6";
552 samsung,pin-function = <2>; 550 samsung,pin-function = <2>;
553 samsung,pin-pud = <PIN_PULL_UP>; 551 samsung,pin-pud = <EXYNOS_PIN_PULL_UP>;
554 samsung,pin-drv = <3>; 552 samsung,pin-drv = <3>;
555 }; 553 };
556}; 554};
diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
index b58a0f29f42c..bf43792efe27 100644
--- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi
@@ -9,6 +9,8 @@
9 * published by the Free Software Foundation. 9 * published by the Free Software Foundation.
10 */ 10 */
11 11
12#include <dt-bindings/pinctrl/samsung.h>
13
12&pinctrl_0 { 14&pinctrl_0 {
13 gpa0: gpa0 { 15 gpa0: gpa0 {
14 gpio-controller; 16 gpio-controller;
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 14beb7e07323..cf7d2986780a 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -12,6 +12,8 @@
12 * published by the Free Software Foundation. 12 * published by the Free Software Foundation.
13*/ 13*/
14 14
15#include <dt-bindings/pinctrl/samsung.h>
16
15&pinctrl_0 { 17&pinctrl_0 {
16 gpy7: gpy7 { 18 gpy7: gpy7 {
17 gpio-controller; 19 gpio-controller;
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-31 17:27:09 -0400