From d2f2cb1301a34c36cdcce56d93ece97a67e71d13 Mon Sep 17 00:00:00 2001
From: Venkateswara Rao Mandela <venkat.mandela@ti.com>
Date: Tue, 14 Feb 2017 11:54:34 +0530
Subject: [PATCH] drm/omap: dra7xx: enable hdmi pll for lcd

1. disable hdmi in the device tree
2. Add HDMI PLL as the preferred clocking option for lcd.

Change-Id: Iabf647e2aa065ee7d1968cce87a0a523a41b20d7
Signed-off-by: Venkateswara Rao Mandela <venkat.mandela@ti.com>
---

diff --git a/arch/arm/boot/dts/dra7-evm-lcd-lg.dts b/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
index 2b09d3a..07cc421 100644
--- a/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
+++ b/arch/arm/boot/dts/dra7-evm-lcd-lg.dts
@@ -14,6 +14,9 @@
 	interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
 };
 
+&hdmi0 {
+	status = "disabled";
+};
 
 /* Uncomment the below lines to enable the FPDLink display */
 
diff --git a/arch/arm/boot/dts/dra72-evm-lcd-lg.dts b/arch/arm/boot/dts/dra72-evm-lcd-lg.dts
index d24a730..d1eda29 100644
--- a/arch/arm/boot/dts/dra72-evm-lcd-lg.dts
+++ b/arch/arm/boot/dts/dra72-evm-lcd-lg.dts
@@ -8,3 +8,7 @@
 
  #include "dra72-evm.dts"
  #include "dra7x-evm-lcd-lg.dtsi"
+
+&hdmi0 {
+	status = "disabled";
+};
diff --git a/drivers/gpu/drm/omapdrm/dss/dpi.c b/drivers/gpu/drm/omapdrm/dss/dpi.c
index a5209c9..70bcae1 100644
--- a/drivers/gpu/drm/omapdrm/dss/dpi.c
+++ b/drivers/gpu/drm/omapdrm/dss/dpi.c
@@ -79,11 +79,15 @@
 	switch (channel) {
 	case OMAP_DSS_CHANNEL_LCD:
 	{
+		if (dss_pll_find_by_src(DSS_CLK_SRC_HDMI_PLL))
+			return DSS_CLK_SRC_HDMI_PLL;
 		if (dss_pll_find_by_src(DSS_CLK_SRC_PLL1_1))
 			return DSS_CLK_SRC_PLL1_1;
 	}
 	case OMAP_DSS_CHANNEL_LCD2:
 	{
+		if (dss_pll_find_by_src(DSS_CLK_SRC_HDMI_PLL))
+			return DSS_CLK_SRC_HDMI_PLL;
 		if (dss_pll_find_by_src(DSS_CLK_SRC_PLL1_3))
 			return DSS_CLK_SRC_PLL1_3;
 		if (dss_pll_find_by_src(DSS_CLK_SRC_PLL2_3))