aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2011-05-23 08:39:36 -0400
committerTomi Valkeinen <tomi.valkeinen@ti.com>2011-07-25 03:08:14 -0400
commitb88f58f091f7e771315bc74c28203b5248b96be0 (patch)
tree665630afcda7cf5f446aa45544a3460d2d5715fb
parentcb5930bdb57393a6ab9dc0c96fe5f03dcfb5bf43 (diff)
OMAP: DSS2: Remove clk optimization at dss init
DSS enables core clocks for the duration of initialization to avoid unnecessary context saves and restores. With PM runtime the clocks cannot be handled in this way, outside the dss module drivers. Thus we need to remove the optimization. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
-rw-r--r--drivers/video/omap2/dss/core.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c
index 3380a9196fd..76821fefce9 100644
--- a/drivers/video/omap2/dss/core.c
+++ b/drivers/video/omap2/dss/core.c
@@ -183,8 +183,6 @@ static int omap_dss_probe(struct platform_device *pdev)
183 goto err_dss; 183 goto err_dss;
184 } 184 }
185 185
186 /* keep clocks enabled to prevent context saves/restores during init */
187 dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK);
188 r = dispc_init_platform_driver(); 186 r = dispc_init_platform_driver();
189 if (r) { 187 if (r) {
190 DSSERR("Failed to initialize dispc platform driver\n"); 188 DSSERR("Failed to initialize dispc platform driver\n");
@@ -237,8 +235,6 @@ static int omap_dss_probe(struct platform_device *pdev)
237 pdata->default_device = dssdev; 235 pdata->default_device = dssdev;
238 } 236 }
239 237
240 dss_clk_disable(DSS_CLK_ICK | DSS_CLK_FCK);
241
242 return 0; 238 return 0;
243 239
244err_register: 240err_register: