V4L/DVB (4088): Fixes for card cx88 #50

The description of the card has been updated to it's full name/model.
The tuner has also been switched to a more compatible one (radio
wasn't working, now it is)

Signed-off-by: Ricardo Cerqueira <v4l@cerqueira.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

4 files changed, 9 insertions, 8 deletions

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index f9636fd6bc3..19a0a6a4679 100644
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -48,5 +48,5 @@
  47 -> pcHDTV HD5500 HDTV                                  [7063:5500]
  48 -> Kworld MCE 200 Deluxe                               [17de:0841]
  49 -> PixelView PlayTV P7000                              [1554:4813]
- 50 -> NPG Tech Real TV                                    [14f1:0842]
+ 50 -> NPG Tech Real TV FM Top 10                          [14f1:0842]
  51 -> WinFast DTV2000 H                                   [107d:665e]
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 910171be00f..dab2fc37a5a 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1152,9 +1152,9 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .blackbird = 1,
         },
-        [CX88_BOARD_NPGTECH_REALTV] = {
-                .name           = "NPG Tech Real TV",
-                .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+        [CX88_BOARD_NPGTECH_REALTV_TOP10FM] = {
+                .name           = "NPG Tech Real TV FM Top 10",
+                .tuner_type     = TUNER_TNF_5335MF, /* Actually a TNF9535 */
                 .radio_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
@@ -1169,6 +1169,7 @@ struct cx88_board cx88_boards[] = {
                 },{
                         .type   = CX88_VMUX_SVIDEO,
                         .vmux   = 2,
+                        .gpio0  = 0x078b,
                 }},
                 .radio = {
                          .type  = CX88_RADIO,
@@ -1429,7 +1430,7 @@ struct cx88_subid cx88_subids[] = {
         },{
                 .subvendor = 0x14f1,
                 .subdevice = 0x0842,
-                .card      = CX88_BOARD_NPGTECH_REALTV,
+                .card      = CX88_BOARD_NPGTECH_REALTV_TOP10FM,
         },{
                 .subvendor = 0x107d,
                 .subdevice = 0x665e,
diff --git a/drivers/media/video/cx88/cx88-input.c b/drivers/media/video/cx88/cx88-input.c
index f599cfc5aba..1f5ccc95029 100644
--- a/drivers/media/video/cx88/cx88-input.c
+++ b/drivers/media/video/cx88/cx88-input.c
@@ -74,7 +74,7 @@ static void cx88_ir_handle_key(struct cx88_IR *ir)
 
         /* read gpio value */
         gpio = cx_read(ir->gpio_addr);
-        if (core->board == CX88_BOARD_NPGTECH_REALTV) {
+        if (core->board == CX88_BOARD_NPGTECH_REALTV_TOP10FM) {
                 /* This board apparently uses a combination of 2 GPIO
                    to represent the keys. Additionally, the second GPIO
                    can be used for parity.
@@ -248,7 +248,7 @@ int cx88_ir_init(struct cx88_core *core, struct pci_dev *pci)
                 ir_type = IR_TYPE_PD;
                 ir->sampling = 0xff00; /* address */
                 break;
-        case CX88_BOARD_NPGTECH_REALTV:
+        case CX88_BOARD_NPGTECH_REALTV_TOP10FM:
                 ir_codes = ir_codes_npgtech;
                 ir->gpio_addr = MO_GP0_IO;
                 ir->mask_keycode = 0xfa;
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index b9501295a41..f27d4df5b30 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -193,7 +193,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_PCHDTV_HD5500           47
 #define CX88_BOARD_KWORLD_MCE200_DELUXE    48
 #define CX88_BOARD_PIXELVIEW_PLAYTV_P7000  49
-#define CX88_BOARD_NPGTECH_REALTV          50
+#define CX88_BOARD_NPGTECH_REALTV_TOP10FM  50
 #define CX88_BOARD_WINFAST_DTV2000H        51
 
 enum cx88_itype {