diff options
Diffstat (limited to 'drivers/video/omap2/dss')
-rw-r--r-- | drivers/video/omap2/dss/dispc.c | 29 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dpi.c | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/dss.h | 2 | ||||
-rw-r--r-- | drivers/video/omap2/dss/sdi.c | 2 |
4 files changed, 0 insertions, 35 deletions
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c index 1f4a3275d10..957c0496279 100644 --- a/drivers/video/omap2/dss/dispc.c +++ b/drivers/video/omap2/dss/dispc.c | |||
@@ -3165,35 +3165,6 @@ static void dispc_dump_regs(struct seq_file *s) | |||
3165 | #undef DUMPREG | 3165 | #undef DUMPREG |
3166 | } | 3166 | } |
3167 | 3167 | ||
3168 | static void _dispc_mgr_set_pol_freq(enum omap_channel channel, bool onoff, | ||
3169 | bool rf, bool ieo, bool ipc, bool ihs, bool ivs) | ||
3170 | { | ||
3171 | u32 l = 0; | ||
3172 | |||
3173 | DSSDBG("onoff %d rf %d ieo %d ipc %d ihs %d ivs %d\n", | ||
3174 | onoff, rf, ieo, ipc, ihs, ivs); | ||
3175 | |||
3176 | l |= FLD_VAL(onoff, 17, 17); | ||
3177 | l |= FLD_VAL(rf, 16, 16); | ||
3178 | l |= FLD_VAL(ieo, 15, 15); | ||
3179 | l |= FLD_VAL(ipc, 14, 14); | ||
3180 | l |= FLD_VAL(ihs, 13, 13); | ||
3181 | l |= FLD_VAL(ivs, 12, 12); | ||
3182 | |||
3183 | dispc_write_reg(DISPC_POL_FREQ(channel), l); | ||
3184 | } | ||
3185 | |||
3186 | void dispc_mgr_set_pol_freq(enum omap_channel channel, | ||
3187 | enum omap_panel_config config) | ||
3188 | { | ||
3189 | _dispc_mgr_set_pol_freq(channel, (config & OMAP_DSS_LCD_ONOFF) != 0, | ||
3190 | (config & OMAP_DSS_LCD_RF) != 0, | ||
3191 | (config & OMAP_DSS_LCD_IEO) != 0, | ||
3192 | (config & OMAP_DSS_LCD_IPC) != 0, | ||
3193 | (config & OMAP_DSS_LCD_IHS) != 0, | ||
3194 | (config & OMAP_DSS_LCD_IVS) != 0); | ||
3195 | } | ||
3196 | |||
3197 | /* with fck as input clock rate, find dispc dividers that produce req_pck */ | 3168 | /* with fck as input clock rate, find dispc dividers that produce req_pck */ |
3198 | void dispc_find_clk_divs(unsigned long req_pck, unsigned long fck, | 3169 | void dispc_find_clk_divs(unsigned long req_pck, unsigned long fck, |
3199 | struct dispc_clock_info *cinfo) | 3170 | struct dispc_clock_info *cinfo) |
diff --git a/drivers/video/omap2/dss/dpi.c b/drivers/video/omap2/dss/dpi.c index bf57f319fc2..a81b6d6deb5 100644 --- a/drivers/video/omap2/dss/dpi.c +++ b/drivers/video/omap2/dss/dpi.c | |||
@@ -131,8 +131,6 @@ static int dpi_set_mode(struct omap_dss_device *dssdev) | |||
131 | unsigned long pck; | 131 | unsigned long pck; |
132 | int r = 0; | 132 | int r = 0; |
133 | 133 | ||
134 | dispc_mgr_set_pol_freq(dssdev->manager->id, dssdev->panel.config); | ||
135 | |||
136 | if (dpi_use_dsi_pll(dssdev)) | 134 | if (dpi_use_dsi_pll(dssdev)) |
137 | r = dpi_set_dsi_clk(dssdev, t->pixel_clock * 1000, &fck, | 135 | r = dpi_set_dsi_clk(dssdev, t->pixel_clock * 1000, &fck, |
138 | &lck_div, &pck_div); | 136 | &lck_div, &pck_div); |
diff --git a/drivers/video/omap2/dss/dss.h b/drivers/video/omap2/dss/dss.h index 3ca3d065b65..dc0c0a63086 100644 --- a/drivers/video/omap2/dss/dss.h +++ b/drivers/video/omap2/dss/dss.h | |||
@@ -423,8 +423,6 @@ void dispc_mgr_set_tft_data_lines(enum omap_channel channel, u8 data_lines); | |||
423 | void dispc_mgr_set_lcd_type_tft(enum omap_channel channel); | 423 | void dispc_mgr_set_lcd_type_tft(enum omap_channel channel); |
424 | void dispc_mgr_set_timings(enum omap_channel channel, | 424 | void dispc_mgr_set_timings(enum omap_channel channel, |
425 | struct omap_video_timings *timings); | 425 | struct omap_video_timings *timings); |
426 | void dispc_mgr_set_pol_freq(enum omap_channel channel, | ||
427 | enum omap_panel_config config); | ||
428 | unsigned long dispc_mgr_lclk_rate(enum omap_channel channel); | 426 | unsigned long dispc_mgr_lclk_rate(enum omap_channel channel); |
429 | unsigned long dispc_mgr_pclk_rate(enum omap_channel channel); | 427 | unsigned long dispc_mgr_pclk_rate(enum omap_channel channel); |
430 | unsigned long dispc_core_clk_rate(void); | 428 | unsigned long dispc_core_clk_rate(void); |
diff --git a/drivers/video/omap2/dss/sdi.c b/drivers/video/omap2/dss/sdi.c index 4f43537d021..59992a3ed0e 100644 --- a/drivers/video/omap2/dss/sdi.c +++ b/drivers/video/omap2/dss/sdi.c | |||
@@ -83,8 +83,6 @@ int omapdss_sdi_display_enable(struct omap_dss_device *dssdev) | |||
83 | dssdev->panel.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; | 83 | dssdev->panel.timings.data_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; |
84 | dssdev->panel.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; | 84 | dssdev->panel.timings.sync_pclk_edge = OMAPDSS_DRIVE_SIG_RISING_EDGE; |
85 | 85 | ||
86 | dispc_mgr_set_pol_freq(dssdev->manager->id, dssdev->panel.config); | ||
87 | |||
88 | r = dss_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo); | 86 | r = dss_calc_clock_div(t->pixel_clock * 1000, &dss_cinfo, &dispc_cinfo); |
89 | if (r) | 87 | if (r) |
90 | goto err_calc_clock_div; | 88 | goto err_calc_clock_div; |