Skip to content

Commit 0fab5d4

Browse files
inguinCodrin Ciubotariu
inguin
authored and
Codrin Ciubotariu
committed
ARM: dts: at91: Reenable UART TX pull-ups
Pull-ups for SAM9 UART/USART TX lines were disabled in a previous commit. However, several chips in the SAM9 family require pull-ups to prevent the TX lines from falling (and causing an endless break condition) when the transceiver is disabled. From the SAM9G20 datasheet, 32.5.1: "To prevent the TXD line from falling when the USART is disabled, the use of an internal pull up is mandatory.". This commit reenables the pull-ups for all chips having that sentence in their datasheets. Fixes: 5e04822 ("ARM: dts: at91: fixes uart pinctrl, set pullup on rx, clear pullup on tx") Signed-off-by: Ingo van Lil <inguin@gmx.de> Cc: Peter Rosin <peda@axentia.se> Link: https://lore.kernel.org/r/20191203142147.875227-1-inguin@gmx.de Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
1 parent 48d9625 commit 0fab5d4

5 files changed

Lines changed: 20 additions & 20 deletions

File tree

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@
187187
usart0 {
188188
pinctrl_usart0: usart0-0 {
189189
atmel,pins =
190-
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
190+
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
191191
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
192192
};
193193

@@ -221,7 +221,7 @@
221221
usart1 {
222222
pinctrl_usart1: usart1-0 {
223223
atmel,pins =
224-
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
224+
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
225225
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
226226
};
227227

@@ -239,7 +239,7 @@
239239
usart2 {
240240
pinctrl_usart2: usart2-0 {
241241
atmel,pins =
242-
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
242+
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
243243
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
244244
};
245245

@@ -257,7 +257,7 @@
257257
usart3 {
258258
pinctrl_usart3: usart3-0 {
259259
atmel,pins =
260-
<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE
260+
<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
261261
AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
262262
};
263263

@@ -275,15 +275,15 @@
275275
uart0 {
276276
pinctrl_uart0: uart0-0 {
277277
atmel,pins =
278-
<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE
278+
<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP
279279
AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
280280
};
281281
};
282282

283283
uart1 {
284284
pinctrl_uart1: uart1-0 {
285285
atmel,pins =
286-
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE
286+
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
287287
AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
288288
};
289289
};

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

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

@@ -347,7 +347,7 @@
347347
usart1 {
348348
pinctrl_usart1: usart1-0 {
349349
atmel,pins =
350-
<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,
350+
<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
351351
<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
352352
};
353353

@@ -365,7 +365,7 @@
365365
usart2 {
366366
pinctrl_usart2: usart2-0 {
367367
atmel,pins =
368-
<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,
368+
<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
369369
<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
370370
};
371371

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@
183183
usart0 {
184184
pinctrl_usart0: usart0-0 {
185185
atmel,pins =
186-
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
186+
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
187187
AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
188188
};
189189

@@ -201,7 +201,7 @@
201201
usart1 {
202202
pinctrl_usart1: usart1-0 {
203203
atmel,pins =
204-
<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
204+
<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
205205
AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
206206
};
207207

@@ -219,7 +219,7 @@
219219
usart2 {
220220
pinctrl_usart2: usart2-0 {
221221
atmel,pins =
222-
<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
222+
<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
223223
AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
224224
};
225225

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@
556556
usart0 {
557557
pinctrl_usart0: usart0-0 {
558558
atmel,pins =
559-
<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
559+
<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
560560
AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
561561
};
562562

@@ -574,7 +574,7 @@
574574
usart1 {
575575
pinctrl_usart1: usart1-0 {
576576
atmel,pins =
577-
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
577+
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
578578
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
579579
};
580580

@@ -592,7 +592,7 @@
592592
usart2 {
593593
pinctrl_usart2: usart2-0 {
594594
atmel,pins =
595-
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
595+
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
596596
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
597597
};
598598

@@ -610,7 +610,7 @@
610610
usart3 {
611611
pinctrl_usart3: usart3-0 {
612612
atmel,pins =
613-
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
613+
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
614614
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
615615
};
616616

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@
682682
usart0 {
683683
pinctrl_usart0: usart0-0 {
684684
atmel,pins =
685-
<AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>,
685+
<AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
686686
<AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
687687
};
688688

@@ -721,7 +721,7 @@
721721
usart1 {
722722
pinctrl_usart1: usart1-0 {
723723
atmel,pins =
724-
<AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>,
724+
<AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
725725
<AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
726726
};
727727

@@ -744,7 +744,7 @@
744744
usart2 {
745745
pinctrl_usart2: usart2-0 {
746746
atmel,pins =
747-
<AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>,
747+
<AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
748748
<AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
749749
};
750750

@@ -767,7 +767,7 @@
767767
usart3 {
768768
pinctrl_usart3: usart3-0 {
769769
atmel,pins =
770-
<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>,
770+
<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>,
771771
<AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
772772
};
773773

0 commit comments

Comments
 (0)