Merge tag 'fbdev-v4.13-rc5' of git://github.com/bzolnier/linux

[karo-tx-linux.git] / arch / arm / boot / dts / omap3-beagle-xm.dts

diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index 8ffde06281ad097aa113bf804c57ed6735651ab1..673cee2234b2979f4102236b3296b13fb9aed244 100644 (file)
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -19,7 +19,7 @@
                };
        };
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
                reg = <0x80000000 0x20000000>; /* 512 MB */
        };
@@ -27,6 +27,7 @@
        aliases {
                display0 = &dvi0;
                display1 = &tv0;
+               ethernet = &ethernet;
        };
 
        leds {
@@ -348,6 +349,21 @@
 
 &usbhsehci {
        phys = <0 &hsusb2_phy>;
+
+       #address-cells = <1>;
+       #size-cells = <0>;
+
+       hub@2 {
+               compatible = "usb424,9514";
+               reg = <2>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               ethernet: usbether@1 {
+                       compatible = "usb424,ec00";
+                       reg = <1>;
+               };
+       };
 };
 
 &vaux2 {