From: Sumit Semwal <sumit.semwal@ti.com>
To: tomi.valkeinen@ti.com, linux-omap@vger.kernel.org
Cc: Sumit Semwal <sumit.semwal@ti.com>
Subject: [Patch 2/2] OMAP2PLUS: DSS2: Use opt-clocks from hwmod
Date: Fri, 25 Feb 2011 13:57:50 +0530 [thread overview]
Message-ID: <1298622470-10558-3-git-send-email-sumit.semwal@ti.com> (raw)
In-Reply-To: <1298622470-10558-1-git-send-email-sumit.semwal@ti.com>
hwmod databases provide information on which optional clocks are available for
a given platform. Use this information during get/enable/disable/put of clocks.
Signed-off-by: Sumit Semwal <sumit.semwal@ti.com>
---
drivers/video/omap2/dss/dss.c | 54 ++++++++++++++++++++++++++++-------------
1 files changed, 37 insertions(+), 17 deletions(-)
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 921ff91..9a85f9d 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -706,6 +706,18 @@ static int dss_get_clock(struct clk **clock, const char *clk_name)
return 0;
}
+static inline bool opt_clock_available(const char *clk_role)
+{
+ int i;
+ struct omap_display_platform_data *pdata = dss.pdev->dev.platform_data;
+
+ for (i = 0; i < pdata->dss_opt_clks_count; i++) {
+ if (strcmp(pdata->dss_opt_clk_roles[i], clk_role) == 0)
+ return true;
+ }
+ return false;
+}
+
static int dss_get_clocks(void)
{
int r;
@@ -724,17 +736,23 @@ static int dss_get_clocks(void)
if (r)
goto err;
- r = dss_get_clock(&dss.dss_sys_clk, "sys_clk");
- if (r)
- goto err;
+ if (opt_clock_available("sys_clk")) {
+ r = dss_get_clock(&dss.dss_sys_clk, "sys_clk");
+ if (r)
+ goto err;
+ }
- r = dss_get_clock(&dss.dss_tv_fck, "tv_clk");
- if (r)
- goto err;
+ if (opt_clock_available("tv_clk")) {
+ r = dss_get_clock(&dss.dss_tv_fck, "tv_clk");
+ if (r)
+ goto err;
+ }
- r = dss_get_clock(&dss.dss_video_fck, "video_clk");
- if (r)
- goto err;
+ if (opt_clock_available("video_clk")) {
+ r = dss_get_clock(&dss.dss_video_fck, "video_clk");
+ if (r)
+ goto err;
+ }
return 0;
@@ -757,9 +775,11 @@ static void dss_put_clocks(void)
{
if (dss.dss_video_fck)
clk_put(dss.dss_video_fck);
- clk_put(dss.dss_tv_fck);
+ if (dss.dss_tv_fck)
+ clk_put(dss.dss_tv_fck);
+ if (dss.dss_sys_clk)
+ clk_put(dss.dss_sys_clk);
clk_put(dss.dss_fck);
- clk_put(dss.dss_sys_clk);
clk_put(dss.dss_ick);
}
@@ -808,11 +828,11 @@ static void dss_clk_enable_no_ctx(enum dss_clock clks)
clk_enable(dss.dss_ick);
if (clks & DSS_CLK_FCK)
clk_enable(dss.dss_fck);
- if (clks & DSS_CLK_SYSCK)
+ if ((clks & DSS_CLK_SYSCK) && dss.dss_sys_clk)
clk_enable(dss.dss_sys_clk);
- if (clks & DSS_CLK_TVFCK)
+ if ((clks & DSS_CLK_TVFCK) && dss.dss_tv_fck)
clk_enable(dss.dss_tv_fck);
- if (clks & DSS_CLK_VIDFCK)
+ if ((clks & DSS_CLK_VIDFCK) && dss.dss_video_fck)
clk_enable(dss.dss_video_fck);
dss.num_clks_enabled += num_clks;
@@ -836,11 +856,11 @@ static void dss_clk_disable_no_ctx(enum dss_clock clks)
clk_disable(dss.dss_ick);
if (clks & DSS_CLK_FCK)
clk_disable(dss.dss_fck);
- if (clks & DSS_CLK_SYSCK)
+ if ((clks & DSS_CLK_SYSCK) && dss.dss_sys_clk)
clk_disable(dss.dss_sys_clk);
- if (clks & DSS_CLK_TVFCK)
+ if ((clks & DSS_CLK_TVFCK) && dss.dss_tv_fck)
clk_disable(dss.dss_tv_fck);
- if (clks & DSS_CLK_VIDFCK)
+ if ((clks & DSS_CLK_VIDFCK) && dss.dss_video_fck)
clk_disable(dss.dss_video_fck);
dss.num_clks_enabled -= num_clks;
--
1.7.1
prev parent reply other threads:[~2011-02-25 8:28 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-02-25 8:27 [Patch 0/2] OMAP2PLUS:DSS2: use opt-clocks information from hwmod Sumit Semwal
2011-02-25 8:27 ` [Patch 1/2] OMAP2PLUS: DSS2: Add dss_opt_clk_roles in pdata Sumit Semwal
2011-02-28 9:10 ` Tomi Valkeinen
2011-02-28 9:17 ` Semwal, Sumit
2011-02-28 9:23 ` Tomi Valkeinen
2011-02-25 8:27 ` Sumit Semwal [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1298622470-10558-3-git-send-email-sumit.semwal@ti.com \
--to=sumit.semwal@ti.com \
--cc=linux-omap@vger.kernel.org \
--cc=tomi.valkeinen@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox