ARM: at91: fix usart/uart namimg in pinctrl
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 18 Nov 2012 22:40:01 +0000 (06:40 +0800)
committerJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Sun, 18 Nov 2012 22:54:31 +0000 (06:54 +0800)
USART are the full pin uart
DBGU the debug Unit
UART the two pin uart

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
arch/arm/boot/dts/at91sam9260.dtsi
arch/arm/boot/dts/at91sam9263.dtsi
arch/arm/boot/dts/at91sam9263ek.dts
arch/arm/boot/dts/at91sam9g20ek_common.dtsi
arch/arm/boot/dts/at91sam9g45.dtsi
arch/arm/boot/dts/at91sam9m10g45ek.dts
arch/arm/boot/dts/at91sam9n12.dtsi
arch/arm/boot/dts/at91sam9x5.dtsi

index 36f55e3..40bf329 100644 (file)
@@ -21,8 +21,8 @@
                serial2 = &usart1;
                serial3 = &usart2;
                serial4 = &usart3;
-               serial5 = &usart4;
-               serial6 = &usart5;
+               serial5 = &uart0;
+               serial6 = &uart1;
                gpio0 = &pioA;
                gpio1 = &pioB;
                gpio2 = &pioC;
                                        };
                                };
 
-                               uart0 {
-                                       pinctrl_uart0: uart0-0 {
+                               usart0 {
+                                       pinctrl_usart0: usart0-0 {
                                                atmel,pins =
                                                        <1 4 0x1 0x0    /* PB4 periph A */
                                                         1 5 0x1 0x0>;  /* PB5 periph A */
                                        };
 
-                                       pinctrl_uart0_rts_cts: uart0_rts_cts-0 {
+                                       pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
                                                        <1 26 0x1 0x0   /* PB26 periph A */
                                                         1 27 0x1 0x0>; /* PB27 periph A */
                                        };
 
-                                       pinctrl_uart0_dtr_dsr: uart0_dtr_dsr-0 {
+                                       pinctrl_usart0_dtr_dsr: usart0_dtr_dsr-0 {
                                                atmel,pins =
                                                        <1 24 0x1 0x0   /* PB24 periph A */
                                                         1 22 0x1 0x0>; /* PB22 periph A */
                                        };
 
-                                       pinctrl_uart0_dcd: uart0_dcd-0 {
+                                       pinctrl_usart0_dcd: usart0_dcd-0 {
                                                atmel,pins =
                                                        <1 23 0x1 0x0>; /* PB23 periph A */
                                        };
 
-                                       pinctrl_uart0_ri: uart0_ri-0 {
+                                       pinctrl_usart0_ri: usart0_ri-0 {
                                                atmel,pins =
                                                        <1 25 0x1 0x0>; /* PB25 periph A */
                                        };
                                };
 
-                               uart1 {
-                                       pinctrl_uart1: uart1-0 {
+                               usart1 {
+                                       pinctrl_usart1: usart1-0 {
                                                atmel,pins =
                                                        <2 6 0x1 0x1    /* PB6 periph A with pullup */
                                                         2 7 0x1 0x0>;  /* PB7 periph A */
                                        };
 
-                                       pinctrl_uart1_rts_cts: uart1_rts_cts-0 {
+                                       pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
                                                atmel,pins =
                                                        <1 28 0x1 0x0   /* PB28 periph A */
                                                         1 29 0x1 0x0>; /* PB29 periph A */
                                        };
                                };
 
-                               uart2 {
-                                       pinctrl_uart2: uart2-0 {
+                               usart2 {
+                                       pinctrl_usart2: usart2-0 {
                                                atmel,pins =
                                                        <1 8 0x1 0x1    /* PB8 periph A with pullup */
                                                         1 9 0x1 0x0>;  /* PB9 periph A */
                                        };
 
-                                       pinctrl_uart2_rts_cts: uart2_rts_cts-0 {
+                                       pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
                                                atmel,pins =
                                                        <0 4 0x1 0x0    /* PA4 periph A */
                                                         0 5 0x1 0x0>;  /* PA5 periph A */
                                        };
                                };
 
-                               uart3 {
-                                       pinctrl_uart3: uart3-0 {
+                               usart3 {
+                                       pinctrl_usart3: usart3-0 {
                                                atmel,pins =
                                                        <2 10 0x1 0x1   /* PB10 periph A with pullup */
                                                         2 11 0x1 0x0>; /* PB11 periph A */
                                        };
 
-                                       pinctrl_uart3_rts_cts: uart3_rts_cts-0 {
+                                       pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
                                                atmel,pins =
                                                        <3 8 0x2 0x0    /* PB8 periph B */
                                                         3 10 0x2 0x0>; /* PB10 periph B */
                                        };
                                };
 
-                               uart4 {
-                                       pinctrl_uart4: uart4-0 {
+                               uart0 {
+                                       pinctrl_uart0: uart0-0 {
                                                atmel,pins =
                                                        <0 31 0x2 0x1   /* PA31 periph B with pullup */
                                                         0 30 0x2 0x0>; /* PA30 periph B */
                                        };
                                };
 
-                               uart5 {
-                                       pinctrl_uart5: uart5-0 {
+                               uart1 {
+                                       pinctrl_uart1: uart1-0 {
                                                atmel,pins =
                                                        <2 12 0x1 0x1   /* PB12 periph A with pullup */
                                                         2 13 0x1 0x0>; /* PB13 periph A */
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
+                               pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart1>;
+                               pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart2>;
+                               pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart3>;
+                               pinctrl-0 = <&pinctrl_usart3>;
                                status = "disabled";
                        };
 
-                       usart4: serial@fffd4000 {
+                       uart0: serial@fffd4000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffd4000 0x200>;
                                interrupts = <24 4 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart4>;
+                               pinctrl-0 = <&pinctrl_uart0>;
                                status = "disabled";
                        };
 
-                       usart5: serial@fffd8000 {
+                       uart1: serial@fffd8000 {
                                compatible = "atmel,at91sam9260-usart";
                                reg = <0xfffd8000 0x200>;
                                interrupts = <25 4 5>;
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart5>;
+                               pinctrl-0 = <&pinctrl_uart1>;
                                status = "disabled";
                        };
 
index 148b89a..cf4b59f 100644 (file)
                                        };
                                };
 
-                               uart0 {
-                                       pinctrl_uart0: uart0-0 {
+                               usart0 {
+                                       pinctrl_usart0: usart0-0 {
                                                atmel,pins =
                                                        <0 26 0x1 0x1   /* PA26 periph A with pullup */
                                                         0 27 0x1 0x0>; /* PA27 periph A */
                                        };
 
-                                       pinctrl_uart0_rts_cts: uart0_rts_cts-0 {
+                                       pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
                                                        <0 28 0x1 0x0   /* PA28 periph A */
                                                         0 29 0x1 0x0>; /* PA29 periph A */
                                        };
                                };
 
-                               uart1 {
-                                       pinctrl_uart1: uart1-0 {
+                               usart1 {
+                                       pinctrl_usart1: usart1-0 {
                                                atmel,pins =
                                                        <3 0 0x1 0x1    /* PD0 periph A with pullup */
                                                         3 1 0x1 0x0>;  /* PD1 periph A */
                                        };
 
-                                       pinctrl_uart1_rts_cts: uart1_rts_cts-0 {
+                                       pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
                                                atmel,pins =
                                                        <3 7 0x2 0x0    /* PD7 periph B */
                                                         3 8 0x2 0x0>;  /* PD8 periph B */
                                        };
                                };
 
-                               uart2 {
-                                       pinctrl_uart2: uart2-0 {
+                               usart2 {
+                                       pinctrl_usart2: usart2-0 {
                                                atmel,pins =
                                                        <3 2 0x1 0x1    /* PD2 periph A with pullup */
                                                         3 3 0x1 0x0>;  /* PD3 periph A */
                                        };
 
-                                       pinctrl_uart2_rts_cts: uart2_rts_cts-0 {
+                                       pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
                                                atmel,pins =
                                                        <3 5 0x2 0x0    /* PD5 periph B */
                                                         4 6 0x2 0x0>;  /* PD6 periph B */
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
+                               pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart1>;
+                               pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart2>;
+                               pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        };
 
index 7cfe9d5..3434373 100644 (file)
@@ -38,7 +38,7 @@
                        };
 
                        usart0: serial@fff8c000 {
-                               pinctrl-0 = <&pinctrl_uart0 &pinctrl_uart0_rts_cts>;
+                               pinctrl-0 = <&pinctrl_usart0 &pinctrl_usart0_rts_cts>;
                                status = "okay";
                        };
 
index e33ab0a..04f048f 100644 (file)
 
                        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_cts
+                                        &pinctrl_usart0_dtr_dsr
+                                        &pinctrl_usart0_dcd
+                                        &pinctrl_usart0_ri>;
                                status = "okay";
                        };
 
index 0ad84b6..56ce896 100644 (file)
                                        };
                                };
 
-                               uart0 {
-                                       pinctrl_uart0: uart0-0 {
+                               usart0 {
+                                       pinctrl_usart0: usart0-0 {
                                                atmel,pins =
                                                        <1 19 0x1 0x1   /* PB19 periph A with pullup */
                                                         1 18 0x1 0x0>; /* PB18 periph A */
                                        };
 
-                                       pinctrl_uart0_rts_cts: uart0_rts_cts-0 {
+                                       pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
                                                        <1 17 0x2 0x0   /* PB17 periph B */
                                                         1 15 0x2 0x0>; /* PB15 periph B */
                                };
 
                                uart1 {
-                                       pinctrl_uart1: uart1-0 {
+                                       pinctrl_usart1: usart1-0 {
                                                atmel,pins =
                                                        <1 4 0x1 0x1    /* PB4 periph A with pullup */
                                                         1 5 0x1 0x0>;  /* PB5 periph A */
                                        };
 
-                                       pinctrl_uart1_rts_cts: uart1_rts_cts-0 {
+                                       pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
                                                atmel,pins =
                                                        <3 16 0x1 0x0   /* PD16 periph A */
                                                         3 17 0x1 0x0>; /* PD17 periph A */
                                        };
                                };
 
-                               uart2 {
-                                       pinctrl_uart2: uart2-0 {
+                               usart2 {
+                                       pinctrl_usart2: usart2-0 {
                                                atmel,pins =
                                                        <1 6 0x1 0x1    /* PB6 periph A with pullup */
                                                         1 7 0x1 0x0>;  /* PB7 periph A */
                                        };
 
-                                       pinctrl_uart2_rts_cts: uart2_rts_cts-0 {
+                                       pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
                                                atmel,pins =
                                                        <2 9 0x2 0x0    /* PC9 periph B */
                                                         2 11 0x2 0x0>; /* PC11 periph B */
                                        };
                                };
 
-                               uart3 {
-                                       pinctrl_uart3: uart3-0 {
+                               usart3 {
+                                       pinctrl_usart3: usart3-0 {
                                                atmel,pins =
                                                        <1 8 0x1 0x1    /* PB9 periph A with pullup */
                                                         1 9 0x1 0x0>;  /* PB8 periph A */
                                        };
 
-                                       pinctrl_uart3_rts_cts: uart3_rts_cts-0 {
+                                       pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
                                                atmel,pins =
                                                        <0 23 0x2 0x0   /* PA23 periph B */
                                                         0 24 0x2 0x0>; /* PA24 periph B */
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
+                               pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart1>;
+                               pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart2>;
+                               pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart3>;
+                               pinctrl-0 = <&pinctrl_usart3>;
                                status = "disabled";
                        };
 
index 6aa28b9..0d9674b 100644 (file)
@@ -39,7 +39,7 @@
                        };
 
                        usart1: serial@fff90000 {
-                               pinctrl-0 = <&pinctrl_uart0 &pinctrl_uart1_rts_cts>;
+                               pinctrl-0 = <&pinctrl_usart1 &pinctrl_usart1_rts_cts>;
                                status = "okay";
                        };
 
index 7b644c5..10547bc 100644 (file)
                                        };
                                };
 
-                               uart0 {
-                                       pinctrl_uart0: uart0-0 {
+                               usart0 {
+                                       pinctrl_usart0: usart0-0 {
                                                atmel,pins =
                                                        <0 1 0x1 0x1    /* PA1 periph A with pullup */
                                                         0 0 0x1 0x0>;  /* PA0 periph A */
                                        };
 
-                                       pinctrl_uart0_rts_cts: uart0_rts_cts-0 {
+                                       pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
                                                        <0 2 0x1 0x0    /* PA2 periph A */
                                                         0 3 0x1 0x0>;  /* PA3 periph A */
                                        };
                                };
 
-                               uart1 {
-                                       pinctrl_uart1: uart1-0 {
+                               usart1 {
+                                       pinctrl_usart1: usart1-0 {
                                                atmel,pins =
                                                        <0 6 0x1 0x1    /* PA6 periph A with pullup */
                                                         0 5 0x1 0x0>;  /* PA5 periph A */
                                        };
                                };
 
-                               uart2 {
-                                       pinctrl_uart2: uart2-0 {
+                               usart2 {
+                                       pinctrl_usart2: usart2-0 {
                                                atmel,pins =
                                                        <0 8 0x1 0x1    /* PA8 periph A with pullup */
                                                         0 7 0x1 0x0>;  /* PA7 periph A */
                                        };
 
-                                       pinctrl_uart2_rts_cts: uart2_rts_cts-0 {
+                                       pinctrl_usart2_rts_cts: usart2_rts_cts-0 {
                                                atmel,pins =
                                                        <1 0 0x2 0x0    /* PB0 periph B */
                                                         1 1 0x2 0x0>;  /* PB1 periph B */
                                        };
                                };
 
-                               uart3 {
-                                       pinctrl_uart3: uart3-0 {
+                               usart3 {
+                                       pinctrl_usart3: usart3-0 {
                                                atmel,pins =
                                                        <2 23 0x2 0x1   /* PC23 periph B with pullup */
                                                         2 22 0x2 0x0>; /* PC22 periph B */
                                        };
 
-                                       pinctrl_uart3_rts_cts: uart3_rts_cts-0 {
+                                       pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
                                                atmel,pins =
                                                        <2 24 0x2 0x0   /* PC24 periph B */
                                                         2 25 0x2 0x0>; /* PC25 periph B */
                                        };
                                };
 
-                               usart0 {
-                                       pinctrl_usart0: usart0-0 {
+                               uart0 {
+                                       pinctrl_uart0: uart0-0 {
                                                atmel,pins =
                                                        <2 9 0x3 0x1    /* PC9 periph C with pullup */
                                                         2 8 0x3 0x0>;  /* PC8 periph C */
                                        };
                                };
 
-                               usart1 {
-                                       pinctrl_usart1: usart1-0 {
+                               uart1 {
+                                       pinctrl_uart1: uart1-0 {
                                                atmel,pins =
                                                        <2 16 0x3 0x1   /* PC17 periph C with pullup */
                                                         2 17 0x3 0x0>; /* PC16 periph C */
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
+                               pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart1>;
+                               pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart2>;
+                               pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart3>;
+                               pinctrl-0 = <&pinctrl_usart3>;
                                status = "disabled";
                        };
 
index 9fd7159..9dac006 100644 (file)
                                        };
                                };
 
-                               uart0 {
-                                       pinctrl_uart0: uart0-0 {
+                               usart0 {
+                                       pinctrl_usart0: usart0-0 {
                                                atmel,pins =
                                                        <0 0 0x1 0x1    /* PA0 periph A with pullup */
                                                         0 1 0x1 0x0>;  /* PA1 periph A */
                                        };
 
-                                       pinctrl_uart0_rts_cts: uart0_rts_cts-0 {
+                                       pinctrl_usart0_rts_cts: usart0_rts_cts-0 {
                                                atmel,pins =
                                                        <0 2 0x1 0x0    /* PA2 periph A */
                                                         0 3 0x1 0x0>;  /* PA3 periph A */
                                        };
                                };
 
-                               uart1 {
-                                       pinctrl_uart1: uart1-0 {
+                               usart1 {
+                                       pinctrl_usart1: usart1-0 {
                                                atmel,pins =
                                                        <0 5 0x1 0x1    /* PA5 periph A with pullup */
                                                         0 6 0x1 0x0>;  /* PA6 periph A */
                                        };
 
-                                       pinctrl_uart1_rts_cts: uart1_rts_cts-0 {
+                                       pinctrl_usart1_rts_cts: usart1_rts_cts-0 {
                                                atmel,pins =
                                                        <3 27 0x3 0x0   /* PC27 periph C */
                                                         3 28 0x3 0x0>; /* PC28 periph C */
                                        };
                                };
 
-                               uart2 {
-                                       pinctrl_uart2: uart2-0 {
+                               usart2 {
+                                       pinctrl_usart2: usart2-0 {
                                                atmel,pins =
                                                        <0 7 0x1 0x1    /* PA7 periph A with pullup */
                                                         0 8 0x1 0x0>;  /* PA8 periph A */
                                        };
                                };
 
-                               uart3 {
-                                       pinctrl_uart3: uart3-0 {
+                               usart3 {
+                                       pinctrl_uart3: usart3-0 {
                                                atmel,pins =
                                                        <3 23 0x2 0x1   /* PC22 periph B with pullup */
                                                         3 23 0x2 0x0>; /* PC23 periph B */
                                        };
 
-                                       pinctrl_uart3_rts_cts: uart3_rts_cts-0 {
+                                       pinctrl_usart3_rts_cts: usart3_rts_cts-0 {
                                                atmel,pins =
                                                        <3 24 0x2 0x0   /* PC24 periph B */
                                                         3 25 0x2 0x0>; /* PC25 periph B */
                                        };
                                };
 
-                               usart0 {
-                                       pinctrl_usart0: usart0-0 {
+                               uart0 {
+                                       pinctrl_uart0: uart0-0 {
                                                atmel,pins =
                                                        <3 8 0x3 0x0    /* PC8 periph C */
                                                         3 9 0x3 0x1>;  /* PC9 periph C with pullup */
                                        };
                                };
 
-                               usart1 {
-                                       pinctrl_usart1: usart1-0 {
+                               uart1 {
+                                       pinctrl_uart1: uart1-0 {
                                                atmel,pins =
                                                        <3 16 0x3 0x0   /* PC16 periph C */
                                                         3 17 0x3 0x1>; /* PC17 periph C with pullup */
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart0>;
+                               pinctrl-0 = <&pinctrl_usart0>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart1>;
+                               pinctrl-0 = <&pinctrl_usart1>;
                                status = "disabled";
                        };
 
                                atmel,use-dma-rx;
                                atmel,use-dma-tx;
                                pinctrl-names = "default";
-                               pinctrl-0 = <&pinctrl_uart2>;
+                               pinctrl-0 = <&pinctrl_usart2>;
                                status = "disabled";
                        };