diff options
| author | Archit Taneja <archit@ti.com> | 2010-09-24 20:09:14 +0530 |
|---|---|---|
| committer | Sebastien Jan <s-jan@ti.com> | 2010-11-03 15:58:00 +0100 |
| commit | 6da0f87e32f5729c2f0113237cf643a507fbf713 (patch) | |
| tree | a5ffd36cc18a1f192601c2b0fbfdf0903694dac2 | |
| parent | a95f9fbd778fe06e809e3780294896b67da757e8 (diff) | |
DSS2: Fix crash seen when debugging is enabled
In debug mode _dsi_print_reset_status() tries to read a complexio register
which needs the SCP interface enabled. The SCP interface is enabled now
before this function to prevent the hang.
Signed-off-by: Archit Taneja <archit@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 69bfa5da4393..8080addd3d42 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -1301,10 +1301,6 @@ int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk, DSSDBG("PLL init\n"); - /* The SCPClk is required for PLL registers on OMAP4 */ - if (cpu_is_omap44xx()) - REG_FLD_MOD(ix, DSI_CLK_CTRL, 1, 14, 14); - enable_clocks(1); dsi_enable_pll_clock(ix, 1); @@ -3507,6 +3503,10 @@ static int dsi_display_init_dsi(struct omap_dss_device *dssdev) p_dsi = (ix == DSI1) ? &dsi1 : &dsi2; + /* The SCPClk is required for PLL and complexio registers on OMAP4 */ + if (cpu_is_omap44xx()) + REG_FLD_MOD(ix, DSI_CLK_CTRL, 1, 14, 14); + _dsi_print_reset_status(ix); r = dsi_pll_init(dssdev, true, true); |