summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <devnull@localhost>2005-08-05 20:30:59 +0000
committerMichael Krufky <devnull@localhost>2005-08-05 20:30:59 +0000
commitb69ca9b39c300aa97f78fb79261c5d41faaf7153 (patch)
tree4de0431ea009045b30f3c3744de97d441c34696f
parent66832767b8282205c3162fb2f441ed462ee9ffa6 (diff)
downloadmediapointer-dvb-s2-b69ca9b39c300aa97f78fb79261c5d41faaf7153.tar.gz
mediapointer-dvb-s2-b69ca9b39c300aa97f78fb79261c5d41faaf7153.tar.bz2
- Corrected GPIO values for cards #28 & #31 for s-video and composite.
- added tda9887_conf to DViCO FusionHDTV5 Gold (card #31). Signed-off-by: Michael Krufky <mkrufky@m1k.net>
-rw-r--r--linux/drivers/media/video/cx88/cx88-cards.c15
-rw-r--r--v4l/ChangeLog7
2 files changed, 15 insertions, 7 deletions
diff --git a/linux/drivers/media/video/cx88/cx88-cards.c b/linux/drivers/media/video/cx88/cx88-cards.c
index 93c4b2ebf..3e4cc62e5 100644
--- a/linux/drivers/media/video/cx88/cx88-cards.c
+++ b/linux/drivers/media/video/cx88/cx88-cards.c
@@ -1,5 +1,5 @@
/*
- * $Id: cx88-cards.c,v 1.91 2005/08/04 03:37:22 mkrufky Exp $
+ * $Id: cx88-cards.c,v 1.92 2005/08/05 20:30:59 mkrufky Exp $
*
* device driver for Conexant 2388x based TV cards
* card-specific stuff.
@@ -612,12 +612,12 @@ struct cx88_board cx88_boards[] = {
.input = {{
.type = CX88_VMUX_TELEVISION,
.vmux = 0,
- .gpio0 = 0xed12, // internal decoder
+ .gpio0 = 0xed12, /* internal decoder */
.gpio2 = 0x00ff,
},{
.type = CX88_VMUX_DEBUG,
.vmux = 0,
- .gpio0 = 0xff01, // mono from tuner chip
+ .gpio0 = 0xff01, /* mono from tuner chip */
},{
.type = CX88_VMUX_COMPOSITE1,
.vmux = 1,
@@ -720,11 +720,11 @@ struct cx88_board cx88_boards[] = {
},{
.type = CX88_VMUX_COMPOSITE1,
.vmux = 1,
- .gpio0 = 0x97e0,
+ .gpio0 = 0x97e9,
},{
.type = CX88_VMUX_SVIDEO,
.vmux = 2,
- .gpio0 = 0x97e0,
+ .gpio0 = 0x97e9,
}},
.dvb = 1,
},
@@ -762,6 +762,7 @@ struct cx88_board cx88_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
+ .tda9887_conf = TDA9887_PRESENT,
.input = {{
.type = CX88_VMUX_TELEVISION,
.vmux = 0,
@@ -769,11 +770,11 @@ struct cx88_board cx88_boards[] = {
},{
.type = CX88_VMUX_COMPOSITE1,
.vmux = 1,
- .gpio0 = 0x87f0,
+ .gpio0 = 0x87f9,
},{
.type = CX88_VMUX_SVIDEO,
.vmux = 2,
- .gpio0 = 0x87f0,
+ .gpio0 = 0x87f9,
}},
#if 0
.dvb = 1,
diff --git a/v4l/ChangeLog b/v4l/ChangeLog
index 652f162bc..c1506d03c 100644
--- a/v4l/ChangeLog
+++ b/v4l/ChangeLog
@@ -1,3 +1,10 @@
+2005-08-05 08:26 mkrufky
+ * cx88-cards.c:
+ - Corrected GPIO values for cards #28 & #31 for s-video and composite.
+ - added tda9887_conf to DViCO FusionHDTV5 Gold (card #31).
+
+ Signed-off-by: Michael Krufky <mkrufky@m1k.net>
+
2005-08-04 04:00 nshmyrev
* saa7134-card.c, saa7134.h, tuner.h, tuner-simple.c:
- Add new Digimatrix card and LG TAPC Mini tuner for it