summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/tegra20-plutux.dts
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-12-13 01:10:45 +0100
committerOlof Johansson <olof@lixom.net>2012-12-13 01:10:45 +0100
commit9c7466b217af784280d9fc841bbd559ef3bf33e9 (patch)
treec21ee243e48912201b4041fbf3f9bd9165603bd8 /arch/arm/boot/dts/tegra20-plutux.dts
parentARM: arm-soc: Merge branch 'next/clk' into next/pm (diff)
parentMerge tag 'tags/omap-for-v3.8/cleanup-multiplatform-no-clock-signed' of git:/... (diff)
downloadlinux-9c7466b217af784280d9fc841bbd559ef3bf33e9.tar.xz
linux-9c7466b217af784280d9fc841bbd559ef3bf33e9.zip
ARM: arm-soc: Merge branch 'next/pm2' into next/pm
Another smaller branch merged into next/pm before pull request. Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/tegra20-plutux.dts')
-rw-r--r--arch/arm/boot/dts/tegra20-plutux.dts6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/tegra20-plutux.dts b/arch/arm/boot/dts/tegra20-plutux.dts
index 331a3ef24d59..289480026fbf 100644
--- a/arch/arm/boot/dts/tegra20-plutux.dts
+++ b/arch/arm/boot/dts/tegra20-plutux.dts
@@ -6,6 +6,12 @@
model = "Avionic Design Plutux board";
compatible = "ad,plutux", "ad,tamonten", "nvidia,tegra20";
+ host1x {
+ hdmi {
+ status = "okay";
+ };
+ };
+
i2c@7000c000 {
wm8903: wm8903@1a {
compatible = "wlf,wm8903";