V4L/DVB (7288): cx88: fix GPIO for FusionHDTV 7 Gold input selection

Fix GPIO for FusionHDTV 7 Gold tv / s-video / composite input selection.
Fix card textual name to match other FusionHDTV device names.

Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index b5f2134f16647798656bef5a927de1986205c0fe..da7f70dfad2a841dc9a2ed55537e1112bb2ad845 100644 (file)
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -63,4 +63,4 @@
  62 -> PowerColor Real Angel 330                           [14f1:ea3d]
  63 -> Geniatech X8000-MT DVBT                             [14f1:8852]
  64 -> DViCO FusionHDTV DVB-T PRO                          [18ac:db30]
- 65 -> DVICO FusionHDTV7 Gold                              [18ac:d610]
+ 65 -> DViCO FusionHDTV 7 Gold                             [18ac:d610]

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 8e29e48a86f3033c29a7cbf223fbdc027056f188..7a2b0f26921a60a32dcedd64260679cd1f51380d 100644 (file)
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1572,7 +1572,7 @@ static const struct cx88_board cx88_boards[] = {
               .mpeg           = CX88_MPEG_DVB,
        },
        [CX88_BOARD_DVICO_FUSIONHDTV_7_GOLD] = {
-               .name           = "DVICO FusionHDTV7 Gold",
+               .name           = "DViCO FusionHDTV 7 Gold",
                .tuner_type     = TUNER_XC5000,
                .radio_type     = UNSET,
                .tuner_addr     = ADDR_UNSET,
@@ -1580,15 +1580,15 @@ static const struct cx88_board cx88_boards[] = {
                .input          = {{
                        .type   = CX88_VMUX_TELEVISION,
                        .vmux   = 0,
-                       .gpio0  = 0x37df,
+                       .gpio0  = 0x10df,
                },{
                        .type   = CX88_VMUX_COMPOSITE1,
                        .vmux   = 1,
-                       .gpio0  = 0x37df,
+                       .gpio0  = 0x16d9,
                },{
                        .type   = CX88_VMUX_SVIDEO,
                        .vmux   = 2,
-                       .gpio0  = 0x37df,
+                       .gpio0  = 0x16d9,
                }},
        },
 };