aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSunita Nadampalli2016-05-04 10:58:40 -0500
committerSunita Nadampalli2016-05-04 10:58:40 -0500
commit3afdd94ad010779d0de123278b07508c679683c3 (patch)
tree4a20187662aea74c7a31a2da6bd14cffe27f2fc0
parente3f3c4a5d3ba9be2b267f16cb12f0d3cc369f28c (diff)
downloadkernel-video-3afdd94ad010779d0de123278b07508c679683c3.tar.gz
kernel-video-3afdd94ad010779d0de123278b07508c679683c3.tar.xz
kernel-video-3afdd94ad010779d0de123278b07508c679683c3.zip
DRA7: HWMOD: WORKAROUND to Exclude unsed clock gating and parent hwmod controls for DSS
This patch needs revisit to handle it in a better way Change-Id: Ie1dfaf62d8aecebec7aa5771cd30d006f601191a Signed-off-by: Sunita Nadampalli <sunitan@ti.com>
-rw-r--r--arch/arm/mach-omap2/omap_hwmod_7xx_data.c4
-rw-r--r--drivers/clk/clk.c7
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
index f470b4fd125..73fae336a8f 100644
--- a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -934,7 +934,7 @@ static struct omap_hwmod dra7xx_dss_dispc_hwmod = {
934 }, 934 },
935 }, 935 },
936 .dev_attr = &dss_dispc_dev_attr, 936 .dev_attr = &dss_dispc_dev_attr,
937 .parent_hwmod = &dra7xx_dss_hwmod, 937 //.parent_hwmod = &dra7xx_dss_hwmod,
938}; 938};
939 939
940/* 940/*
@@ -976,7 +976,7 @@ static struct omap_hwmod dra7xx_dss_hdmi_hwmod = {
976 }, 976 },
977 .opt_clks = dss_hdmi_opt_clks, 977 .opt_clks = dss_hdmi_opt_clks,
978 .opt_clks_cnt = ARRAY_SIZE(dss_hdmi_opt_clks), 978 .opt_clks_cnt = ARRAY_SIZE(dss_hdmi_opt_clks),
979 .parent_hwmod = &dra7xx_dss_hwmod, 979 //.parent_hwmod = &dra7xx_dss_hwmod,
980}; 980};
981 981
982/* AES (the 'P' (public) device) */ 982/* AES (the 'P' (public) device) */
diff --git a/drivers/clk/clk.c b/drivers/clk/clk.c
index b3b40d42f75..8a0e796e9c7 100644
--- a/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@ -21,6 +21,8 @@
21#include <linux/init.h> 21#include <linux/init.h>
22#include <linux/sched.h> 22#include <linux/sched.h>
23 23
24#include <video/omapdss.h>
25
24#include "clk.h" 26#include "clk.h"
25 27
26static DEFINE_SPINLOCK(enable_lock); 28static DEFINE_SPINLOCK(enable_lock);
@@ -538,6 +540,11 @@ static int clk_disable_unused(void)
538{ 540{
539 struct clk *clk; 541 struct clk *clk;
540 542
543 /* In case of display sharing, do not explicitly disable unused clocks
544 * as the remote core will be using them */
545 if (omapdss_display_share())
546 return 0;
547
541 if (clk_ignore_unused) { 548 if (clk_ignore_unused) {
542 pr_warn("clk: Not disabling unused clocks\n"); 549 pr_warn("clk: Not disabling unused clocks\n");
543 return 0; 550 return 0;