diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-12-16 16:59:57 -0500 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2015-01-21 03:58:57 -0500 |
commit | 092a0c3b18ce8f2207591846dad5c9071ed2f832 (patch) | |
tree | f9bfdb7753f5dc589815988b2cdb33af667825da /arch/arm/boot/dts/sun5i-a10s.dtsi | |
parent | 1f9f6a78735f56f5d718565b235c7e0188933e2d (diff) |
ARM: sunxi: DT: Convert the DTs to use a header for the pinctrl nodes
The pinctrl nodes require some extra opaque arguments for the pull up and drive
strength values.
Introduce a new header file and convert the device trees to replace these
opaque numbers by defines.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
Diffstat (limited to 'arch/arm/boot/dts/sun5i-a10s.dtsi')
-rw-r--r-- | arch/arm/boot/dts/sun5i-a10s.dtsi | 37 |
1 files changed, 19 insertions, 18 deletions
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index d0b7182e6fdd..241d69d0e7d6 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi | |||
@@ -14,6 +14,7 @@ | |||
14 | #include "skeleton.dtsi" | 14 | #include "skeleton.dtsi" |
15 | 15 | ||
16 | #include <dt-bindings/dma/sun4i-a10.h> | 16 | #include <dt-bindings/dma/sun4i-a10.h> |
17 | #include <dt-bindings/pinctrl/sun4i-a10.h> | ||
17 | 18 | ||
18 | / { | 19 | / { |
19 | interrupt-parent = <&intc>; | 20 | interrupt-parent = <&intc>; |
@@ -454,22 +455,22 @@ | |||
454 | uart0_pins_a: uart0@0 { | 455 | uart0_pins_a: uart0@0 { |
455 | allwinner,pins = "PB19", "PB20"; | 456 | allwinner,pins = "PB19", "PB20"; |
456 | allwinner,function = "uart0"; | 457 | allwinner,function = "uart0"; |
457 | allwinner,drive = <0>; | 458 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
458 | allwinner,pull = <0>; | 459 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
459 | }; | 460 | }; |
460 | 461 | ||
461 | uart2_pins_a: uart2@0 { | 462 | uart2_pins_a: uart2@0 { |
462 | allwinner,pins = "PC18", "PC19"; | 463 | allwinner,pins = "PC18", "PC19"; |
463 | allwinner,function = "uart2"; | 464 | allwinner,function = "uart2"; |
464 | allwinner,drive = <0>; | 465 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
465 | allwinner,pull = <0>; | 466 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
466 | }; | 467 | }; |
467 | 468 | ||
468 | uart3_pins_a: uart3@0 { | 469 | uart3_pins_a: uart3@0 { |
469 | allwinner,pins = "PG9", "PG10"; | 470 | allwinner,pins = "PG9", "PG10"; |
470 | allwinner,function = "uart3"; | 471 | allwinner,function = "uart3"; |
471 | allwinner,drive = <0>; | 472 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
472 | allwinner,pull = <0>; | 473 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
473 | }; | 474 | }; |
474 | 475 | ||
475 | emac_pins_a: emac0@0 { | 476 | emac_pins_a: emac0@0 { |
@@ -479,43 +480,43 @@ | |||
479 | "PA11", "PA12", "PA13", "PA14", | 480 | "PA11", "PA12", "PA13", "PA14", |
480 | "PA15", "PA16"; | 481 | "PA15", "PA16"; |
481 | allwinner,function = "emac"; | 482 | allwinner,function = "emac"; |
482 | allwinner,drive = <0>; | 483 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
483 | allwinner,pull = <0>; | 484 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
484 | }; | 485 | }; |
485 | 486 | ||
486 | i2c0_pins_a: i2c0@0 { | 487 | i2c0_pins_a: i2c0@0 { |
487 | allwinner,pins = "PB0", "PB1"; | 488 | allwinner,pins = "PB0", "PB1"; |
488 | allwinner,function = "i2c0"; | 489 | allwinner,function = "i2c0"; |
489 | allwinner,drive = <0>; | 490 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
490 | allwinner,pull = <0>; | 491 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
491 | }; | 492 | }; |
492 | 493 | ||
493 | i2c1_pins_a: i2c1@0 { | 494 | i2c1_pins_a: i2c1@0 { |
494 | allwinner,pins = "PB15", "PB16"; | 495 | allwinner,pins = "PB15", "PB16"; |
495 | allwinner,function = "i2c1"; | 496 | allwinner,function = "i2c1"; |
496 | allwinner,drive = <0>; | 497 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
497 | allwinner,pull = <0>; | 498 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
498 | }; | 499 | }; |
499 | 500 | ||
500 | i2c2_pins_a: i2c2@0 { | 501 | i2c2_pins_a: i2c2@0 { |
501 | allwinner,pins = "PB17", "PB18"; | 502 | allwinner,pins = "PB17", "PB18"; |
502 | allwinner,function = "i2c2"; | 503 | allwinner,function = "i2c2"; |
503 | allwinner,drive = <0>; | 504 | allwinner,drive = <SUN4I_PINCTRL_10_MA>; |
504 | allwinner,pull = <0>; | 505 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
505 | }; | 506 | }; |
506 | 507 | ||
507 | mmc0_pins_a: mmc0@0 { | 508 | mmc0_pins_a: mmc0@0 { |
508 | allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; | 509 | allwinner,pins = "PF0","PF1","PF2","PF3","PF4","PF5"; |
509 | allwinner,function = "mmc0"; | 510 | allwinner,function = "mmc0"; |
510 | allwinner,drive = <2>; | 511 | allwinner,drive = <SUN4I_PINCTRL_30_MA>; |
511 | allwinner,pull = <0>; | 512 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
512 | }; | 513 | }; |
513 | 514 | ||
514 | mmc1_pins_a: mmc1@0 { | 515 | mmc1_pins_a: mmc1@0 { |
515 | allwinner,pins = "PG3","PG4","PG5","PG6","PG7","PG8"; | 516 | allwinner,pins = "PG3","PG4","PG5","PG6","PG7","PG8"; |
516 | allwinner,function = "mmc1"; | 517 | allwinner,function = "mmc1"; |
517 | allwinner,drive = <2>; | 518 | allwinner,drive = <SUN4I_PINCTRL_30_MA>; |
518 | allwinner,pull = <0>; | 519 | allwinner,pull = <SUN4I_PINCTRL_NO_PULL>; |
519 | }; | 520 | }; |
520 | }; | 521 | }; |
521 | 522 | ||