summaryrefslogtreecommitdiffstats
path: root/drivers/media/i2c
diff options
context:
space:
mode:
authorMartin Bugge <marbugge@cisco.com>2013-12-20 09:14:57 +0100
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-01-07 09:16:54 +0100
commit9890869651fc8bc3876f2eb839ac403edb47560d (patch)
treec7dad45b4a2b564eab8f6ca75a3c5fccab336963 /drivers/media/i2c
parent[media] adv7604: return immediately if the new timings are equal to what is c... (diff)
downloadlinux-9890869651fc8bc3876f2eb839ac403edb47560d.tar.xz
linux-9890869651fc8bc3876f2eb839ac403edb47560d.zip
[media] adv7604: sync polarities from platform data
Signed-off-by: Martin Bugge <marbugge@cisco.com> Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Diffstat (limited to 'drivers/media/i2c')
-rw-r--r--drivers/media/i2c/adv7604.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/media/i2c/adv7604.c b/drivers/media/i2c/adv7604.c
index 0bc9e1a8c07e..be9699e28738 100644
--- a/drivers/media/i2c/adv7604.c
+++ b/drivers/media/i2c/adv7604.c
@@ -2126,9 +2126,10 @@ static int adv7604_core_init(struct v4l2_subdev *sd)
pdata->replicate_av_codes << 1 |
pdata->invert_cbcr << 0);
- /* TODO from platform data */
cp_write(sd, 0x69, 0x30); /* Enable CP CSC */
- io_write(sd, 0x06, 0xa6); /* positive VS and HS */
+
+ /* VS, HS polarities */
+ io_write(sd, 0x06, 0xa0 | pdata->inv_vs_pol << 2 | pdata->inv_hs_pol << 1);
/* Adjust drive strength */
io_write(sd, 0x14, 0x40 | pdata->dr_str_data << 4 |