diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-28 19:29:51 +0000 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2008-09-28 19:29:51 +0000 |
| commit | eac6920885b3ad819a23c8deef9ac38e2cc25579 (patch) | |
| tree | 0753f8133ea225d49fcffd8469b0a82b2507b9e9 /linux/drivers | |
| parent | 9a2e9a33f69b0dbd89336d07e08416f3c573e7ad (diff) | |
| download | mediapointer-dvb-s2-eac6920885b3ad819a23c8deef9ac38e2cc25579.tar.gz mediapointer-dvb-s2-eac6920885b3ad819a23c8deef9ac38e2cc25579.tar.bz2 | |
saa7134: Hauppauge HVR-1110, support for radio and analog audio in
From: David Bentham <db260179@hotmail.com>
The audio switch is at 0x100 and radio on gpio 21.
Priority: normal
Signed-off-by: David Bentham <db260179@hotmail.com>
Reviewed-by: Hermann Pitton <hermann-pitton@arcor.de>
Tested-by: Thomas Genty <tomlohave@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/drivers')
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 9280fb314..637465919 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -3299,6 +3299,7 @@ struct saa7134_board saa7134_boards[] = { }, [SAA7134_BOARD_HAUPPAUGE_HVR1110] = { /* Thomas Genty <tomlohave@gmail.com> */ + /* David Bentham <db260179@hotmail.com> */ .name = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, @@ -3307,23 +3308,26 @@ struct saa7134_board saa7134_boards[] = { .radio_addr = ADDR_UNSET, .tuner_config = 1, .mpeg = SAA7134_MPEG_DVB, + .gpiomask = 0x0200100, .inputs = {{ .name = name_tv, .vmux = 1, .amux = TV, .tv = 1, - },{ - .name = name_comp1, - .vmux = 3, - .amux = LINE2, /* FIXME: audio doesn't work on svideo/composite */ - },{ - .name = name_svideo, - .vmux = 8, - .amux = LINE2, /* FIXME: audio doesn't work on svideo/composite */ - }}, + .gpio = 0x0000100, + }, { + .name = name_comp1, + .vmux = 3, + .amux = LINE1, + }, { + .name = name_svideo, + .vmux = 8, + .amux = LINE1, + } }, .radio = { .name = name_radio, - .amux = TV, + .amux = TV, + .gpio = 0x0200100, }, }, [SAA7134_BOARD_CINERGY_HT_PCMCIA] = { |