summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/omap5-uevm.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2016-09-19 17:40:13 +0200
committerArnd Bergmann <arnd@arndb.de>2016-09-19 17:40:13 +0200
commit71e84db1aab65ba71cb6d6d26b0f1e0d2eacc65b (patch)
tree1a6245bdac94571377339b87249f68bffa2b99bc /arch/arm/boot/dts/omap5-uevm.dts
parent590b9066185aebfd280bb94b033cf1ed44ac467e (diff)
parenta2a2b8215621536a7620e31f36bede81bb86680b (diff)
Merge tag 'omap-for-v4.9/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
Pull "omap dts updates for v4.9 merge window, part 2" from Tony Lindgren: Part two of device tree changes for omaps for v4.9 merge window. This is mostly usability and non-critical fixes except for the addition of beagleboard-x15 rev B1 support: - Fix omap4 pandaboard SDIO WLAN latencies in idle mode by enabling wakeirq - Usability fixes for WLAN, USB, LEDs and power button on omap5 boards - Remove am57xx beagleboard-x15 pinmux configuration as the processor requires that it's done in IO isolation in bootloader except for MMC and DCAN - Add support for beagleboard-x15 rev B1 by moving most of the configuration to am57xx-beagle-x15-common.dtsi - Enable support for more than 2GB of memory for omap5 with LPAE with #address-cells - Fix omap3-gta04 backlight PWM frequency until the PWM driver - Revert am335x dts changes related to cpufreq as the driver changes still have not merged and the dts changes broke cpufreq * tag 'omap-for-v4.9/dt-pt2-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: Revert "ARM: dts: dra7: Move to operating-points-v2 table" Revert "ARM: dts: am33xx: Move to operating-points-v2 table and ti-cpufreq driver" Revert "ARM: dts: am335x-boneblack: Enable 1GHz OPP for cpu" ARM: dts: omap3-gta04: reduce panel backlight PWM frequency to 83Hz ARM: dts: Add support for more than 2GB of memory for omap5 ARM: dts: am57xx-beagle-x15: Add support for rev B1 ARM: dts: am57xx-beagle-x15: Remove pinmux configurations for erratum i869 ARM: dts: Fix LEDs for igepv5 ARM: dts: Add power button support for igepv5 ARM: dts: Configure omap5 OTG ID pin ARM: dts: ARM: dts: Fix omap5 SDIO dat1 interrupt ARM: dts: Configure panda SDIO WLAN wakeirq
Diffstat (limited to 'arch/arm/boot/dts/omap5-uevm.dts')
-rw-r--r--arch/arm/boot/dts/omap5-uevm.dts16
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap5-uevm.dts b/arch/arm/boot/dts/omap5-uevm.dts
index 5230ca00913a..53d31a87b44b 100644
--- a/arch/arm/boot/dts/omap5-uevm.dts
+++ b/arch/arm/boot/dts/omap5-uevm.dts
@@ -15,7 +15,17 @@
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";
+};