Merge branch 'work.splice_read' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / arch / arm / boot / dts / omap5-uevm.dts

diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index a51e605..53d31a8 100644 (file)
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -13,9 +13,19 @@
        model = "TI OMAP5 uEVM board";
        compatible = "ti,omap5-uevm", "ti,omap5";
 
-       memory {
+       memory@80000000 {
                device_type = "memory";
-               reg = <0x80000000 0x7F000000>; /* 2032 MB */
+               reg = <0 0x80000000 0 0x7f000000>; /* 2032 MB */
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               led1 {
+                       label = "omap5:blue:usr1";
+                       gpios = <&gpio5 25 GPIO_ACTIVE_HIGH>; /* gpio5_153 D1 LED */
+                       linux,default-trigger = "heartbeat";
+                       default-state = "off";
+               };
        };
 };
 
@@ -61,3 +71,7 @@
                OMAP5_IOPAD(0x1be, PIN_OUTPUT | MUX_MODE6)      /* mcspi1_somi.gpio5_141 */
        >;
 };
+
+&wlcore {
+       compatible = "ti,wl1837";
+};