Skip to content

Commit 0e83071

Browse files
peda-rcristibirsan
peda-r
authored and
cristibirsan
committed
ARM: dts: at91: fixes uart pinctrl, set pullup on rx, clear pullup on tx
Remove pullup on uart TX signals, they are push-pull outputs thus pullups are pointless. Add pullup on uart RX signals, they prevent the RX signals to be left floating and so consuming a useless extra amount of power in crowbarred state if nothing is connected to RX. Signed-off-by: Peter Rosin <peda@axentia.se> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent d665fe4 commit 0e83071

12 files changed

Lines changed: 82 additions & 82 deletions

‎arch/arm/boot/dts/at91rm9200.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@
511511
uart1 {
512512
pinctrl_uart1: uart1-0 {
513513
atmel,pins =
514-
<AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB20 periph A with pullup */
515-
AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */
514+
<AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
515+
AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
516516
};
517517

518518
pinctrl_uart1_rts: uart1_rts-0 {
@@ -545,8 +545,8 @@
545545
uart2 {
546546
pinctrl_uart2: uart2-0 {
547547
atmel,pins =
548-
<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA22 periph A */
549-
AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA23 periph A with pullup */
548+
<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
549+
AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_NONE>;
550550
};
551551

552552
pinctrl_uart2_rts: uart2_rts-0 {
@@ -563,8 +563,8 @@
563563
uart3 {
564564
pinctrl_uart3: uart3-0 {
565565
atmel,pins =
566-
<AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */
567-
AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA6 periph B */
566+
<AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE
567+
AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
568568
};
569569

570570
pinctrl_uart3_rts: uart3_rts-0 {

‎arch/arm/boot/dts/at91sam9260.dtsi‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -468,8 +468,8 @@
468468
usart1 {
469469
pinctrl_usart1: usart1-0 {
470470
atmel,pins =
471-
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
472-
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */
471+
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
472+
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
473473
};
474474

475475
pinctrl_usart1_rts: usart1_rts-0 {
@@ -486,8 +486,8 @@
486486
usart2 {
487487
pinctrl_usart2: usart2-0 {
488488
atmel,pins =
489-
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB8 periph A with pullup */
490-
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB9 periph A */
489+
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
490+
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
491491
};
492492

493493
pinctrl_usart2_rts: usart2_rts-0 {
@@ -504,8 +504,8 @@
504504
usart3 {
505505
pinctrl_usart3: usart3-0 {
506506
atmel,pins =
507-
<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB10 periph A with pullup */
508-
AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */
507+
<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE
508+
AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
509509
};
510510

511511
pinctrl_usart3_rts: usart3_rts-0 {
@@ -522,16 +522,16 @@
522522
uart0 {
523523
pinctrl_uart0: uart0-0 {
524524
atmel,pins =
525-
<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA31 periph B with pullup */
526-
AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */
525+
<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE
526+
AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
527527
};
528528
};
529529

530530
uart1 {
531531
pinctrl_uart1: uart1-0 {
532532
atmel,pins =
533-
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB12 periph A with pullup */
534-
AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */
533+
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE
534+
AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
535535
};
536536
};
537537

‎arch/arm/boot/dts/at91sam9261.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,8 @@
328328
usart0 {
329329
pinctrl_usart0: usart0-0 {
330330
atmel,pins =
331-
<AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
332-
<AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>;
331+
<AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE>,
332+
<AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
333333
};
334334

335335
pinctrl_usart0_rts: usart0_rts-0 {
@@ -346,8 +346,8 @@
346346
usart1 {
347347
pinctrl_usart1: usart1-0 {
348348
atmel,pins =
349-
<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
350-
<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>;
349+
<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,
350+
<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
351351
};
352352

353353
pinctrl_usart1_rts: usart1_rts-0 {
@@ -364,8 +364,8 @@
364364
usart2 {
365365
pinctrl_usart2: usart2-0 {
366366
atmel,pins =
367-
<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
368-
<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>;
367+
<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,
368+
<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
369369
};
370370

371371
pinctrl_usart2_rts: usart2_rts-0 {

‎arch/arm/boot/dts/at91sam9263.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,8 +437,8 @@
437437
usart0 {
438438
pinctrl_usart0: usart0-0 {
439439
atmel,pins =
440-
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA26 periph A with pullup */
441-
AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */
440+
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
441+
AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
442442
};
443443

444444
pinctrl_usart0_rts: usart0_rts-0 {
@@ -455,8 +455,8 @@
455455
usart1 {
456456
pinctrl_usart1: usart1-0 {
457457
atmel,pins =
458-
<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */
459-
AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD1 periph A */
458+
<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
459+
AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
460460
};
461461

462462
pinctrl_usart1_rts: usart1_rts-0 {
@@ -473,8 +473,8 @@
473473
usart2 {
474474
pinctrl_usart2: usart2-0 {
475475
atmel,pins =
476-
<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */
477-
AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD3 periph A */
476+
<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
477+
AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
478478
};
479479

480480
pinctrl_usart2_rts: usart2_rts-0 {

‎arch/arm/boot/dts/at91sam9g45.dtsi‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -555,8 +555,8 @@
555555
usart0 {
556556
pinctrl_usart0: usart0-0 {
557557
atmel,pins =
558-
<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB19 periph A with pullup */
559-
AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */
558+
<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
559+
AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
560560
};
561561

562562
pinctrl_usart0_rts: usart0_rts-0 {
@@ -573,8 +573,8 @@
573573
uart1 {
574574
pinctrl_usart1: usart1-0 {
575575
atmel,pins =
576-
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */
577-
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */
576+
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
577+
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
578578
};
579579

580580
pinctrl_usart1_rts: usart1_rts-0 {
@@ -591,8 +591,8 @@
591591
usart2 {
592592
pinctrl_usart2: usart2-0 {
593593
atmel,pins =
594-
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */
595-
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */
594+
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
595+
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
596596
};
597597

598598
pinctrl_usart2_rts: usart2_rts-0 {
@@ -609,8 +609,8 @@
609609
usart3 {
610610
pinctrl_usart3: usart3-0 {
611611
atmel,pins =
612-
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB9 periph A with pullup */
613-
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */
612+
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
613+
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
614614
};
615615

616616
pinctrl_usart3_rts: usart3_rts-0 {

‎arch/arm/boot/dts/at91sam9n12.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,8 @@
641641
uart1 {
642642
pinctrl_uart1: uart1-0 {
643643
atmel,pins =
644-
<AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* PC17 periph C with pullup */
645-
AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC16 periph C */
644+
<AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_NONE
645+
AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;
646646
};
647647
};
648648

‎arch/arm/boot/dts/at91sam9rl.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -720,8 +720,8 @@
720720
usart1 {
721721
pinctrl_usart1: usart1-0 {
722722
atmel,pins =
723-
<AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
724-
<AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>;
723+
<AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>,
724+
<AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
725725
};
726726

727727
pinctrl_usart1_rts: usart1_rts-0 {
@@ -743,8 +743,8 @@
743743
usart2 {
744744
pinctrl_usart2: usart2-0 {
745745
atmel,pins =
746-
<AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
747-
<AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE>;
746+
<AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>,
747+
<AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
748748
};
749749

750750
pinctrl_usart2_rts: usart2_rts-0 {
@@ -766,8 +766,8 @@
766766
usart3 {
767767
pinctrl_usart3: usart3-0 {
768768
atmel,pins =
769-
<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
770-
<AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE>;
769+
<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>,
770+
<AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
771771
};
772772

773773
pinctrl_usart3_rts: usart3_rts-0 {

‎arch/arm/boot/dts/at91sam9x5.dtsi‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -520,8 +520,8 @@
520520
usart0 {
521521
pinctrl_usart0: usart0-0 {
522522
atmel,pins =
523-
<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */
524-
AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA1 periph A */
523+
<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
524+
AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
525525
};
526526

527527
pinctrl_usart0_rts: usart0_rts-0 {
@@ -543,8 +543,8 @@
543543
usart1 {
544544
pinctrl_usart1: usart1-0 {
545545
atmel,pins =
546-
<AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */
547-
AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA6 periph A */
546+
<AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE
547+
AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
548548
};
549549

550550
pinctrl_usart1_rts: usart1_rts-0 {
@@ -566,8 +566,8 @@
566566
usart2 {
567567
pinctrl_usart2: usart2-0 {
568568
atmel,pins =
569-
<AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */
570-
AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */
569+
<AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE
570+
AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
571571
};
572572

573573
pinctrl_usart2_rts: usart2_rts-0 {

‎arch/arm/boot/dts/at91sam9x5_usart3.dtsi‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
usart3 {
2222
pinctrl_usart3: usart3-0 {
2323
atmel,pins =
24-
<AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PC22 periph B with pullup */
25-
AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC23 periph B */
24+
<AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE
25+
AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
2626
};
2727

2828
pinctrl_usart3_rts: usart3_rts-0 {

‎arch/arm/boot/dts/sama5d3.dtsi‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -861,24 +861,24 @@
861861
uart0 {
862862
pinctrl_uart0: uart0-0 {
863863
atmel,pins =
864-
<AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* conflicts with PWMFI2, ISI_D8 */
865-
AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* conflicts with ISI_PCK */
864+
<AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with PWMFI2, ISI_D8 */
865+
AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
866866
};
867867
};
868868

869869
uart1 {
870870
pinctrl_uart1: uart1-0 {
871871
atmel,pins =
872-
<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* conflicts with TWD0, ISI_VSYNC */
873-
AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* conflicts with TWCK0, ISI_HSYNC */
872+
<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with TWD0, ISI_VSYNC */
873+
AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
874874
};
875875
};
876876

877877
usart0 {
878878
pinctrl_usart0: usart0-0 {
879879
atmel,pins =
880-
<AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD17 periph A */
881-
AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD18 periph A with pullup */
880+
<AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
881+
AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;
882882
};
883883

884884
pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
@@ -891,8 +891,8 @@
891891
usart1 {
892892
pinctrl_usart1: usart1-0 {
893893
atmel,pins =
894-
<AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB28 periph A */
895-
AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB29 periph A with pullup */
894+
<AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
895+
AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>;
896896
};
897897

898898
pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
@@ -905,8 +905,8 @@
905905
usart2 {
906906
pinctrl_usart2: usart2-0 {
907907
atmel,pins =
908-
<AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE25 periph B, conflicts with A25 */
909-
AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE26 periph B with pullup, conflicts NCS0 */
908+
<AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A25 */
909+
AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts NCS0 */
910910
};
911911

912912
pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
@@ -919,8 +919,8 @@
919919
usart3 {
920920
pinctrl_usart3: usart3-0 {
921921
atmel,pins =
922-
<AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE18 periph B, conflicts with A18 */
923-
AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE19 periph B with pullup, conflicts with A19 */
922+
<AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A18 */
923+
AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with A19 */
924924
};
925925

926926
pinctrl_usart3_rts_cts: usart3_rts_cts-0 {

0 commit comments

Comments
 (0)