diff options
| author | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-12-09 08:42:50 -0500 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2013-12-09 09:08:57 -0500 |
| commit | ca594844e4a53f778811c06feef60bdf36bc5fec (patch) | |
| tree | 13e7f447aef9cd292efe6c02c88c5d6729b3880b | |
| parent | c8b3cc56b753f0f50cc635726d5e0ecd82625485 (diff) | |
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.dts | 30 |
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 @@ | |||
| 29 | 29 | ||
| 30 | ahb { | 30 | ahb { |
| 31 | apb { | 31 | apb { |
| 32 | dbgu: serial@fffff200 { | 32 | usb1: gadget@fffb0000 { |
| 33 | status = "okay"; | 33 | atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; |
| 34 | }; | 34 | atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>; |
| 35 | |||
| 36 | usart1: serial@fffc4000 { | ||
| 37 | pinctrl-0 = | ||
| 38 | <&pinctrl_uart1 | ||
| 39 | &pinctrl_uart1_rts | ||
| 40 | &pinctrl_uart1_cts | ||
| 41 | &pinctrl_uart1_dtr_dsr | ||
| 42 | &pinctrl_uart1_dcd | ||
| 43 | &pinctrl_uart1_ri>; | ||
| 44 | status = "okay"; | 35 | status = "okay"; |
| 45 | }; | 36 | }; |
| 46 | 37 | ||
| @@ -54,9 +45,14 @@ | |||
| 54 | }; | 45 | }; |
| 55 | }; | 46 | }; |
| 56 | 47 | ||
| 57 | usb1: gadget@fffb0000 { | 48 | usart1: serial@fffc4000 { |
| 58 | atmel,vbus-gpio = <&pioD 4 GPIO_ACTIVE_HIGH>; | 49 | pinctrl-0 = |
| 59 | atmel,pullup-gpio = <&pioD 5 GPIO_ACTIVE_HIGH>; | 50 | <&pinctrl_uart1 |
| 51 | &pinctrl_uart1_rts | ||
| 52 | &pinctrl_uart1_cts | ||
| 53 | &pinctrl_uart1_dtr_dsr | ||
| 54 | &pinctrl_uart1_dcd | ||
| 55 | &pinctrl_uart1_ri>; | ||
| 60 | status = "okay"; | 56 | status = "okay"; |
| 61 | }; | 57 | }; |
| 62 | 58 | ||
| @@ -69,6 +65,10 @@ | |||
| 69 | reg = <0>; | 65 | reg = <0>; |
| 70 | }; | 66 | }; |
| 71 | }; | 67 | }; |
| 68 | |||
| 69 | dbgu: serial@fffff200 { | ||
| 70 | status = "okay"; | ||
| 71 | }; | ||
| 72 | }; | 72 | }; |
| 73 | 73 | ||
| 74 | usb0: ohci@00300000 { | 74 | usb0: ohci@00300000 { |