diff options
| author | Sebastien Jan <s-jan@ti.com> | 2011-04-07 08:42:48 +0100 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2011-04-07 08:42:48 +0100 |
| commit | 66c482858e9fe129a47827ae1abc920c5082cd55 (patch) | |
| tree | 8af430110c989334e9836f808356ceac5a7b8ffb /drivers | |
| parent | fa7054248c12f0be06fefca90af8a6ed368c6444 (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')
| -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); |