diff options
| author | Arnd Bergmann | 2018-03-27 14:52:57 +0200 |
|---|---|---|
| committer | Arnd Bergmann | 2018-03-27 14:52:57 +0200 |
| commit | 692989c334bba18a4256d0a9664a18ca0a8f8a7b (patch) | |
| tree | b06c62fbbe7edf7a93fb47f069b53e1ea93eeb4e /arch/arm/boot/dts/at91sam9x5.dtsi | |
| parent | 11293cb75bdc799afe77f28e64d5c16f0cdff9cc (diff) | |
| parent | 26f2cacde21b713f7f917d2193a76cc7636ee88e (diff) | |
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
Diffstat (limited to 'arch/arm/boot/dts/at91sam9x5.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index fee4fe51a97e..a3c3c3128148 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi @@ -520,8 +520,8 @@ usart0 { pinctrl_usart0: usart0-0 { atmel,pins = - <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA0 periph A with pullup */ - AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA1 periph A */ + <AT91_PIOA 0 AT91_PERIPH_A AT91_PINCTRL_NONE + AT91_PIOA 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart0_rts: usart0_rts-0 { @@ -543,8 +543,8 @@ usart1 { pinctrl_usart1: usart1-0 { atmel,pins = - <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA5 periph A with pullup */ - AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA6 periph A */ + <AT91_PIOA 5 AT91_PERIPH_A AT91_PINCTRL_NONE + AT91_PIOA 6 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart1_rts: usart1_rts-0 { @@ -566,8 +566,8 @@ usart2 { pinctrl_usart2: usart2-0 { atmel,pins = - <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_PULL_UP /* PA7 periph A with pullup */ - AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_NONE>; /* PA8 periph A */ + <AT91_PIOA 7 AT91_PERIPH_A AT91_PINCTRL_NONE + AT91_PIOA 8 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart2_rts: usart2_rts-0 { |