Merge tag 'at91-ab-4.17-dt2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Tue, 27 Mar 2018 12:52:57 +0000 (14:52 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 27 Mar 2018 12:52:57 +0000 (14:52 +0200)
commit692989c334bba18a4256d0a9664a18ca0a8f8a7b
treeb06c62fbbe7edf7a93fb47f069b53e1ea93eeb4e
parent11293cb75bdc799afe77f28e64d5c16f0cdff9cc
parent26f2cacde21b713f7f917d2193a76cc7636ee88e
Merge tag 'at91-ab-4.17-dt2' of ssh://gitolite./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