diff options
author | Michael Krufky <mkrufky@linuxtv.org> | 2008-04-22 13:46:13 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-04-24 13:07:53 -0400 |
commit | 967be9a9cd2de3f87dbf960620860143a50c1b64 (patch) | |
tree | 57549d397b4f22d009e170e9464feda6e5b5807a | |
parent | 0efad8127ac4b32af780d722258b42cfae02cdf2 (diff) |
V4L/DVB (7411): use tuner-simple for Philips FCV1236D digital tuning support
Convert dvb-bt8xx to use tuner-simple instead of dvb-pll for Philips FCV1236D
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.c | 5 | ||||
-rw-r--r-- | drivers/media/dvb/bt8xx/dvb-bt8xx.h | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttvp.h | 1 |
4 files changed, 5 insertions, 3 deletions
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c index 209356be5828..6d8b84490fa8 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c | |||
@@ -692,8 +692,9 @@ static void frontend_init(struct dvb_bt8xx_card *card, u32 type) | |||
692 | case BTTV_BOARD_PC_HDTV: | 692 | case BTTV_BOARD_PC_HDTV: |
693 | card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter); | 693 | card->fe = dvb_attach(or51211_attach, &or51211_config, card->i2c_adapter); |
694 | if (card->fe != NULL) | 694 | if (card->fe != NULL) |
695 | dvb_attach(dvb_pll_attach, card->fe, 0x61, | 695 | dvb_attach(simple_tuner_attach, card->fe, |
696 | card->i2c_adapter, DVB_PLL_FCV1236D); | 696 | card->i2c_adapter, 0x61, |
697 | TUNER_PHILIPS_FCV1236D); | ||
697 | break; | 698 | break; |
698 | } | 699 | } |
699 | 700 | ||
diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.h b/drivers/media/dvb/bt8xx/dvb-bt8xx.h index 436880e68672..25a23c3c7c66 100644 --- a/drivers/media/dvb/bt8xx/dvb-bt8xx.h +++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.h | |||
@@ -39,6 +39,7 @@ | |||
39 | #include "lgdt330x.h" | 39 | #include "lgdt330x.h" |
40 | #include "zl10353.h" | 40 | #include "zl10353.h" |
41 | #include "dvb-pll.h" | 41 | #include "dvb-pll.h" |
42 | #include "tuner-simple.h" | ||
42 | 43 | ||
43 | struct dvb_bt8xx_card { | 44 | struct dvb_bt8xx_card { |
44 | struct mutex lock; | 45 | struct mutex lock; |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 0c859d949c78..f2393202904b 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <media/ir-common.h> | 19 | #include <media/ir-common.h> |
20 | #include <media/ir-kbd-i2c.h> | 20 | #include <media/ir-kbd-i2c.h> |
21 | #include <media/i2c-addr.h> | 21 | #include <media/i2c-addr.h> |
22 | #include <media/tuner.h> | ||
22 | 23 | ||
23 | /* ---------------------------------------------------------- */ | 24 | /* ---------------------------------------------------------- */ |
24 | /* exported by bttv-cards.c */ | 25 | /* exported by bttv-cards.c */ |
diff --git a/drivers/media/video/bt8xx/bttvp.h b/drivers/media/video/bt8xx/bttvp.h index 1305d315cfc5..03816b73f847 100644 --- a/drivers/media/video/bt8xx/bttvp.h +++ b/drivers/media/video/bt8xx/bttvp.h | |||
@@ -42,7 +42,6 @@ | |||
42 | 42 | ||
43 | #include <linux/device.h> | 43 | #include <linux/device.h> |
44 | #include <media/videobuf-dma-sg.h> | 44 | #include <media/videobuf-dma-sg.h> |
45 | #include <media/tuner.h> | ||
46 | #include <media/tveeprom.h> | 45 | #include <media/tveeprom.h> |
47 | #include <media/ir-common.h> | 46 | #include <media/ir-common.h> |
48 | 47 | ||