From: Nicolas Ferre <nicolas.ferre@atmel.com>
Date: Mon, 9 Dec 2013 13:42:50 +0000 (+0100)
Subject: ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
X-Git-Tag: firefly_0821_release~176^2~4512^2~19^2~5
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ca594844e4a53f778811c06feef60bdf36bc5fec;p=firefly-linux-kernel-4.4.55.git
ARM: at91/at91rm9200ek.dts: rearrange nodes in address ascending order
Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Boris BREZILLON <b.brezillon@overkiz.com>
---
diff --git a/arch/arm/boot/dts/at91rm9200ek.dts b/arch/arm/boot/dts/at91rm9200ek.dts
index 31f5c3293d07..df6b0aa0e4dd 100644
--- a/arch/arm/boot/dts/at91rm9200ek.dts
+++ b/arch/arm/boot/dts/at91rm9200ek.dts
@@ -29,18 +29,9 @@
ahb {
apb {
- dbgu: serial@fffff200 {
- status = "okay";
- };
-
- usart1: serial@fffc4000 {
- pinctrl-0 =
- <&pinctrl_uart1
- &pinctrl_uart1_rts
- &pinctrl_uart1_cts
- &pinctrl_uart1_dtr_dsr
- &pinctrl_uart1_dcd
- &pinctrl_uart1_ri>;
+ usb1: gadget@fffb0000 {
+ atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
+ atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>;
status = "okay";
};
@@ -54,9 +45,14 @@
};
};
- usb1: gadget@fffb0000 {
- atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>;
- atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>;
+ usart1: serial@fffc4000 {
+ pinctrl-0 =
+ <&pinctrl_uart1
+ &pinctrl_uart1_rts
+ &pinctrl_uart1_cts
+ &pinctrl_uart1_dtr_dsr
+ &pinctrl_uart1_dcd
+ &pinctrl_uart1_ri>;
status = "okay";
};
@@ -69,6 +65,10 @@
reg = <0>;
};
};
+
+ dbgu: serial@fffff200 {
+ status = "okay";
+ };
};
usb0: ohci@00300000 {