Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[karo-tx-linux.git] / arch / arm / boot / dts / at91sam9x5.dtsi

diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 8c8907757bf32f385f4a46fa63ef14426b3f6efa..aa98e641931fa21ed76c627229da576289005d12 100644 (file)
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -197,9 +197,9 @@
                                };
 
                                usart3 {
-                                       pinctrl_uart3: usart3-0 {
+                                       pinctrl_usart3: usart3-0 {
                                                atmel,pins =
-                                                       <2 23 0x2 0x1   /* PC22 periph B with pullup */
+                                                       <2 22 0x2 0x1   /* PC22 periph B with pullup */
                                                         2 23 0x2 0x0>; /* PC23 periph B */
                                        };
 
@@ -402,8 +402,6 @@
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf801c000 0x200>;
                                interrupts = <5 4 5>;
-                               atmel,use-dma-rx;
-                               atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
@@ -413,8 +411,6 @@
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8020000 0x200>;
                                interrupts = <6 4 5>;
-                               atmel,use-dma-rx;
-                               atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
@@ -424,8 +420,6 @@
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xf8024000 0x200>;
                                interrupts = <7 4 5>;
-                               atmel,use-dma-rx;
-                               atmel,use-dma-tx;
                                pinctrl-names = "default";
                                pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";