aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-03-04 11:11:03 -0600
committerPraneeth Bajjuri2016-03-04 11:11:03 -0600
commit2dba68e631a575e29776861eb09e822bee7c22f1 (patch)
tree007fd5fc83c9ba6c6cee68a0ba4dcf011aa8f1e7
parent33b4a47801814cd855087dea29e917495d8d0455 (diff)
parentd8d0e6c2bb7e3d14367e06933a69aaf4f0ba6827 (diff)
downloadkernel-video-2dba68e631a575e29776861eb09e822bee7c22f1.tar.gz
kernel-video-2dba68e631a575e29776861eb09e822bee7c22f1.tar.xz
kernel-video-2dba68e631a575e29776861eb09e822bee7c22f1.zip
Merge remote-tracking branch 'origin/p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
* origin/p-ti-linux-3.14.y-common: ARM: dts: dra72-evm-lcd-osd: disable ldc3001 node Change-Id: I56671f24c64494f2b591ef81bd947a3ba51a40fa Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--arch/arm/boot/dts/dra72-evm-lcd-osd.dts3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/dra72-evm-lcd-osd.dts b/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
index 2a1a761fecb..fbf1e96ca9b 100644
--- a/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
+++ b/arch/arm/boot/dts/dra72-evm-lcd-osd.dts
@@ -9,3 +9,6 @@
9#include "dra72-evm.dts" 9#include "dra72-evm.dts"
10#include "dra7x-evm-lcd-osd.dtsi" 10#include "dra7x-evm-lcd-osd.dtsi"
11 11
12&ldc3001 {
13 status = "disabled";
14};