summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/saa7134/saa7134-dvb.c
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@infradead.org>2006-02-17 20:22:30 -0200
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-02-17 20:22:30 -0200
commit198381e2bf6cf71e853c1b0062ec359b7e53bd68 (patch)
tree13c5339bf034956530b5ebe241dc2140dd24cc7a /linux/drivers/media/video/saa7134/saa7134-dvb.c
parent5aea06a41b6e843a69f224d5ead6d0b5f86695ad (diff)
parent900987a1975deef83819b9678a52d6859d67a128 (diff)
downloadmediapointer-dvb-s2-198381e2bf6cf71e853c1b0062ec359b7e53bd68.tar.gz
mediapointer-dvb-s2-198381e2bf6cf71e853c1b0062ec359b7e53bd68.tar.bz2
Merge from mkrufky tree.
Some small updates in the comments for KWorld HardwareMpegTV XPert. Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/saa7134/saa7134-dvb.c')
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-dvb.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-dvb.c b/linux/drivers/media/video/saa7134/saa7134-dvb.c
index 909b82f19..d1f88d974 100644
--- a/linux/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/linux/drivers/media/video/saa7134/saa7134-dvb.c
@@ -929,6 +929,22 @@ static struct nxt200x_config avertvhda180 = {
.pll_address = 0x61,
.pll_desc = &dvb_pll_tdhu2,
};
+
+static int nxt200x_set_pll_input(u8 *buf, int input)
+{
+ if (input)
+ buf[3] |= 0x08;
+ else
+ buf[3] &= ~0x08;
+ return 0;
+}
+
+static struct nxt200x_config kworldatsc110 = {
+ .demod_address = 0x0a,
+ .pll_address = 0x61,
+ .pll_desc = &dvb_pll_tuv1236d,
+ .set_pll_input = nxt200x_set_pll_input,
+};
#endif
/* ------------------------------------------------------------------ */
@@ -1014,6 +1030,9 @@ static int dvb_init(struct saa7134_dev *dev)
case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180:
dev->dvb.frontend = nxt200x_attach(&avertvhda180, &dev->i2c_adap);
break;
+ case SAA7134_BOARD_KWORLD_ATSC110:
+ dev->dvb.frontend = nxt200x_attach(&kworldatsc110, &dev->i2c_adap);
+ break;
#endif
default:
printk("%s: Huh? unknown DVB card?\n",dev->name);