From 2353c08e01dfedfeb825fe6b7c378fc0a9a10a8b Mon Sep 17 00:00:00 2001 From: Sebastien Jan Date: Tue, 3 May 2011 12:18:38 +0800 Subject: 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 --- drivers/video/omap2/dss/dsi.c | 2 -- 1 file changed, 2 deletions(-) (limited to 'drivers/video') 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); -- cgit v1.2.3