V4L/DVB (4016): Cx88-blackbird: add support for ProLink Pixelview Playtv@P7000

- Add support for ProLink Pixelview Playtv@P7000
Raw video and MPEG encoded video confirmed to work properly.
SVideo, Composite and FM inputs are untested - disabled for now.

Signed-off-by: Angelo Marconi <am@massalombarda.net>
Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

3 files changed, 22 insertions, 0 deletions

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 7199169cd14f..16cd6434f2b1 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -1132,6 +1132,22 @@ struct cx88_board cx88_boards[] = {
                 }},
                 .blackbird = 1,
         },
+        [CX88_BOARD_PIXELVIEW_PLAYTV_P7000] = {
+                /* FIXME: SVideo, Composite and FM inputs are untested */
+                .name           = "PixelView PlayTV P7000",
+                .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE |
+                                  TDA9887_PORT2_ACTIVE,
+                .input          = {{
+                        .type   = CX88_VMUX_TELEVISION,
+                        .vmux   = 0,
+                        .gpio0  = 0x5da6,
+                }},
+                .blackbird = 1,
+        },
 };
 const unsigned int cx88_bcount = ARRAY_SIZE(cx88_boards);
 
@@ -1361,6 +1377,10 @@ struct cx88_subid cx88_subids[] = {
                 .subvendor = 0x1822,
                 .subdevice = 0x0019,
                 .card      = CX88_BOARD_DNTV_LIVE_DVB_T_PRO,
+        },{
+                .subvendor = 0x1554,
+                .subdevice = 0x4813,
+                .card      = CX88_BOARD_PIXELVIEW_PLAYTV_P7000,
         },
 };
 const unsigned int cx88_idcount = ARRAY_SIZE(cx88_subids);
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index 04d0635695d7..256ae8515d2b 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -152,6 +152,7 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
                 case CX88_BOARD_HAUPPAUGE_ROSLYN:
                 case CX88_BOARD_KWORLD_MCE200_DELUXE:
                 case CX88_BOARD_KWORLD_HARDWARE_MPEG_TV_XPERT:
+                case CX88_BOARD_PIXELVIEW_PLAYTV_P7000:
                         cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
                         break;
                 default:
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 411bb9f39c77..663def46f67c 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -191,6 +191,7 @@ extern struct sram_channel cx88_sram_channels[];
 #define CX88_BOARD_DVICO_FUSIONHDTV_DVB_T_HYBRID 46
 #define CX88_BOARD_PCHDTV_HD5500           47
 #define CX88_BOARD_KWORLD_MCE200_DELUXE    48
+#define CX88_BOARD_PIXELVIEW_PLAYTV_P7000  49
 
 enum cx88_itype {
         CX88_VMUX_COMPOSITE1 = 1,