diff options
| author | Emmanuel Vadot <manu@FreeBSD.org> | 2018-06-14 07:12:10 +0000 |
|---|---|---|
| committer | Emmanuel Vadot <manu@FreeBSD.org> | 2018-06-14 07:12:10 +0000 |
| commit | 63e12418fda2f1cb64c754b9a0bcdaf930861f0d (patch) | |
| tree | 5e6082fa973b9a90dffaa93b03d7f003db7dcf96 /sys/gnu/dts/arm/at91sam9rl.dtsi | |
| parent | 5f88ee4479a5bf81f59509cd9ca1ba8721f3d68e (diff) | |
| parent | c19dc8ed9745602cc89c0f0c31220c71d7ac2063 (diff) | |
dts: Update our copy to Linux 4.17
Notes
Notes:
svn path=/head/; revision=335121
Diffstat (limited to 'sys/gnu/dts/arm/at91sam9rl.dtsi')
| -rw-r--r-- | sys/gnu/dts/arm/at91sam9rl.dtsi | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sys/gnu/dts/arm/at91sam9rl.dtsi b/sys/gnu/dts/arm/at91sam9rl.dtsi index 3cae687dccbd..bd001cca25a4 100644 --- a/sys/gnu/dts/arm/at91sam9rl.dtsi +++ b/sys/gnu/dts/arm/at91sam9rl.dtsi @@ -1,7 +1,8 @@ /* * at91sam9rl.dtsi - Device Tree Include file for AT91SAM9RL family SoC * - * Copyright (C) 2014 Alexandre Belloni <alexandre.belloni@free-electrons.com> + * Copyright (C) 2014 Microchip + * Alexandre Belloni <alexandre.belloni@free-electrons.com> * * Licensed under GPLv2 or later. */ @@ -719,8 +720,8 @@ usart1 { pinctrl_usart1: usart1-0 { atmel,pins = - <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, - <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_NONE>; + <AT91_PIOA 11 AT91_PERIPH_A AT91_PINCTRL_NONE>, + <AT91_PIOA 12 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart1_rts: usart1_rts-0 { @@ -742,8 +743,8 @@ usart2 { pinctrl_usart2: usart2-0 { atmel,pins = - <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, - <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_NONE>; + <AT91_PIOA 13 AT91_PERIPH_A AT91_PINCTRL_NONE>, + <AT91_PIOA 14 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart2_rts: usart2_rts-0 { @@ -765,8 +766,8 @@ usart3 { pinctrl_usart3: usart3-0 { atmel,pins = - <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>, - <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_NONE>; + <AT91_PIOB 0 AT91_PERIPH_A AT91_PINCTRL_NONE>, + <AT91_PIOB 1 AT91_PERIPH_A AT91_PINCTRL_PULL_UP>; }; pinctrl_usart3_rts: usart3_rts-0 { |