diff options
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
-rw-r--r-- | drivers/video/omap2/dss/venc.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 3907c8b6ecbc..3a220877461a 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c | |||
@@ -272,6 +272,8 @@ const struct omap_video_timings omap_dss_pal_timings = { | |||
272 | .vsw = 5, | 272 | .vsw = 5, |
273 | .vfp = 5, | 273 | .vfp = 5, |
274 | .vbp = 41, | 274 | .vbp = 41, |
275 | |||
276 | .interlace = true, | ||
275 | }; | 277 | }; |
276 | EXPORT_SYMBOL(omap_dss_pal_timings); | 278 | EXPORT_SYMBOL(omap_dss_pal_timings); |
277 | 279 | ||
@@ -285,6 +287,8 @@ const struct omap_video_timings omap_dss_ntsc_timings = { | |||
285 | .vsw = 6, | 287 | .vsw = 6, |
286 | .vfp = 6, | 288 | .vfp = 6, |
287 | .vbp = 31, | 289 | .vbp = 31, |
290 | |||
291 | .interlace = true, | ||
288 | }; | 292 | }; |
289 | EXPORT_SYMBOL(omap_dss_ntsc_timings); | 293 | EXPORT_SYMBOL(omap_dss_ntsc_timings); |
290 | 294 | ||
@@ -930,7 +934,7 @@ static int __exit omap_venchw_remove(struct platform_device *pdev) | |||
930 | static int venc_runtime_suspend(struct device *dev) | 934 | static int venc_runtime_suspend(struct device *dev) |
931 | { | 935 | { |
932 | if (venc.tv_dac_clk) | 936 | if (venc.tv_dac_clk) |
933 | clk_disable(venc.tv_dac_clk); | 937 | clk_disable_unprepare(venc.tv_dac_clk); |
934 | 938 | ||
935 | dispc_runtime_put(); | 939 | dispc_runtime_put(); |
936 | 940 | ||
@@ -946,7 +950,7 @@ static int venc_runtime_resume(struct device *dev) | |||
946 | return r; | 950 | return r; |
947 | 951 | ||
948 | if (venc.tv_dac_clk) | 952 | if (venc.tv_dac_clk) |
949 | clk_enable(venc.tv_dac_clk); | 953 | clk_prepare_enable(venc.tv_dac_clk); |
950 | 954 | ||
951 | return 0; | 955 | return 0; |
952 | } | 956 | } |