aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/omap2/dss/venc.c
diff options
context:
space:
mode:
authorArchit Taneja <archit@ti.com>2012-08-16 02:26:31 -0400
committerArchit Taneja <archit@ti.com>2012-08-16 09:17:52 -0400
commit89e7195634e563b72288bf13ef4dbdf4709d2d08 (patch)
tree8f786f5c3510ca8a70725e5c914ec5ad2ae4171c /drivers/video/omap2/dss/venc.c
parentfebe2905d08b238f4ee2eb7e99c402bf85f0f70f (diff)
OMAPDSS: VENC: Maintian copy of video output polarity info in private data
The VENC driver currently relies on the omap_dss_device struct to configure the video output polarity. This makes the VENC interface driver dependent on the omap_dss_device struct. Make the VENC driver data maintain it's own polarity field. A panel driver is expected to call omapdss_venc_invert_vid_out_polarity() before enabling the interface. Signed-off-by: Archit Taneja <archit@ti.com>
Diffstat (limited to 'drivers/video/omap2/dss/venc.c')
-rw-r--r--drivers/video/omap2/dss/venc.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index 2d90fcf7e8f9..7d3eef8a010f 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -303,6 +303,7 @@ static struct {
303 303
304 struct omap_video_timings timings; 304 struct omap_video_timings timings;
305 enum omap_dss_venc_type type; 305 enum omap_dss_venc_type type;
306 bool invert_polarity;
306} venc; 307} venc;
307 308
308static inline void venc_write_reg(int idx, u32 val) 309static inline void venc_write_reg(int idx, u32 val)
@@ -447,7 +448,7 @@ static int venc_power_on(struct omap_dss_device *dssdev)
447 else /* S-Video */ 448 else /* S-Video */
448 l |= (1 << 0) | (1 << 2); 449 l |= (1 << 0) | (1 << 2);
449 450
450 if (dssdev->phy.venc.invert_polarity == false) 451 if (venc.invert_polarity == false)
451 l |= 1 << 3; 452 l |= 1 << 3;
452 453
453 venc_write_reg(VENC_OUTPUT_CONTROL, l); 454 venc_write_reg(VENC_OUTPUT_CONTROL, l);
@@ -639,6 +640,16 @@ void omapdss_venc_set_type(struct omap_dss_device *dssdev,
639 mutex_unlock(&venc.venc_lock); 640 mutex_unlock(&venc.venc_lock);
640} 641}
641 642
643void omapdss_venc_invert_vid_out_polarity(struct omap_dss_device *dssdev,
644 bool invert_polarity)
645{
646 mutex_lock(&venc.venc_lock);
647
648 venc.invert_polarity = invert_polarity;
649
650 mutex_unlock(&venc.venc_lock);
651}
652
642static int __init venc_init_display(struct omap_dss_device *dssdev) 653static int __init venc_init_display(struct omap_dss_device *dssdev)
643{ 654{
644 DSSDBG("init_display\n"); 655 DSSDBG("init_display\n");