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>

diff --git a/Documentation/video4linux/CARDLIST.cx88 b/Documentation/video4linux/CARDLIST.cx88
index db091e8172277129d9177aa68334a41f193d6f63..249885c6c66266c4f0bc92ee308a5ef2396cd283 100644 (file)
--- a/Documentation/video4linux/CARDLIST.cx88
+++ b/Documentation/video4linux/CARDLIST.cx88
@@ -47,3 +47,4 @@
  46 -> DViCO FusionHDTV DVB-T Hybrid                       [18ac:db40,18ac:db44]
  47 -> pcHDTV HD5500 HDTV                                  [7063:5500]
  48 -> Kworld MCE 200 Deluxe                               [17de:0841]
+ 49 -> PixelView PlayTV P7000                              [1554:4813]

diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index 7199169cd14fb9f2214cc84ed763240f87330baa..16cd6434f2b14424b61da0d9d99c4b1b3ddec27b 100644 (file)
--- 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 04d0635695d7b0f6dca530132bc16f174dac5bd2..256ae8515d2be79909ddce6d76da91c05ff19fd9 100644 (file)
--- 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 411bb9f39c779495a100989cd4cff609f2079fea..663def46f67c429aba37205005e4f452fdf2003e 100644 (file)
--- 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,