diff options
| author | Olof Johansson <olof@lixom.net> | 2013-01-30 12:37:10 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-30 12:37:10 -0500 |
| commit | 825bf91edc0666bcc5d80c29742871fa818a5f84 (patch) | |
| tree | acdb1a57998a73ba7d533d69dc981fae7e5f3df4 /arch/arm/boot | |
| parent | 89e19ffac19498c7de295876fecfd4c8c931bab1 (diff) | |
| parent | 7d4cfece23f535b60496d88a717a3d7bfca50187 (diff) | |
Merge tag 'at91-fixes' of git://github.com/at91linux/linux-at91 into fixes
From Nicolas Ferre:
Two little Device Tree fixes for USART on at91sam9x5.
* tag 'at91-fixes' of git://github.com/at91linux/linux-at91:
ARM: at91/at91sam9x5.dtsi: fix usart3 TXD
ARM: at91: at91sam9x5: fix usart3 pinctrl name
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9x5.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi index 8ecca6948d81..0c6009080b88 100644 --- a/arch/arm/boot/dts/at91sam9x5.dtsi +++ b/arch/arm/boot/dts/at91sam9x5.dtsi | |||
| @@ -197,9 +197,9 @@ | |||
| 197 | }; | 197 | }; |
| 198 | 198 | ||
| 199 | usart3 { | 199 | usart3 { |
| 200 | pinctrl_uart3: usart3-0 { | 200 | pinctrl_usart3: usart3-0 { |
| 201 | atmel,pins = | 201 | atmel,pins = |
| 202 | <2 23 0x2 0x1 /* PC22 periph B with pullup */ | 202 | <2 22 0x2 0x1 /* PC22 periph B with pullup */ |
| 203 | 2 23 0x2 0x0>; /* PC23 periph B */ | 203 | 2 23 0x2 0x0>; /* PC23 periph B */ |
| 204 | }; | 204 | }; |
| 205 | 205 | ||