Hi,
Am Sonntag, den 28.09.2008, 01:43 -0300 schrieb Mauro Carvalho Chehab:
> On Sat, 27 Sep 2008 06:39:54 +0200
> hermann pitton <hermann-pitton@xxxxxxxx> wrote:
>
> > Mauro,
> >
> > wait a little.
>
> OK. Please forward it to me again, after everything being ok with the patch.
>
> Cheers,
> Mauro
Thomas mailed me that he has some trouble with his current setup and
might not be able to test that soon too.
The patch is already OK and tested by David.
David,
as told, we need also your email in signed-off-by.
I take it from the card's entry. Please give your OK.
Here is it again with some cleanup for spaces.
Mauro, please take it from the attachment.
Evolution inline converts tabs to spaces or I must force it into a mode
it does not like.
Cheers,
Hermann
saa7134: Hauppauge HVR-1110, support for radio and analog audio in
From: David Bentham <db260179@xxxxxxxxxxx>
The audio switch is at 0x100 and radio on gpio 21.
Priority: normal
Signed-off-by: David Bentham <db260179@xxxxxxxxxxx>
Reviewed-by: Hermann Pitton <hermann-pitton@xxxxxxxx>
diff -r 8e6cda021e0e linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Fri Sep 26 11:29:03 2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Sep 28 17:21:45 2008 +0200
@@ -3299,6 +3299,7 @@
},
[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
/* Thomas Genty <tomlohave@xxxxxxxxx> */
+ /* David Bentham <db260179@xxxxxxxxxxx> */
.name = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
@@ -3307,23 +3308,26 @@
.radio_addr = ADDR_UNSET,
.tuner_config = 1,
.mpeg = SAA7134_MPEG_DVB,
- .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 */
- }},
- .radio = {
- .name = name_radio,
- .amux = TV,
+ .gpiomask = 0x0200100,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = TV,
+ .tv = 1,
+ .gpio = 0x0000100,
+ }, {
+ .name = name_comp1,
+ .vmux = 3,
+ .amux = LINE1,
+ }, {
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ } },
+ .radio = {
+ .name = name_radio,
+ .amux = TV,
+ .gpio = 0x0200100,
},
},
[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
diff -r 8e6cda021e0e linux/drivers/media/video/saa7134/saa7134-cards.c
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c Fri Sep 26 11:29:03 2008 +0200
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c Sun Sep 28 17:21:45 2008 +0200
@@ -3299,6 +3299,7 @@
},
[SAA7134_BOARD_HAUPPAUGE_HVR1110] = {
/* Thomas Genty <tomlohave@xxxxxxxxx> */
+ /* David Bentham <db260179@xxxxxxxxxxx> */
.name = "Hauppauge WinTV-HVR1110 DVB-T/Hybrid",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
@@ -3307,23 +3308,26 @@
.radio_addr = ADDR_UNSET,
.tuner_config = 1,
.mpeg = SAA7134_MPEG_DVB,
- .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 */
- }},
- .radio = {
- .name = name_radio,
- .amux = TV,
+ .gpiomask = 0x0200100,
+ .inputs = {{
+ .name = name_tv,
+ .vmux = 1,
+ .amux = TV,
+ .tv = 1,
+ .gpio = 0x0000100,
+ }, {
+ .name = name_comp1,
+ .vmux = 3,
+ .amux = LINE1,
+ }, {
+ .name = name_svideo,
+ .vmux = 8,
+ .amux = LINE1,
+ } },
+ .radio = {
+ .name = name_radio,
+ .amux = TV,
+ .gpio = 0x0200100,
},
},
[SAA7134_BOARD_CINERGY_HT_PCMCIA] = {
_______________________________________________
linux-dvb mailing list
linux-dvb@xxxxxxxxxxx
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linux-dvb
