aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2006-04-18 16:47:08 -0400
committerMauro Carvalho Chehab <mchehab@infradead.org>2006-06-25 00:58:26 -0400
commit3d043661064b37f54e8123d17b436aea05da19d6 (patch)
tree7d0c9662bba21817e1fe24a7878ed72a464f0b19
parent8f611b87f437703b95b725afe0388e4fb9cd6587 (diff)
V4L/DVB (3841): Dvb-bt8xx: use fe_lgh06xf.h
- removed duplicated tuning code for LG TDVS H064F Signed-off-by: Michael Krufky <mkrufky@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.c25
-rw-r--r--drivers/media/dvb/bt8xx/dvb-bt8xx.h1
2 files changed, 2 insertions, 24 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 809f6a664c4f..c56f26c93b7a 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -568,30 +568,7 @@ static struct mt352_config digitv_alps_tded4_config = {
568static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) 568static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
569{ 569{
570 struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv; 570 struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
571 u8 buf[4]; 571 return lg_h06xf_pll_set(fe, card->i2c_adapter, params);
572 struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
573 int err;
574
575 dvb_pll_configure(&dvb_pll_tdvs_tua6034, buf, params->frequency, 0);
576 dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
577 __FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
578 if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
579 printk(KERN_WARNING "dvb-bt8xx: %s error "
580 "(addr %02x <- %02x, err = %i)\n",
581 __FUNCTION__, buf[0], buf[1], err);
582 if (err < 0)
583 return err;
584 else
585 return -EREMOTEIO;
586 }
587
588 /* Set the Auxiliary Byte. */
589 buf[2] &= ~0x20;
590 buf[2] |= 0x18;
591 buf[3] = 0x50;
592 i2c_transfer(card->i2c_adapter, &msg, 1);
593
594 return 0;
595} 572}
596 573
597static struct lgdt330x_config tdvs_tua6034_config = { 574static struct lgdt330x_config tdvs_tua6034_config = {
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index e41066ae7397..078f10350fd8 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -37,6 +37,7 @@
37#include "cx24110.h" 37#include "cx24110.h"
38#include "or51211.h" 38#include "or51211.h"
39#include "lgdt330x.h" 39#include "lgdt330x.h"
40#include "fe_lgh06xf.h"
40#include "zl10353.h" 41#include "zl10353.h"
41 42
42struct dvb_bt8xx_card { 43struct dvb_bt8xx_card {