diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 10:48:33 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-21 10:48:33 +0100 |
| commit | 17d6b293e72547f75f5d9b680b75459cb8f2c9cf (patch) | |
| tree | 54e794b046e0c7c1f819d49e9ff4499f9b6f19e5 /arch/arm/boot/dts/at91sam9g20ek_common.dtsi | |
| parent | e59d969f441fb8e25b30125bdf201153adc5a7e3 (diff) | |
| parent | ad8a15d99cf2c8ab8ac1ab28402c49ec2548358d (diff) | |
| download | blackbird-op-linux-17d6b293e72547f75f5d9b680b75459cb8f2c9cf.tar.gz blackbird-op-linux-17d6b293e72547f75f5d9b680b75459cb8f2c9cf.zip | |
Merge branch 'delivery/pinctrl-at91-3.8' of http://github.com/at91linux/linux-at91 into at91
Diffstat (limited to 'arch/arm/boot/dts/at91sam9g20ek_common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/at91sam9g20ek_common.dtsi | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi index 689323d8e64c..63a0e5ddd0a1 100644 --- a/arch/arm/boot/dts/at91sam9g20ek_common.dtsi +++ b/arch/arm/boot/dts/at91sam9g20ek_common.dtsi @@ -36,11 +36,12 @@ usart0: serial@fffb0000 { pinctrl-0 = - <&pinctrl_uart0 - &pinctrl_uart0_rts_cts - &pinctrl_uart0_dtr_dsr - &pinctrl_uart0_dcd - &pinctrl_uart0_ri>; + <&pinctrl_usart0 + &pinctrl_usart0_rts + &pinctrl_usart0_cts + &pinctrl_usart0_dtr_dsr + &pinctrl_usart0_dcd + &pinctrl_usart0_ri>; status = "okay"; }; |
