Skip to content

L
linux
Commit 692989c3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files
Options

Merge tag 'at91-ab-4.17-dt2' of... 

Merge tag 'at91-ab-4.17-dt2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux into next/dt

Pull "AT91 DT for 4.17 #2" from Alexandre Belloni:

Pinctrl fixes, the UART pullups were discussed back in 2016.

* tag 'at91-ab-4.17-dt2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: dts: at91sam9260: pullup rx on usart0
  ARM: dts: at91rm9200: pullup rx on uart0
  ARM: dts: at91: fixes uart pinctrl, set pullup on rx, clear pullup on tx
  ARM: dts: at91: at91sam9g25: fix mux-mask pinctrl property
parents 11293cb7 26f2cacd
Hide whitespace changes
Inline Side-by-side
Showing with 87 additions and 87 deletions
arch/arm/boot/dts/at91rm9200.dtsi
View file @ 692989c3
...@@ -493,8 +493,8 @@ pinctrl_dbgu: dbgu-0 { ...@@ -493,8 +493,8 @@ pinctrl_dbgu: dbgu-0 {
uart0 { uart0 {
pinctrl_uart0: uart0-0 { pinctrl_uart0: uart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA17 periph A */ <AT91_PIOA 17 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA18 periph A */ AT91_PIOA 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_uart0_cts: uart0_cts-0 { pinctrl_uart0_cts: uart0_cts-0 {
...@@ -511,8 +511,8 @@ pinctrl_uart0_rts: uart0_rts-0 { ...@@ -511,8 +511,8 @@ pinctrl_uart0_rts: uart0_rts-0 {
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB20 periph A with pullup */ <AT91_PIOB 20 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB21 periph A */ AT91_PIOB 21 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_uart1_rts: uart1_rts-0 { pinctrl_uart1_rts: uart1_rts-0 {
...@@ -545,8 +545,8 @@ pinctrl_uart1_ri: uart1_ri-0 { ...@@ -545,8 +545,8 @@ pinctrl_uart1_ri: uart1_ri-0 {
uart2 { uart2 {
pinctrl_uart2: uart2-0 { pinctrl_uart2: uart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_NONE /* PA22 periph A */ <AT91_PIOA 22 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PA23 periph A with pullup */ AT91_PIOA 23 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
pinctrl_uart2_rts: uart2_rts-0 { pinctrl_uart2_rts: uart2_rts-0 {
...@@ -563,8 +563,8 @@ pinctrl_uart2_cts: uart2_cts-0 { ...@@ -563,8 +563,8 @@ pinctrl_uart2_cts: uart2_cts-0 {
uart3 { uart3 {
pinctrl_uart3: uart3-0 { pinctrl_uart3: uart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA5 periph B with pullup */ <AT91_PIOA 5 AT91_PERIPH_B AT91_PINCTRL_NONE
AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA6 periph B */ AT91_PIOA 6 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_uart3_rts: uart3_rts-0 { pinctrl_uart3_rts: uart3_rts-0 {
......
arch/arm/boot/dts/at91sam9260.dtsi
View file @ 692989c3
...@@ -434,8 +434,8 @@ pinctrl_dbgu: dbgu-0 { ...@@ -434,8 +434,8 @@ pinctrl_dbgu: dbgu-0 {
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB4 periph A */ <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */ AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -468,8 +468,8 @@ pinctrl_usart0_ri: usart0_ri-0 { ...@@ -468,8 +468,8 @@ pinctrl_usart0_ri: usart0_ri-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */ <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */ AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -486,8 +486,8 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -486,8 +486,8 @@ pinctrl_usart1_cts: usart1_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB8 periph A with pullup */ <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB9 periph A */ AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
...@@ -504,8 +504,8 @@ pinctrl_usart2_cts: usart2_cts-0 { ...@@ -504,8 +504,8 @@ pinctrl_usart2_cts: usart2_cts-0 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB10 periph A with pullup */ <AT91_PIOB 10 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB11 periph A */ AT91_PIOB 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart3_rts: usart3_rts-0 { pinctrl_usart3_rts: usart3_rts-0 {
...@@ -522,16 +522,16 @@ pinctrl_usart3_cts: usart3_cts-0 { ...@@ -522,16 +522,16 @@ pinctrl_usart3_cts: usart3_cts-0 {
uart0 { uart0 {
pinctrl_uart0: uart0-0 { pinctrl_uart0: uart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PA31 periph B with pullup */ <AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE
AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PA30 periph B */ AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
}; };
}; };
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB12 periph A with pullup */ <AT91_PIOB 12 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB13 periph A */ AT91_PIOB 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9261.dtsi
View file @ 692989c3
...@@ -328,8 +328,8 @@ pinctrl_dbgu: dbgu-0 { ...@@ -328,8 +328,8 @@ pinctrl_dbgu: dbgu-0 {
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOC 8 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOC 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -346,8 +346,8 @@ pinctrl_usart0_cts: usart0_cts-0 { ...@@ -346,8 +346,8 @@ pinctrl_usart0_cts: usart0_cts-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOC 12 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOC 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -364,8 +364,8 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -364,8 +364,8 @@ pinctrl_usart1_cts: usart1_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOC 14 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOC 15 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
......
arch/arm/boot/dts/at91sam9263.dtsi
View file @ 692989c3
...@@ -437,8 +437,8 @@ pinctrl_dbgu: dbgu-0 { ...@@ -437,8 +437,8 @@ pinctrl_dbgu: dbgu-0 {
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA26 periph A with pullup */ <AT91_PIOA 26 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA27 periph A */ AT91_PIOA 27 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -455,8 +455,8 @@ pinctrl_usart0_cts: usart0_cts-0 { ...@@ -455,8 +455,8 @@ pinctrl_usart0_cts: usart0_cts-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD0 periph A with pullup */ <AT91_PIOD 0 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD1 periph A */ AT91_PIOD 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -473,8 +473,8 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -473,8 +473,8 @@ pinctrl_usart1_cts: usart1_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PD2 periph A with pullup */ <AT91_PIOD 2 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PD3 periph A */ AT91_PIOD 3 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
......
arch/arm/boot/dts/at91sam9g25.dtsi
View file @ 692989c3
...@@ -21,7 +21,7 @@ pinctrl@fffff400 { ...@@ -21,7 +21,7 @@ pinctrl@fffff400 {
atmel,mux-mask = < atmel,mux-mask = <
/* A B C */ /* A B C */
0xffffffff 0xffe0399f 0xc000001c /* pioA */ 0xffffffff 0xffe0399f 0xc000001c /* pioA */
0x0007ffff 0x8000fe3f 0x00000000 /* pioB */ 0x0007ffff 0x00047e3f 0x00000000 /* pioB */
0x80000000 0x07c0ffff 0xb83fffff /* pioC */ 0x80000000 0x07c0ffff 0xb83fffff /* pioC */
0x003fffff 0x003f8000 0x00000000 /* pioD */ 0x003fffff 0x003f8000 0x00000000 /* pioD */
>; >;
......
arch/arm/boot/dts/at91sam9g45.dtsi
View file @ 692989c3
...@@ -555,8 +555,8 @@ pinctrl_isi_data_10_11: isi-0-data-10-11 { ...@@ -555,8 +555,8 @@ pinctrl_isi_data_10_11: isi-0-data-10-11 {
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB19 periph A with pullup */ <AT91_PIOB 19 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB18 periph A */ AT91_PIOB 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -573,8 +573,8 @@ pinctrl_usart0_cts: usart0_cts-0 { ...@@ -573,8 +573,8 @@ pinctrl_usart0_cts: usart0_cts-0 {
uart1 { uart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB4 periph A with pullup */ <AT91_PIOB 4 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB5 periph A */ AT91_PIOB 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -591,8 +591,8 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -591,8 +591,8 @@ pinctrl_usart1_cts: usart1_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB6 periph A with pullup */ <AT91_PIOB 6 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB7 periph A */ AT91_PIOB 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
...@@ -609,8 +609,8 @@ pinctrl_usart2_cts: usart2_cts-0 { ...@@ -609,8 +609,8 @@ pinctrl_usart2_cts: usart2_cts-0 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PB9 periph A with pullup */ <AT91_PIOB 8 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PB8 periph A */ AT91_PIOB 9 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart3_rts: usart3_rts-0 { pinctrl_usart3_rts: usart3_rts-0 {
......
arch/arm/boot/dts/at91sam9n12.dtsi
View file @ 692989c3
...@@ -641,8 +641,8 @@ pinctrl_uart0: uart0-0 { ...@@ -641,8 +641,8 @@ pinctrl_uart0: uart0-0 {
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* PC17 periph C with pullup */ <AT91_PIOC 16 AT91_PERIPH_C AT91_PINCTRL_NONE
AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_NONE>; /* PC16 periph C */ AT91_PIOC 17 AT91_PERIPH_C AT91_PINCTRL_PULL_UP>;
}; };
}; };
......
arch/arm/boot/dts/at91sam9rl.dtsi
View file @ 692989c3
...@@ -720,8 +720,8 @@ pinctrl_usart0_sck: usart0_sck-0 { ...@@ -720,8 +720,8 @@ pinctrl_usart0_sck: usart0_sck-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -743,8 +743,8 @@ pinctrl_usart1_sck: usart1_sck-0 { ...@@ -743,8 +743,8 @@ pinctrl_usart1_sck: usart1_sck-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
...@@ -766,8 +766,8 @@ pinctrl_usart2_sck: usart2_sck-0 { ...@@ -766,8 +766,8 @@ pinctrl_usart2_sck: usart2_sck-0 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>,
<AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart3_rts: usart3_rts-0 { pinctrl_usart3_rts: usart3_rts-0 {
......
arch/arm/boot/dts/at91sam9x5.dtsi
View file @ 692989c3
...@@ -520,8 +520,8 @@ pinctrl_ebi_addr_nand: ebi-addr-0 { ...@@ -520,8 +520,8 @@ pinctrl_ebi_addr_nand: ebi-addr-0 {
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */ <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA1 periph A */ AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -543,8 +543,8 @@ pinctrl_usart0_sck: usart0_sck-0 { ...@@ -543,8 +543,8 @@ pinctrl_usart0_sck: usart0_sck-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */ <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA6 periph A */ AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -566,8 +566,8 @@ pinctrl_usart1_sck: usart1_sck-0 { ...@@ -566,8 +566,8 @@ pinctrl_usart1_sck: usart1_sck-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */ <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE
AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */ AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
......
arch/arm/boot/dts/at91sam9x5_usart3.dtsi
View file @ 692989c3
...@@ -21,8 +21,8 @@ pinctrl@fffff400 { ...@@ -21,8 +21,8 @@ pinctrl@fffff400 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* PC22 periph B with pullup */ <AT91_PIOC 22 AT91_PERIPH_B AT91_PINCTRL_NONE
AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* PC23 periph B */ AT91_PIOC 23 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>;
}; };
pinctrl_usart3_rts: usart3_rts-0 { pinctrl_usart3_rts: usart3_rts-0 {
......
arch/arm/boot/dts/sama5d3.dtsi
View file @ 692989c3
...@@ -861,24 +861,24 @@ AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB10 periph B RF1, conflicts wit ...@@ -861,24 +861,24 @@ AT91_PIOB 10 AT91_PERIPH_B AT91_PINCTRL_NONE /* PB10 periph B RF1, conflicts wit
uart0 { uart0 {
pinctrl_uart0: uart0-0 { pinctrl_uart0: uart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* conflicts with PWMFI2, ISI_D8 */ <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with PWMFI2, ISI_D8 */
AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* conflicts with ISI_PCK */ AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
}; };
}; };
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* conflicts with TWD0, ISI_VSYNC */ <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with TWD0, ISI_VSYNC */
AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* conflicts with TWCK0, ISI_HSYNC */ AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
}; };
}; };
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* PD17 periph A */ <AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PD18 periph A with pullup */ AT91_PIOD 18 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
pinctrl_usart0_rts_cts: usart0_rts_cts-0 { pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
...@@ -891,8 +891,8 @@ pinctrl_usart0_rts_cts: usart0_rts_cts-0 { ...@@ -891,8 +891,8 @@ pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_NONE /* PB28 periph A */ <AT91_PIOB 28 AT91_PERIPH_A AT91_PINCTRL_PULL_UP
AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PB29 periph A with pullup */ AT91_PIOB 29 AT91_PERIPH_A AT91_PINCTRL_NONE>;
}; };
pinctrl_usart1_rts_cts: usart1_rts_cts-0 { pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
...@@ -905,8 +905,8 @@ pinctrl_usart1_rts_cts: usart1_rts_cts-0 { ...@@ -905,8 +905,8 @@ pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE25 periph B, conflicts with A25 */ <AT91_PIOE 25 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A25 */
AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE26 periph B with pullup, conflicts NCS0 */ AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts NCS0 */
}; };
pinctrl_usart2_rts_cts: usart2_rts_cts-0 { pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
...@@ -919,8 +919,8 @@ pinctrl_usart2_rts_cts: usart2_rts_cts-0 { ...@@ -919,8 +919,8 @@ pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_NONE /* PE18 periph B, conflicts with A18 */ <AT91_PIOE 18 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with A18 */
AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PE19 periph B with pullup, conflicts with A19 */ AT91_PIOE 19 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with A19 */
}; };
pinctrl_usart3_rts_cts: usart3_rts_cts-0 { pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
......
arch/arm/boot/dts/sama5d3_uart.dtsi
View file @ 692989c3
...@@ -23,16 +23,16 @@ pinctrl@fffff200 { ...@@ -23,16 +23,16 @@ pinctrl@fffff200 {
uart0 { uart0 {
pinctrl_uart0: uart0-0 { pinctrl_uart0: uart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_NONE /* PC29 periph A, conflicts with PWMFI2, ISI_D8 */ <AT91_PIOC 29 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* conflicts with PWMFI2, ISI_D8 */
AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; /* PC30 periph A with pullup, conflicts with ISI_PCK */ AT91_PIOC 30 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* conflicts with ISI_PCK */
}; };
}; };
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* PA30 periph B, conflicts with TWD0, ISI_VSYNC */ <AT91_PIOA 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* conflicts with TWD0, ISI_VSYNC */
AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_PULL_UP>; /* PA31 periph B with pullup, conflicts with TWCK0, ISI_HSYNC */ AT91_PIOA 31 AT91_PERIPH_B AT91_PINCTRL_NONE>; /* conflicts with TWCK0, ISI_HSYNC */
}; };
}; };
}; };
......
arch/arm/boot/dts/sama5d4.dtsi
View file @ 692989c3
...@@ -1926,8 +1926,8 @@ AT91_PIOD 15 AT91_PERIPH_B AT91_PINCTRL_NONE /* SPI2_SPCK conflicts with RTS1 */ ...@@ -1926,8 +1926,8 @@ AT91_PIOD 15 AT91_PERIPH_B AT91_PINCTRL_NONE /* SPI2_SPCK conflicts with RTS1 */
uart0 { uart0 {
pinctrl_uart0: uart0-0 { pinctrl_uart0: uart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOE 29 AT91_PERIPH_B AT91_PINCTRL_NONE /* RXD */ <AT91_PIOE 29 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
}; };
...@@ -1935,8 +1935,8 @@ AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */ ...@@ -1935,8 +1935,8 @@ AT91_PIOE 30 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */
uart1 { uart1 {
pinctrl_uart1: uart1-0 { pinctrl_uart1: uart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOC 25 AT91_PERIPH_C AT91_PINCTRL_NONE /* RXD */ <AT91_PIOC 25 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
}; };
...@@ -1944,8 +1944,8 @@ AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* TXD */ ...@@ -1944,8 +1944,8 @@ AT91_PIOC 26 AT91_PERIPH_C AT91_PINCTRL_PULL_UP /* TXD */
usart0 { usart0 {
pinctrl_usart0: usart0-0 { pinctrl_usart0: usart0-0 {
atmel,pins = atmel,pins =
<AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_NONE /* RXD */ <AT91_PIOD 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOD 13 AT91_PERIPH_A AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
pinctrl_usart0_rts: usart0_rts-0 { pinctrl_usart0_rts: usart0_rts-0 {
...@@ -1959,8 +1959,8 @@ pinctrl_usart0_cts: usart0_cts-0 { ...@@ -1959,8 +1959,8 @@ pinctrl_usart0_cts: usart0_cts-0 {
usart1 { usart1 {
pinctrl_usart1: usart1-0 { pinctrl_usart1: usart1-0 {
atmel,pins = atmel,pins =
<AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_NONE /* RXD */ <AT91_PIOD 16 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOD 17 AT91_PERIPH_A AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
pinctrl_usart1_rts: usart1_rts-0 { pinctrl_usart1_rts: usart1_rts-0 {
...@@ -1974,8 +1974,8 @@ pinctrl_usart1_cts: usart1_cts-0 { ...@@ -1974,8 +1974,8 @@ pinctrl_usart1_cts: usart1_cts-0 {
usart2 { usart2 {
pinctrl_usart2: usart2-0 { pinctrl_usart2: usart2-0 {
atmel,pins = atmel,pins =
<AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_NONE /* RXD - conflicts with G0_CRS, ISI_HSYNC */ <AT91_PIOB 4 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* RXD - conflicts with G0_CRS, ISI_HSYNC */
AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD - conflicts with G0_COL, PCK2 */ AT91_PIOB 5 AT91_PERIPH_B AT91_PINCTRL_NONE /* TXD - conflicts with G0_COL, PCK2 */
>; >;
}; };
pinctrl_usart2_rts: usart2_rts-0 { pinctrl_usart2_rts: usart2_rts-0 {
...@@ -1989,8 +1989,8 @@ pinctrl_usart2_cts: usart2_cts-0 { ...@@ -1989,8 +1989,8 @@ pinctrl_usart2_cts: usart2_cts-0 {
usart3 { usart3 {
pinctrl_usart3: usart3-0 { pinctrl_usart3: usart3-0 {
atmel,pins = atmel,pins =
<AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_NONE /* RXD */ <AT91_PIOE 16 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
}; };
...@@ -1998,8 +1998,8 @@ AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */ ...@@ -1998,8 +1998,8 @@ AT91_PIOE 17 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */
usart4 { usart4 {
pinctrl_usart4: usart4-0 { pinctrl_usart4: usart4-0 {
atmel,pins = atmel,pins =
<AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_NONE /* RXD */ <AT91_PIOE 26 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* RXD */
AT91_PIOE 27 AT91_PERIPH_B AT91_PINCTRL_PULL_UP /* TXD */ AT91_PIOE 27 AT91_PERIPH_B AT91_PINCTRL_NONE /* TXD */
>; >;
}; };
pinctrl_usart4_rts: usart4_rts-0 { pinctrl_usart4_rts: usart4_rts-0 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7