1 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index 7dda599558cc..263e8f3664b5 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -14,11 +14,11 @@
 / {
        aliases {
-                serial0 = &uart0;
+                serial0 = &uart1;
-                serial1 = &uart1;
+                serial1 = &uart2;
-                serial2 = &uart2;
+                serial2 = &uart3;
-                serial3 = &uart3;
+                serial3 = &uart4;
-                serial4 = &uart4;
+                serial4 = &uart5;
        };
        cpus {
@@ -165,7 +165,7 @@
                                        status = "disabled";
                                };
-                                uart0: uart@02020000 { /* UART1 */
+                                uart1: uart@02020000 {
                                        compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                        reg = <0x02020000 0x4000>;
                                        interrupts = <0 26 0x04>;
@@ -247,7 +247,7 @@
                                interrupts = <0 55 0x04>;
                        };
-                        gpio0: gpio@0209c000 { /* GPIO1 */
+                        gpio1: gpio@0209c000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x0209c000 0x4000>;
                                interrupts = <0 66 0x04 0 67 0x04>;
@@ -257,7 +257,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio1: gpio@020a0000 { /* GPIO2 */
+                        gpio2: gpio@020a0000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020a0000 0x4000>;
                                interrupts = <0 68 0x04 0 69 0x04>;
@@ -267,7 +267,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio2: gpio@020a4000 { /* GPIO3 */
+                        gpio3: gpio@020a4000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020a4000 0x4000>;
                                interrupts = <0 70 0x04 0 71 0x04>;
@@ -277,7 +277,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio3: gpio@020a8000 { /* GPIO4 */
+                        gpio4: gpio@020a8000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020a8000 0x4000>;
                                interrupts = <0 72 0x04 0 73 0x04>;
@@ -287,7 +287,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio4: gpio@020ac000 { /* GPIO5 */
+                        gpio5: gpio@020ac000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020ac000 0x4000>;
                                interrupts = <0 74 0x04 0 75 0x04>;
@@ -297,7 +297,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio5: gpio@020b0000 { /* GPIO6 */
+                        gpio6: gpio@020b0000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020b0000 0x4000>;
                                interrupts = <0 76 0x04 0 77 0x04>;
@@ -307,7 +307,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio6: gpio@020b4000 { /* GPIO7 */
+                        gpio7: gpio@020b4000 {
                                compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
                                reg = <0x020b4000 0x4000>;
                                interrupts = <0 78 0x04 0 79 0x04>;
@@ -543,28 +543,28 @@
                                interrupts = <0 18 0x04>;
                        };
-                        uart1: uart@021e8000 { /* UART2 */
+                        uart2: uart@021e8000 {
                                compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                reg = <0x021e8000 0x4000>;
                                interrupts = <0 27 0x04>;
                                status = "disabled";
                        };
-                        uart2: uart@021ec000 { /* UART3 */
+                        uart3: uart@021ec000 {
                                compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                reg = <0x021ec000 0x4000>;
                                interrupts = <0 28 0x04>;
                                status = "disabled";
                        };
-                        uart3: uart@021f0000 { /* UART4 */
+                        uart4: uart@021f0000 {
                                compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                reg = <0x021f0000 0x4000>;
                                interrupts = <0 29 0x04>;
                                status = "disabled";
                        };
-                        uart4: uart@021f4000 { /* UART5 */
+                        uart5: uart@021f4000 {
                                compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
                                reg = <0x021f4000 0x4000>;
                                interrupts = <0 30 0x04>;

diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi index 7dda599558cc..263e8f3664b5 100644 --- a/arch/arm/boot/dts/imx6q.dtsi +++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -14,11 +14,11 @@
14		14
15	/ {	15	/ {
16	aliases {	16	aliases {
17	serial0 = &uart0;	17	serial0 = &uart1;
18	serial1 = &uart1;	18	serial1 = &uart2;
19	serial2 = &uart2;	19	serial2 = &uart3;
20	serial3 = &uart3;	20	serial3 = &uart4;
21	serial4 = &uart4;	21	serial4 = &uart5;
22	};	22	};
23		23
24	cpus {	24	cpus {
@@ -165,7 +165,7 @@
165	status = "disabled";	165	status = "disabled";
166	};	166	};
167		167
168	uart0: uart@02020000 { /* UART1 */	168	uart1: uart@02020000 {
169	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";	169	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
170	reg = <0x02020000 0x4000>;	170	reg = <0x02020000 0x4000>;
171	interrupts = <0 26 0x04>;	171	interrupts = <0 26 0x04>;
@@ -247,7 +247,7 @@
247	interrupts = <0 55 0x04>;	247	interrupts = <0 55 0x04>;
248	};	248	};
249		249
250	gpio0: gpio@0209c000 { /* GPIO1 */	250	gpio1: gpio@0209c000 {
251	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	251	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
252	reg = <0x0209c000 0x4000>;	252	reg = <0x0209c000 0x4000>;
253	interrupts = <0 66 0x04 0 67 0x04>;	253	interrupts = <0 66 0x04 0 67 0x04>;
@@ -257,7 +257,7 @@
257	#interrupt-cells = <1>;	257	#interrupt-cells = <1>;
258	};	258	};
259		259
260	gpio1: gpio@020a0000 { /* GPIO2 */	260	gpio2: gpio@020a0000 {
261	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	261	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
262	reg = <0x020a0000 0x4000>;	262	reg = <0x020a0000 0x4000>;
263	interrupts = <0 68 0x04 0 69 0x04>;	263	interrupts = <0 68 0x04 0 69 0x04>;
@@ -267,7 +267,7 @@
267	#interrupt-cells = <1>;	267	#interrupt-cells = <1>;
268	};	268	};
269		269
270	gpio2: gpio@020a4000 { /* GPIO3 */	270	gpio3: gpio@020a4000 {
271	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	271	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
272	reg = <0x020a4000 0x4000>;	272	reg = <0x020a4000 0x4000>;
273	interrupts = <0 70 0x04 0 71 0x04>;	273	interrupts = <0 70 0x04 0 71 0x04>;
@@ -277,7 +277,7 @@
277	#interrupt-cells = <1>;	277	#interrupt-cells = <1>;
278	};	278	};
279		279
280	gpio3: gpio@020a8000 { /* GPIO4 */	280	gpio4: gpio@020a8000 {
281	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	281	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
282	reg = <0x020a8000 0x4000>;	282	reg = <0x020a8000 0x4000>;
283	interrupts = <0 72 0x04 0 73 0x04>;	283	interrupts = <0 72 0x04 0 73 0x04>;
@@ -287,7 +287,7 @@
287	#interrupt-cells = <1>;	287	#interrupt-cells = <1>;
288	};	288	};
289		289
290	gpio4: gpio@020ac000 { /* GPIO5 */	290	gpio5: gpio@020ac000 {
291	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	291	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
292	reg = <0x020ac000 0x4000>;	292	reg = <0x020ac000 0x4000>;
293	interrupts = <0 74 0x04 0 75 0x04>;	293	interrupts = <0 74 0x04 0 75 0x04>;
@@ -297,7 +297,7 @@
297	#interrupt-cells = <1>;	297	#interrupt-cells = <1>;
298	};	298	};
299		299
300	gpio5: gpio@020b0000 { /* GPIO6 */	300	gpio6: gpio@020b0000 {
301	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	301	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
302	reg = <0x020b0000 0x4000>;	302	reg = <0x020b0000 0x4000>;
303	interrupts = <0 76 0x04 0 77 0x04>;	303	interrupts = <0 76 0x04 0 77 0x04>;
@@ -307,7 +307,7 @@
307	#interrupt-cells = <1>;	307	#interrupt-cells = <1>;
308	};	308	};
309		309
310	gpio6: gpio@020b4000 { /* GPIO7 */	310	gpio7: gpio@020b4000 {
311	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";	311	compatible = "fsl,imx6q-gpio", "fsl,imx31-gpio";
312	reg = <0x020b4000 0x4000>;	312	reg = <0x020b4000 0x4000>;
313	interrupts = <0 78 0x04 0 79 0x04>;	313	interrupts = <0 78 0x04 0 79 0x04>;
@@ -543,28 +543,28 @@
543	interrupts = <0 18 0x04>;	543	interrupts = <0 18 0x04>;
544	};	544	};
545		545
546	uart1: uart@021e8000 { /* UART2 */	546	uart2: uart@021e8000 {
547	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";	547	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
548	reg = <0x021e8000 0x4000>;	548	reg = <0x021e8000 0x4000>;
549	interrupts = <0 27 0x04>;	549	interrupts = <0 27 0x04>;
550	status = "disabled";	550	status = "disabled";
551	};	551	};
552		552
553	uart2: uart@021ec000 { /* UART3 */	553	uart3: uart@021ec000 {
554	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";	554	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
555	reg = <0x021ec000 0x4000>;	555	reg = <0x021ec000 0x4000>;
556	interrupts = <0 28 0x04>;	556	interrupts = <0 28 0x04>;
557	status = "disabled";	557	status = "disabled";
558	};	558	};
559		559
560	uart3: uart@021f0000 { /* UART4 */	560	uart4: uart@021f0000 {
561	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";	561	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
562	reg = <0x021f0000 0x4000>;	562	reg = <0x021f0000 0x4000>;
563	interrupts = <0 29 0x04>;	563	interrupts = <0 29 0x04>;
564	status = "disabled";	564	status = "disabled";
565	};	565	};
566		566
567	uart4: uart@021f4000 { /* UART5 */	567	uart5: uart@021f4000 {
568	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";	568	compatible = "fsl,imx6q-uart", "fsl,imx21-uart";
569	reg = <0x021f4000 0x4000>;	569	reg = <0x021f4000 0x4000>;
570	interrupts = <0 30 0x04>;	570	interrupts = <0 30 0x04>;