V4L/DVB (9677): bttv: fix some entries on Phytec boards and add missing ones

This Patch does modify the bttv-cards.c and bttc.h so that the driver
supports VD-011, VD-012, VD-012-X1 and VD-012-X2 Framegrabber from
Phytec Messtechnik GmbH.

Signed-off-by: Dirk Heer <d.heer@phytec.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 54 insertions, 6 deletions

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 13742b0bbe3e..8629b77666f6 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2217,9 +2217,9 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
-        [BTTV_BOARD_VD009X1_MINIDIN] = {
+        [BTTV_BOARD_VD009X1_VD011_MINIDIN] = {
                 /* M.Klahr@phytec.de */
-                .name           = "PHYTEC VD-009-X1 MiniDIN (bt878)",
+                .name           = "PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
                 .tuner          = UNSET, /* card has no tuner */
@@ -2227,14 +2227,14 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 0 },
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 1,
+                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
                 .radio_addr     = ADDR_UNSET,
         },
-        [BTTV_BOARD_VD009X1_COMBI] = {
-                .name           = "PHYTEC VD-009-X1 Combi (bt878)",
+        [BTTV_BOARD_VD009X1_VD011_COMBI] = {
+                .name           = "PHYTEC VD-009-X1 VD-011 Combi (bt878)",
                 .video_inputs   = 4,
                 .audio_inputs   = 0,
                 .tuner          = UNSET, /* card has no tuner */
@@ -2242,7 +2242,7 @@ struct tvcard bttv_tvcards[] = {
                 .gpiomask       = 0x00,
                 .muxsel         = { 2, 3, 1, 1 },
                 .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
-                .needs_tvaudio  = 1,
+                .needs_tvaudio  = 0,
                 .pll            = PLL_28,
                 .tuner_type     = UNSET,
                 .tuner_addr     = ADDR_UNSET,
@@ -3061,6 +3061,54 @@ struct tvcard bttv_tvcards[] = {
                 .pll            = PLL_28,
                 .has_radio      = 1,
                 .has_remote     = 1,
+        },
+                [BTTV_BOARD_VD012] = {
+                /* D.Heer@Phytec.de */
+                .name           = "PHYTEC VD-012 (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = UNSET, /* card has no tuner */
+                .svhs           = UNSET, /* card has no s-video */
+                .gpiomask       = 0x00,
+                .muxsel         = { 0, 2, 3, 1 },
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+                [BTTV_BOARD_VD012_X1] = {
+                /* D.Heer@Phytec.de */
+                .name           = "PHYTEC VD-012-X1 (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = UNSET, /* card has no tuner */
+                .svhs           = 3,
+                .gpiomask       = 0x00,
+                .muxsel         = { 2, 3, 1 },
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+        },
+                [BTTV_BOARD_VD012_X2] = {
+                /* D.Heer@Phytec.de */
+                .name           = "PHYTEC VD-012-X2 (bt878)",
+                .video_inputs   = 4,
+                .audio_inputs   = 0,
+                .tuner          = UNSET, /* card has no tuner */
+                .svhs           = 3,
+                .gpiomask       = 0x00,
+                .muxsel         = { 3, 2, 1 },
+                .gpiomux        = { 0, 0, 0, 0 }, /* card has no audio */
+                .needs_tvaudio  = 0,
+                .pll            = PLL_28,
+                .tuner_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
         }
 };