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>

diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 60ba66836038215952c9be46dcbff58edb19b319..0d93fa1ac25e344311ca53d71adb859c24984b52 100644 (file)
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -104,8 +104,8 @@
 103 -> Grand X-Guard / Trust 814PCI                        [0304:0102]
 104 -> Nebula Electronics DigiTV                           [0071:0101]
 105 -> ProVideo PV143                                      [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433]
-106 -> PHYTEC VD-009-X1 MiniDIN (bt878)
-107 -> PHYTEC VD-009-X1 Combi (bt878)
+106 -> PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)
+107 -> PHYTEC VD-009-X1 VD-011 Combi (bt878)
 108 -> PHYTEC VD-009 MiniDIN (bt878)
 109 -> PHYTEC VD-009 Combi (bt878)
 110 -> IVC-100                                             [ff00:a132]
@@ -151,3 +151,6 @@
 150 -> Geovision GV-600                                    [008a:763c]
 151 -> Kozumi KTV-01C
 152 -> Encore ENL TV-FM-2                                  [1000:1801]
+153 -> PHYTEC VD-012 (bt878)
+154 -> PHYTEC VD-012-X1 (bt878)
+155 -> PHYTEC VD-012-X2 (bt878)

diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 13742b0bbe3e10d61fa4970a445dd749a3702850..8629b77666f60feb241fdedb2b923fcdb535bf27 100644 (file)
--- 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,
        }
 };
 

diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index bc2c88499ab96c6b0c647c899b4358ddad130d24..529bf6cf634d9c76c039ac51320f30ac55eae8a1 100644 (file)
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -130,8 +130,8 @@
 #define BTTV_BOARD_XGUARD                  0x67
 #define BTTV_BOARD_NEBULA_DIGITV           0x68
 #define BTTV_BOARD_PV143                   0x69
-#define BTTV_BOARD_VD009X1_MINIDIN         0x6a
-#define BTTV_BOARD_VD009X1_COMBI           0x6b
+#define BTTV_BOARD_VD009X1_VD011_MINIDIN   0x6a
+#define BTTV_BOARD_VD009X1_VD011_COMBI     0x6b
 #define BTTV_BOARD_VD009_MINIDIN           0x6c
 #define BTTV_BOARD_VD009_COMBI             0x6d
 #define BTTV_BOARD_IVC100                  0x6e
@@ -177,6 +177,10 @@
 #define BTTV_BOARD_GEOVISION_GV600        0x96
 #define BTTV_BOARD_KOZUMI_KTV_01C          0x97
 #define BTTV_BOARD_ENLTV_FM_2             0x98
+#define BTTV_BOARD_VD012                  0x99
+#define BTTV_BOARD_VD012_X1               0x9a
+#define BTTV_BOARD_VD012_X2               0x9b
+
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10