From 42a8a26016ce0bf6da80cb446f0e3889064bfaa0 Mon Sep 17 00:00:00 2001 From: "darron@kewl.org" Date: Sat, 11 Oct 2008 15:57:59 +0100 Subject: cx88: Add intial config for FM radio support From: Darron Broad 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). Priority: normal Signed-off-by: Darron Broad --- linux/drivers/media/video/cx88/cx88-cards.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'linux/drivers') diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c index e8dcfa5e7..eac3508d6 100644 --- a/linux/drivers/media/video/cx88/cx88-cards.c +++ b/linux/drivers/media/video/cx88/cx88-cards.c @@ -1303,7 +1303,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, @@ -1327,6 +1326,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, }, @@ -1768,7 +1772,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:? @@ -1801,7 +1805,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, }, -- cgit v1.2.3