diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-05-03 12:18:38 +0800 |
|---|---|---|
| committer | Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> | 2011-05-16 22:42:12 -0300 |
| commit | 2353c08e01dfedfeb825fe6b7c378fc0a9a10a8b (patch) | |
| tree | a1204c5fadca467f09eb0d31db23e374f1f06400 /drivers/video | |
| parent | d76a59b1e4414586696e29a3e6b4f606865d852d (diff) | |
DSS: fix DVI and DSI concurrent support
DSI requires the OMAP2_DSS_USE_DSI_PLL flag to work, and the dummy
regulators.
The USE_DSI_PLL flag also impacts DPI (for DVI on pandaboard), and
currently breaks it.
So deactivate the USE_DSI_PLL flag and hack DSI code to enable DSI
support.
Signed-off-by: Sebastien Jan <s-jan@ti.com>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/omap2/dss/dsi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c index 97ad21bf7a2..3e2941a28b8 100644 --- a/drivers/video/omap2/dss/dsi.c +++ b/drivers/video/omap2/dss/dsi.c @@ -1423,7 +1423,6 @@ int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk, DSSDBG("PLL init\n"); -#ifdef CONFIG_OMAP2_DSS_USE_DSI_PLL /* * HACK: this is just a quick hack to get the USE_DSI_PLL * option working. USE_DSI_PLL is itself a big hack, and @@ -1441,7 +1440,6 @@ int dsi_pll_init(struct omap_dss_device *dssdev, bool enable_hsclk, dsi.vdds_dsi_reg = vdds_dsi; } -#endif enable_clocks(1); dsi_enable_pll_clock(1); |