Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[sfrench/cifs-2.6.git] / arch / arm / boot / dts / at91-ariettag25.dts

diff --git a/arch/arm/boot/dts/at91-ariettag25.dts b/arch/arm/boot/dts/at91-ariettag25.dts
index 7a34c4dc05d24fde72cca6f394f5f040e1c30576..0267e72c074a89819b48ae081771fbe753d8b396 100644 (file)
--- a/arch/arm/boot/dts/at91-ariettag25.dts
+++ b/arch/arm/boot/dts/at91-ariettag25.dts
@@ -6,14 +6,11 @@
  */
 /dts-v1/;
 #include "at91sam9g25.dtsi"
+
 / {
        model = "Acme Systems Arietta G25";
        compatible = "acme,ariettag25", "atmel,at91sam9x5", "atmel,at91sam9";
 
-       aliases {
-               serial0 = &dbgu;
-       };
-
        chosen {
                stdout-path = "serial0:115200n8";
        };
@@ -32,57 +29,9 @@
                };
        };
 
-       ahb {
-               apb {
-                       mmc0: mmc@f0008000 {
-                               pinctrl-0 = <
-                                 &pinctrl_mmc0_slot0_clk_cmd_dat0
-                                 &pinctrl_mmc0_slot0_dat1_3>;
-                               status = "okay";
-
-                               slot@0 {
-                                       reg = <0>;
-                                       bus-width = <4>;
-                               };
-                       };
-
-                       tcb0: timer@f8008000 {
-                               timer@0 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <0>;
-                               };
-
-                               timer@1 {
-                                       compatible = "atmel,tcb-timer";
-                                       reg = <1>;
-                               };
-                       };
-
-                       usb2: gadget@f803c000 {
-                               status = "okay";
-                       };
-
-                       dbgu: serial@fffff200 {
-                               status = "okay";
-                       };
-
-                       rtc@fffffeb0 {
-                               status = "okay";
-                       };
-               };
-
-               usb0: ohci@600000 {
-                       status = "okay";
-                       num-ports = <3>;
-               };
-
-               usb1: ehci@700000 {
-                       status = "okay";
-               };
-       };
-
        leds {
                compatible = "gpio-leds";
+
                arietta_led {
                        label = "arietta_led";
                        gpios = <&pioB 8 GPIO_ACTIVE_HIGH>; /* PB8 */
@@ -90,3 +39,48 @@
                };
        };
 };
+
+&dbgu {
+       status = "okay";
+};
+
+&mmc0 {
+       pinctrl-0 = <
+               &pinctrl_mmc0_slot0_clk_cmd_dat0
+               &pinctrl_mmc0_slot0_dat1_3>;
+       status = "okay";
+
+       slot@0 {
+               reg = <0>;
+               bus-width = <4>;
+       };
+};
+
+&rtc {
+       status = "okay";
+};
+
+&tcb0 {
+       timer@0 {
+               compatible = "atmel,tcb-timer";
+               reg = <0>;
+       };
+
+       timer@1 {
+               compatible = "atmel,tcb-timer";
+               reg = <1>;
+       };
+};
+
+&usb0 {
+       num-ports = <3>;
+       status = "okay";
+};
+
+&usb1 {
+       status = "okay";
+};
+
+&usb2 {
+       status = "okay";
+};