From: Tomi Valkeinen <tomi.valkeinen@ti.com>
To: Archit Taneja <archit@ti.com>,
linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkeinen@ti.com>
Subject: [PATCH 06/14] OMAPDSS: DSI remove unneeded clk source setup code
Date: Fri, 08 Mar 2013 11:52:41 +0000 [thread overview]
Message-ID: <1362743569-10289-7-git-send-email-tomi.valkeinen@ti.com> (raw)
In-Reply-To: <1362743569-10289-1-git-send-email-tomi.valkeinen@ti.com>
We always use the same clock sources for DSI, so let's remove the
unnecessary clock source fields from dsi_data.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
---
drivers/video/omap2/dss/dsi.c | 24 ++++++------------------
1 file changed, 6 insertions(+), 18 deletions(-)
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index 7faad58..aabe472 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -269,10 +269,6 @@ struct dsi_data {
struct dispc_clock_info user_dispc_cinfo;
struct dsi_clock_info user_dsi_cinfo;
- enum omap_dss_clk_source user_dispc_fclk_src;
- enum omap_dss_clk_source user_lcd_clk_src;
- enum omap_dss_clk_source user_dsi_fclk_src;
-
struct dsi_clock_info current_cinfo;
bool vdds_dsi_enabled;
@@ -4327,18 +4323,6 @@ static int dsi_set_clocks(struct omap_dss_device *dssdev,
dsi->user_dispc_cinfo.lck_div = dispc_cinfo.lck_div;
dsi->user_dispc_cinfo.pck_div = dispc_cinfo.pck_div;
- dsi->user_dispc_fclk_src = OMAP_DSS_CLK_SRC_FCK;
-
- dsi->user_lcd_clk_src - dsi->module_id = 0 ?
- OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
- OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC;
-
- dsi->user_dsi_fclk_src - dsi->module_id = 0 ?
- OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
- OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI;
-
return 0;
err:
return r;
@@ -4635,7 +4619,9 @@ static int dsi_display_init_dispc(struct platform_device *dsidev,
struct dsi_data *dsi = dsi_get_dsidrv_data(dsidev);
int r;
- dss_select_lcd_clk_source(mgr->id, dsi->user_lcd_clk_src);
+ dss_select_lcd_clk_source(mgr->id, dsi->module_id = 0 ?
+ OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DISPC :
+ OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DISPC);
if (dsi->mode = OMAP_DSS_DSI_CMD_MODE) {
dsi->timings.hsw = 1;
@@ -4741,7 +4727,9 @@ static int dsi_display_init_dsi(struct platform_device *dsidev)
if (r)
goto err1;
- dss_select_dsi_clk_source(dsi->module_id, dsi->user_dsi_fclk_src);
+ dss_select_dsi_clk_source(dsi->module_id, dsi->module_id = 0 ?
+ OMAP_DSS_CLK_SRC_DSI_PLL_HSDIV_DSI :
+ OMAP_DSS_CLK_SRC_DSI2_PLL_HSDIV_DSI);
DSSDBG("PLL OK\n");
--
1.7.10.4
next prev parent reply other threads:[~2013-03-08 11:52 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-08 11:52 [PATCH 00/14] OMAPDSS: new clock calculation + DSI VM Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 01/14] OMAPDSS: DISPC: store core clk rate Tomi Valkeinen
2013-03-20 11:20 ` Archit Taneja
2013-03-20 11:36 ` Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 02/14] OMAPDSS: DSI: fix wrong unsigned long long use Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 03/14] OMAPDSS: DSI: simplify dsi configuration Tomi Valkeinen
2013-03-20 11:36 ` Archit Taneja
2013-03-20 11:44 ` Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 04/14] OMAPDSS: DSI: get line buffer size at probe Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 05/14] OMAPDSS: DSI: add enum omap_dss_dsi_trans_mode Tomi Valkeinen
2013-03-20 11:42 ` Archit Taneja
2013-03-08 11:52 ` Tomi Valkeinen [this message]
2013-03-08 11:52 ` [PATCH 07/14] OMAPDSS: DISPC: add new clock calculation code Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 08/14] OMAPDSS: DSS: " Tomi Valkeinen
2013-03-20 15:29 ` Archit Taneja
2013-03-20 15:28 ` Tomi Valkeinen
2013-03-21 6:26 ` Archit Taneja
2013-03-21 8:13 ` Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 09/14] OMAPDSS: DSI: " Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 10/14] OMAPDSS: SDI: use " Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 11/14] OMAPDSS: DPI: " Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 12/14] OMAPDSS: DSI: " Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 13/14] OMAPDSS: remove unused old " Tomi Valkeinen
2013-03-08 11:52 ` [PATCH 14/14] OMAPDSS: remove dsi videomode from dssdev Tomi Valkeinen
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=1362743569-10289-7-git-send-email-tomi.valkeinen@ti.com \
--to=tomi.valkeinen@ti.com \
--cc=archit@ti.com \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).