summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Ferre <nicolas.ferre@atmel.com>2013-12-09 14:42:50 +0100
committerNicolas Ferre <nicolas.ferre@atmel.com>2013-12-09 15:08:57 +0100
commitca594844e4a53f778811c06feef60bdf36bc5fec (patch)
tree13e7f447aef9cd292efe6c02c88c5d6729b3880b
parentc8b3cc56b753f0f50cc635726d5e0ecd82625485 (diff)
downloadblackbird-op-linux-ca594844e4a53f778811c06feef60bdf36bc5fec.tar.gz
blackbird-op-linux-ca594844e4a53f778811c06feef60bdf36bc5fec.zip
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>
-rw-r--r--arch/arm/boot/dts/at91rm9200ek.dts30
1 files changed, 15 insertions, 15 deletions
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 {
OpenPOWER on IntegriCloud