diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2011-05-17 16:10:59 +0300 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2011-10-10 15:07:01 +0200 |
| commit | 67fce0aa24308bb55227b993c40842b73889a94c (patch) | |
| tree | 9126ec94b578afb1fbfd30f4ef5a48d724da8b5d /drivers | |
| parent | 0d3fe4e97302c6e8d31ed4e72757411b59a75dc7 (diff) | |
OMAP: DSS2: Init dispc first before other components
The initialization order of the DSS modules is important when pm_runtime
support is implemented. Currently RFBI is initialized before DISPC,
which will cause problems with pm_runtime as RFBI uses DISPC.
Change the init order so that DISPC is before RFBI.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/omap2/dss/core.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/core.c b/drivers/video/omap2/dss/core.c index 22a7f4ebec88..a54c20f49e72 100644 --- a/drivers/video/omap2/dss/core.c +++ b/drivers/video/omap2/dss/core.c @@ -190,6 +190,11 @@ static int omap_dss_probe(struct platform_device *pdev) /* keep clocks enabled to prevent context saves/restores during init */ dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK); + r = dispc_init_platform_driver(); + if (r) { + DSSERR("Failed to initialize dispc platform driver\n"); + goto err_dispc; + } r = rfbi_init_platform_driver(); if (r) { @@ -197,12 +202,6 @@ static int omap_dss_probe(struct platform_device *pdev) goto err_rfbi; } - r = dispc_init_platform_driver(); - if (r) { - DSSERR("Failed to initialize dispc platform driver\n"); - goto err_dispc; - } - r = venc_init_platform_driver(); if (r) { DSSERR("Failed to initialize venc platform driver\n"); |