diff options
Diffstat (limited to 'drivers/video/omap2/dss/sdi.c')
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index ee07a3cc22ef..19443b18f3da 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c | |||
@@ -35,12 +35,16 @@ static struct { | |||
35 | struct regulator *vdds_sdi_reg; | 35 | struct regulator *vdds_sdi_reg; |
36 | } sdi; | 36 | } sdi; |
37 | 37 | ||
38 | static void sdi_basic_init(void) | 38 | static void sdi_basic_init(struct omap_dss_device *dssdev) |
39 | |||
39 | { | 40 | { |
40 | dispc_set_parallel_interface_mode(OMAP_DSS_PARALLELMODE_BYPASS); | 41 | dispc_set_parallel_interface_mode(dssdev->manager->id, |
42 | OMAP_DSS_PARALLELMODE_BYPASS); | ||
43 | |||
44 | dispc_set_lcd_display_type(dssdev->manager->id, | ||
45 | OMAP_DSS_LCD_DISPLAY_TFT); | ||
41 | 46 | ||
42 | dispc_set_lcd_display_type(OMAP_DSS_LCD_DISPLAY_TFT); | 47 | dispc_set_tft_data_lines(dssdev->manager->id, 24); |
43 | dispc_set_tft_data_lines(24); | ||
44 | dispc_lcd_enable_signal_polarity(1); | 48 | dispc_lcd_enable_signal_polarity(1); |
45 | } | 49 | } |
46 | 50 | ||
@@ -68,7 +72,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) | |||
68 | if (!sdi.skip_init) | 72 | if (!sdi.skip_init) |
69 | dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1); | 73 | dss_clk_enable(DSS_CLK_ICK | DSS_CLK_FCK1); |
70 | 74 | ||
71 | sdi_basic_init(); | 75 | sdi_basic_init(dssdev); |
72 | 76 | ||
73 | /* 15.5.9.1.2 */ | 77 | /* 15.5.9.1.2 */ |
74 | dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF; | 78 | dssdev->panel.config |= OMAP_DSS_LCD_RF | OMAP_DSS_LCD_ONOFF; |
@@ -102,7 +106,7 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) | |||
102 | } | 106 | } |
103 | 107 | ||
104 | 108 | ||
105 | dispc_set_lcd_timings(t); | 109 | dispc_set_lcd_timings(dssdev->manager->id, t); |
106 | 110 | ||
107 | r = dss_set_clock_div(&dss_cinfo); | 111 | r = dss_set_clock_div(&dss_cinfo); |
108 | if (r) | 112 | if (r) |