diff options
| author | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-01-08 18:00:36 +0200 |
|---|---|---|
| committer | Tomi Valkeinen <tomi.valkeinen@nokia.com> | 2010-02-15 15:14:40 +0200 |
| commit | 2f18c4d89861fc1abdfa2531ba76017acb78edc5 (patch) | |
| tree | e86ed71a3c19598ecd30dbf0eca9ee0df898a70a /drivers/video/omap2/dss/dpi.c | |
| parent | b63c97f5184684c841be84ec80928e3c5fe57fbe (diff) | |
| download | op-kernel-dev-2f18c4d89861fc1abdfa2531ba76017acb78edc5.zip op-kernel-dev-2f18c4d89861fc1abdfa2531ba76017acb78edc5.tar.gz | |
OMAP: DSS2: improve DSS clk src selection
dss_select_clk_source() was rather confusing. Selecting the source with
enums is much clearer.
The clk source selection is also stored into memory, so that we know what
is the selected source, even when clocks are off. This is important during
setup, as we need to what clocks to turn on before the clocks are turned
on.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Diffstat (limited to 'drivers/video/omap2/dss/dpi.c')
| -rw-r--r-- | drivers/video/omap2/dss/dpi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index 69ce31a..c5091ed 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c @@ -57,7 +57,7 @@ static int dpi_set_dsi_clk(bool is_tft, unsigned long pck_req, if (r) return r; - dss_select_clk_source(0, 1); + dss_select_dispc_clk_source(DSS_SRC_DSI1_PLL_FCLK); r = dispc_set_clock_div(&dispc_cinfo); if (r) @@ -238,7 +238,7 @@ static void dpi_display_disable(struct omap_dss_device *dssdev) dispc_enable_lcd_out(0); #ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL - dss_select_clk_source(0, 0); + dss_select_dispc_clk_source(DSS_SRC_DSS1_ALWON_FCLK); dsi_pll_uninit(); dss_clk_disable(DSS_CLK_FCK2); #endif |
