aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/cx88
diff options
context:
space:
mode:
authorDarron Broad <darron@kewl.org>2008-10-11 11:57:59 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-10-17 17:24:26 -0300
commit63248f2664d89cc22cc5a13ec6c76e92f7d5ca39 (patch)
treeb585d9a6425e13979a79ab3d06e902b8130841ba /drivers/media/video/cx88
parent923ac7f7d76116f4dd8d543f398e4811d2b1a30e (diff)
V4L/DVB (9229): cx88: Add intial config for FM radio support
This add initial configuration for radio support on the hvr-3000/4000. FM radio doesn't work as yet without further patches (to come), but this prepares for that. Experimental radio support shows that it works when combined with additional audio routing work for cards with an FMD1216ME analogue frontend, but not the MEX variant (more later). Signed-off-by: Darron Broad <darron@kewl.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx88')
-rw-r--r--drivers/media/video/cx88/cx88-cards.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 6986844e33c..db691abbb64 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1270,7 +1270,6 @@ static const struct cx88_board cx88_boards[] = {
.mpeg = CX88_MPEG_DVB,
},
[CX88_BOARD_HAUPPAUGE_HVR3000] = {
- /* FIXME: Add dvb & radio support */
.name = "Hauppauge WinTV-HVR3000 TriMode Analog/DVB-S/DVB-T",
.tuner_type = TUNER_PHILIPS_FMD1216ME_MK3,
.radio_type = UNSET,
@@ -1294,6 +1293,11 @@ static const struct cx88_board cx88_boards[] = {
.gpio0 = 0x84bf,
.audioroute = 2,
}},
+ /* FIXME Radio tunes but only noise is heard */
+ .radio = {
+ .type = CX88_RADIO,
+ .gpio0 = 0x84bf,
+ },
.mpeg = CX88_MPEG_DVB,
.num_frontends = 2,
},
@@ -1735,7 +1739,7 @@ static const struct cx88_board cx88_boards[] = {
* BIT VALUE FUNCTION GP{x}_IO
* 0 1 I:?
* 1 1 I:?
- * 2 1 O:DVB-T DEMOD ENABLE LOW/ANALOG DEMOD ENABLE HIGH
+ * 2 1 O:MPEG PORT 0=DVB-T 1=DVB-S
* 3 1 I:?
* 4 1 I:?
* 5 1 I:?
@@ -1768,7 +1772,11 @@ static const struct cx88_board cx88_boards[] = {
.gpio0 = 0xc4bf,
.audioroute = 2,
} },
- /* fixme: Add radio support */
+ /* FIXME Radio tunes but only noise is heard */
+ .radio = {
+ .type = CX88_RADIO,
+ .gpio0 = 0xc4bf,
+ },
.mpeg = CX88_MPEG_DVB,
.num_frontends = 2,
},