1 files changed, 17 insertions, 17 deletions
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 099cd84ee372..5dd91b942c91 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.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;
        };
        tzic: tz-interrupt-controller@0fffc000 {
@@ -88,7 +88,7 @@
                                        status = "disabled";
                                };
-                                uart2: uart@5000c000 { /* UART3 */
+                                uart3: uart@5000c000 {
                                        compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                        reg = <0x5000c000 0x4000>;
                                        interrupts = <33>;
@@ -119,7 +119,7 @@
                                };
                        };
-                        gpio0: gpio@53f84000 { /* GPIO1 */
+                        gpio1: gpio@53f84000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f84000 0x4000>;
                                interrupts = <50 51>;
@@ -129,7 +129,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio1: gpio@53f88000 { /* GPIO2 */
+                        gpio2: gpio@53f88000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f88000 0x4000>;
                                interrupts = <52 53>;
@@ -139,7 +139,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio2: gpio@53f8c000 { /* GPIO3 */
+                        gpio3: gpio@53f8c000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f8c000 0x4000>;
                                interrupts = <54 55>;
@@ -149,7 +149,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio3: gpio@53f90000 { /* GPIO4 */
+                        gpio4: gpio@53f90000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53f90000 0x4000>;
                                interrupts = <56 57>;
@@ -173,21 +173,21 @@
                                status = "disabled";
                        };
-                        uart0: uart@53fbc000 { /* UART1 */
+                        uart1: uart@53fbc000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53fbc000 0x4000>;
                                interrupts = <31>;
                                status = "disabled";
                        };
-                        uart1: uart@53fc0000 { /* UART2 */
+                        uart2: uart@53fc0000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53fc0000 0x4000>;
                                interrupts = <32>;
                                status = "disabled";
                        };
-                        gpio4: gpio@53fdc000 { /* GPIO5 */
+                        gpio5: gpio@53fdc000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fdc000 0x4000>;
                                interrupts = <103 104>;
@@ -197,7 +197,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio5: gpio@53fe0000 { /* GPIO6 */
+                        gpio6: gpio@53fe0000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fe0000 0x4000>;
                                interrupts = <105 106>;
@@ -207,7 +207,7 @@
                                #interrupt-cells = <1>;
                        };
-                        gpio6: gpio@53fe4000 { /* GPIO7 */
+                        gpio7: gpio@53fe4000 {
                                compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
                                reg = <0x53fe4000 0x4000>;
                                interrupts = <107 108>;
@@ -226,7 +226,7 @@
                                status = "disabled";
                        };
-                        uart3: uart@53ff0000 { /* UART4 */
+                        uart4: uart@53ff0000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x53ff0000 0x4000>;
                                interrupts = <13>;
@@ -241,7 +241,7 @@
                        reg = <0x60000000 0x10000000>;
                        ranges;
-                        uart4: uart@63f90000 { /* UART5 */
+                        uart5: uart@63f90000 {
                                compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                reg = <0x63f90000 0x4000>;
                                interrupts = <86>;

diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi index 099cd84ee372..5dd91b942c91 100644 --- a/arch/arm/boot/dts/imx53.dtsi +++ b/arch/arm/boot/dts/imx53.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	tzic: tz-interrupt-controller@0fffc000 {	24	tzic: tz-interrupt-controller@0fffc000 {
@@ -88,7 +88,7 @@
88	status = "disabled";	88	status = "disabled";
89	};	89	};
90		90
91	uart2: uart@5000c000 { /* UART3 */	91	uart3: uart@5000c000 {
92	compatible = "fsl,imx53-uart", "fsl,imx21-uart";	92	compatible = "fsl,imx53-uart", "fsl,imx21-uart";
93	reg = <0x5000c000 0x4000>;	93	reg = <0x5000c000 0x4000>;
94	interrupts = <33>;	94	interrupts = <33>;
@@ -119,7 +119,7 @@
119	};	119	};
120	};	120	};
121		121
122	gpio0: gpio@53f84000 { /* GPIO1 */	122	gpio1: gpio@53f84000 {
123	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	123	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
124	reg = <0x53f84000 0x4000>;	124	reg = <0x53f84000 0x4000>;
125	interrupts = <50 51>;	125	interrupts = <50 51>;
@@ -129,7 +129,7 @@
129	#interrupt-cells = <1>;	129	#interrupt-cells = <1>;
130	};	130	};
131		131
132	gpio1: gpio@53f88000 { /* GPIO2 */	132	gpio2: gpio@53f88000 {
133	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	133	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
134	reg = <0x53f88000 0x4000>;	134	reg = <0x53f88000 0x4000>;
135	interrupts = <52 53>;	135	interrupts = <52 53>;
@@ -139,7 +139,7 @@
139	#interrupt-cells = <1>;	139	#interrupt-cells = <1>;
140	};	140	};
141		141
142	gpio2: gpio@53f8c000 { /* GPIO3 */	142	gpio3: gpio@53f8c000 {
143	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	143	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
144	reg = <0x53f8c000 0x4000>;	144	reg = <0x53f8c000 0x4000>;
145	interrupts = <54 55>;	145	interrupts = <54 55>;
@@ -149,7 +149,7 @@
149	#interrupt-cells = <1>;	149	#interrupt-cells = <1>;
150	};	150	};
151		151
152	gpio3: gpio@53f90000 { /* GPIO4 */	152	gpio4: gpio@53f90000 {
153	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	153	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
154	reg = <0x53f90000 0x4000>;	154	reg = <0x53f90000 0x4000>;
155	interrupts = <56 57>;	155	interrupts = <56 57>;
@@ -173,21 +173,21 @@
173	status = "disabled";	173	status = "disabled";
174	};	174	};
175		175
176	uart0: uart@53fbc000 { /* UART1 */	176	uart1: uart@53fbc000 {
177	compatible = "fsl,imx53-uart", "fsl,imx21-uart";	177	compatible = "fsl,imx53-uart", "fsl,imx21-uart";
178	reg = <0x53fbc000 0x4000>;	178	reg = <0x53fbc000 0x4000>;
179	interrupts = <31>;	179	interrupts = <31>;
180	status = "disabled";	180	status = "disabled";
181	};	181	};
182		182
183	uart1: uart@53fc0000 { /* UART2 */	183	uart2: uart@53fc0000 {
184	compatible = "fsl,imx53-uart", "fsl,imx21-uart";	184	compatible = "fsl,imx53-uart", "fsl,imx21-uart";
185	reg = <0x53fc0000 0x4000>;	185	reg = <0x53fc0000 0x4000>;
186	interrupts = <32>;	186	interrupts = <32>;
187	status = "disabled";	187	status = "disabled";
188	};	188	};
189		189
190	gpio4: gpio@53fdc000 { /* GPIO5 */	190	gpio5: gpio@53fdc000 {
191	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	191	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
192	reg = <0x53fdc000 0x4000>;	192	reg = <0x53fdc000 0x4000>;
193	interrupts = <103 104>;	193	interrupts = <103 104>;
@@ -197,7 +197,7 @@
197	#interrupt-cells = <1>;	197	#interrupt-cells = <1>;
198	};	198	};
199		199
200	gpio5: gpio@53fe0000 { /* GPIO6 */	200	gpio6: gpio@53fe0000 {
201	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	201	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
202	reg = <0x53fe0000 0x4000>;	202	reg = <0x53fe0000 0x4000>;
203	interrupts = <105 106>;	203	interrupts = <105 106>;
@@ -207,7 +207,7 @@
207	#interrupt-cells = <1>;	207	#interrupt-cells = <1>;
208	};	208	};
209		209
210	gpio6: gpio@53fe4000 { /* GPIO7 */	210	gpio7: gpio@53fe4000 {
211	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";	211	compatible = "fsl,imx53-gpio", "fsl,imx31-gpio";
212	reg = <0x53fe4000 0x4000>;	212	reg = <0x53fe4000 0x4000>;
213	interrupts = <107 108>;	213	interrupts = <107 108>;
@@ -226,7 +226,7 @@
226	status = "disabled";	226	status = "disabled";
227	};	227	};
228		228
229	uart3: uart@53ff0000 { /* UART4 */	229	uart4: uart@53ff0000 {
230	compatible = "fsl,imx53-uart", "fsl,imx21-uart";	230	compatible = "fsl,imx53-uart", "fsl,imx21-uart";
231	reg = <0x53ff0000 0x4000>;	231	reg = <0x53ff0000 0x4000>;
232	interrupts = <13>;	232	interrupts = <13>;
@@ -241,7 +241,7 @@
241	reg = <0x60000000 0x10000000>;	241	reg = <0x60000000 0x10000000>;
242	ranges;	242	ranges;
243		243
244	uart4: uart@63f90000 { /* UART5 */	244	uart5: uart@63f90000 {
245	compatible = "fsl,imx53-uart", "fsl,imx21-uart";	245	compatible = "fsl,imx53-uart", "fsl,imx21-uart";
246	reg = <0x63f90000 0x4000>;	246	reg = <0x63f90000 0x4000>;
247	interrupts = <86>;	247	interrupts = <86>;