From 7512db36a51b3ab7f87b9fd925f28026d46387f1 Mon Sep 17 00:00:00 2001
From: Michael Krufky <mkrufky@linuxtv.org>
Date: Tue, 18 Apr 2006 17:47:08 -0300
Subject: [PATCH] --- yaml --- r: 29874 b: refs/heads/master c:
 3d043661064b37f54e8123d17b436aea05da19d6 h: refs/heads/master v: v3

---
 [refs]                                    |  2 +-
 trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c | 25 +----------------------
 trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h |  1 +
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 0222251908f3..849c951fd6f6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f611b87f437703b95b725afe0388e4fb9cd6587
+refs/heads/master: 3d043661064b37f54e8123d17b436aea05da19d6
diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 809f6a664c4f..c56f26c93b7a 100644
--- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -568,30 +568,7 @@ static struct mt352_config digitv_alps_tded4_config = {
 static int tdvs_tua6034_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
 {
 	struct dvb_bt8xx_card *card = (struct dvb_bt8xx_card *) fe->dvb->priv;
-	u8 buf[4];
-	struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = buf, .len = sizeof(buf) };
-	int err;
-
-	dvb_pll_configure(&dvb_pll_tdvs_tua6034, buf, params->frequency, 0);
-	dprintk("%s: tuner at 0x%02x bytes: 0x%02x 0x%02x 0x%02x 0x%02x\n",
-		__FUNCTION__, msg.addr, buf[0],buf[1],buf[2],buf[3]);
-	if ((err = i2c_transfer(card->i2c_adapter, &msg, 1)) != 1) {
-		printk(KERN_WARNING "dvb-bt8xx: %s error "
-			"(addr %02x <- %02x, err = %i)\n",
-			__FUNCTION__, buf[0], buf[1], err);
-		if (err < 0)
-			return err;
-		else
-			return -EREMOTEIO;
-	}
-
-	/* Set the Auxiliary Byte. */
-	buf[2] &= ~0x20;
-	buf[2] |= 0x18;
-	buf[3] = 0x50;
-	i2c_transfer(card->i2c_adapter, &msg, 1);
-
-	return 0;
+	return lg_h06xf_pll_set(fe, card->i2c_adapter, params);
 }
 
 static struct lgdt330x_config tdvs_tua6034_config = {
diff --git a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index e41066ae7397..078f10350fd8 100644
--- a/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/trunk/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -37,6 +37,7 @@
 #include "cx24110.h"
 #include "or51211.h"
 #include "lgdt330x.h"
+#include "fe_lgh06xf.h"
 #include "zl10353.h"
 
 struct dvb_bt8xx_card {