summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/tuner-simple.c
diff options
context:
space:
mode:
authorKirk Lapray <kirk.lapray@gmail.com>2005-11-08 21:38:18 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 07:56:26 -0800
commitfde6d31e19addca8be17dee7f47ad0a7fcaa79ca (patch)
tree16df2e0145321c6a1efe1c0408a2f9dd55bc4b2b /drivers/media/video/tuner-simple.c
parent85a2eb07e1a83a9569cdaddcef2db8d70e4fbea9 (diff)
downloadop-kernel-dev-fde6d31e19addca8be17dee7f47ad0a7fcaa79ca.zip
op-kernel-dev-fde6d31e19addca8be17dee7f47ad0a7fcaa79ca.tar.gz
[PATCH] v4l: 868: added support for nxt200x based cards ati hdtv wonder
- Added support for NXT200X based cards (ATI HDTV Wonder) Signed-off-by: Kirk Lapray <kirk.lapray@gmail.com> Signed-off-by: Michael Krufky <mkrufky@m1k.net> Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/media/video/tuner-simple.c')
-rw-r--r--drivers/media/video/tuner-simple.c19
1 files changed, 17 insertions, 2 deletions
diff --git a/drivers/media/video/tuner-simple.c b/drivers/media/video/tuner-simple.c
index 84338f1..34ba6d1 100644
--- a/drivers/media/video/tuner-simple.c
+++ b/drivers/media/video/tuner-simple.c
@@ -251,7 +251,7 @@ static struct tunertype tuners[] = {
{ "Philips TD1316 Hybrid Tuner", Philips, PAL,
16*160.00,16*442.00,0xa1,0xa2,0xa4,0xc8,623 },
{ "Philips TUV1236D ATSC/NTSC dual in", Philips, ATSC,
- 16*157.25,16*454.00,0x01,0x02,0x03,0xce,732 },
+ 16*157.25,16*454.00,0x01,0x02,0x04,0xce,732 },
};
unsigned const int tuner_count = ARRAY_SIZE(tuners);
@@ -383,9 +383,24 @@ static void default_set_tv_freq(struct i2c_client *c, unsigned int freq)
/* 0x48 -> ATSC antenna input 2 */
/* 0x00 -> NTSC antenna input 1 */
/* 0x08 -> NTSC antenna input 2 */
+ buffer[0] = 0x14;
+ buffer[1] = 0x00;
+ buffer[2] = 0x17;
+ buffer[3] = 0x00;
config &= ~0x40;
- if (t->std & V4L2_STD_ATSC)
+ if (t->std & V4L2_STD_ATSC) {
config |= 0x40;
+ buffer[1] = 0x04;
+ }
+ /* set to the correct mode (analog or digital) */
+ u8 tuneraddr;
+ tuneraddr = c->addr;
+ c->addr = 0x0a;
+ if (2 != (rc = i2c_master_send(c,&buffer[0],2)))
+ tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+ if (2 != (rc = i2c_master_send(c,&buffer[2],2)))
+ tuner_warn("i2c i/o error: rc == %d (should be 2)\n",rc);
+ c->addr = tuneraddr;
/* FIXME: input */
break;
}
OpenPOWER on IntegriCloud