From: Senthilvadivu Guruswamy <svad...@ti.com>
when DSS ICK, FCK are requested, dss HWMOD APIs are used for enable
and disable. The remaining clocks (dss opt clks in HWMOD database)
continue to use clk APIs, since HWMOD APIs are not fully available
for the dss opt clocks without the usage of clk framework.
Signed-off-by: Senthilvadivu Guruswamy <svad...@ti.com>
---
drivers/video/omap2/dss/dss.c | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 15d0399..098ff96 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -61,6 +61,7 @@ struct dss_reg {
static struct {
struct platform_device *pdev;
+ struct omap_display_platform_data *pdata;
void __iomem *base;
int ctx_id;
@@ -310,14 +311,26 @@ static unsigned count_clk_bits(enum dss_clock clks)
return num_clks;
}
+static inline void enable_clocks(bool enable)
+ {
+ static int use_count;
+
+ use_count += enable ? 1 : -1;
+ if (use_count < 0)
+ use_count = 0;
+
+ if (enable && use_count == 1)
+ dss.pdata->device_enable(dss.pdev);
+ else if (!enable && use_count == 0)
+ dss.pdata->device_idle(dss.pdev);
+}
+
static void dss_clk_enable_no_ctx(enum dss_clock clks)
{
unsigned num_clks = count_clk_bits(clks);
- if (clks & DSS_CLK_ICK)
- clk_enable(dss.dss_ick);
- if (clks & DSS_CLK_FCK1)
- clk_enable(dss.dss1_fck);
+ if ((clks & DSS_CLK_ICK) || (clks & DSS_CLK_FCK1))
+ enable_clocks(1);
if (clks & DSS_CLK_FCK2)
clk_enable(dss.dss2_fck);
if (clks & DSS_CLK_54M)
@@ -342,10 +355,8 @@ static void dss_clk_disable_no_ctx(enum dss_clock clks)
{
unsigned num_clks = count_clk_bits(clks);
- if (clks & DSS_CLK_ICK)
- clk_disable(dss.dss_ick);
- if (clks & DSS_CLK_FCK1)
- clk_disable(dss.dss1_fck);
+ if ((clks & DSS_CLK_ICK) || (clks & DSS_CLK_FCK1))
+ enable_clocks(0);
if (clks & DSS_CLK_FCK2)
clk_disable(dss.dss2_fck);
if (clks & DSS_CLK_54M)
@@ -447,6 +458,7 @@ static int omap_dsshw_probe(struct platform_device *pdev)
int r;
dss.pdev = pdev;
+ dss.pdata = dss.pdev->dev.platform_data;
r = dss_get_clocks();
if (r)
--
1.6.3.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
