summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2008-02-10 23:10:59 -0500
committerMichael Krufky <mkrufky@linuxtv.org>2008-02-10 23:10:59 -0500
commit7af117b2879d5e38f46cb1d17552c080f863a6ae (patch)
tree181a3a20d06b508100a3f885804c34d523298d25
parent27e4a8a7f8fbe7173b77a500ebcdf8c0592f194a (diff)
downloadmediapointer-dvb-s2-7af117b2879d5e38f46cb1d17552c080f863a6ae.tar.gz
mediapointer-dvb-s2-7af117b2879d5e38f46cb1d17552c080f863a6ae.tar.bz2
use tuner-simple for Philips FCV1236D digital tuning support
From: Michael Krufky <mkrufky@linuxtv.org> Convert dvb-bt8xx to use tuner-simple instead of dvb-pll for Philips FCV1236D Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
-rw-r--r--linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c5
-rw-r--r--linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h1
-rw-r--r--linux/drivers/media/video/bt8xx/bttv.h1
-rw-r--r--linux/drivers/media/video/bt8xx/bttvp.h1
4 files changed, 5 insertions, 3 deletions
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index 1749668cd..5bb7d3d38 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -693,8 +693,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type)
case BTTV_BOARD_PC_HDTV:
card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter);
if (card->fe != NULL)
- dvb_attach(dvb_pll_attach, card->fe, 0x61,
- card->i2c_adapter, DVB_PLL_FCV1236D);
+ dvb_attach(simple_tuner_attach, card->fe,
+ card->i2c_adapter, 0x61,
+ TUNER_PHILIPS_FCV1236D);
break;
}
diff --git a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
index 66afc28a7..0ada48451 100644
--- a/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
+++ b/linux/drivers/media/dvb/bt8xx/dvb-bt8xx.h
@@ -42,6 +42,7 @@
#include "lgdt330x.h"
#include "zl10353.h"
#include "dvb-pll.h"
+#include "tuner-simple.h"
struct dvb_bt8xx_card {
#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
diff --git a/linux/drivers/media/video/bt8xx/bttv.h b/linux/drivers/media/video/bt8xx/bttv.h
index bb339c83f..4c73aacdb 100644
--- a/linux/drivers/media/video/bt8xx/bttv.h
+++ b/linux/drivers/media/video/bt8xx/bttv.h
@@ -20,6 +20,7 @@
#include <media/ir-common.h>
#include <media/ir-kbd-i2c.h>
#include <media/i2c-addr.h>
+#include <media/tuner.h>
/* ---------------------------------------------------------- */
/* exported by bttv-cards.c */
diff --git a/linux/drivers/media/video/bt8xx/bttvp.h b/linux/drivers/media/video/bt8xx/bttvp.h
index e868e1e21..e9219458e 100644
--- a/linux/drivers/media/video/bt8xx/bttvp.h
+++ b/linux/drivers/media/video/bt8xx/bttvp.h
@@ -50,7 +50,6 @@
#include <linux/device.h>
#endif
#include <media/videobuf-dma-sg.h>
-#include <media/tuner.h>
#include <media/tveeprom.h>
#include <media/ir-common.h>