[media] bttv: Add support for Kworld V-Stream Xpert TV PVR878

New board addition. No other changes.

[m.chehab@samsung.com: rebase patch and fix whitespace mangling]
Signed-off-by: Pojar George <geoubuntu@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>

3 files changed, 18 insertions, 1 deletions

diff --git a/drivers/media/pci/bt8xx/bttv-cards.c b/drivers/media/pci/bt8xx/bttv-cards.c
index 6662b495b22c..d06963b3dcf3 100644
--- a/drivers/media/pci/bt8xx/bttv-cards.c
+++ b/drivers/media/pci/bt8xx/bttv-cards.c
@@ -2855,7 +2855,22 @@ struct tvcard bttv_tvcards[] = {
                 .tuner_type     = TUNER_ABSENT,
                 .tuner_addr     = ADDR_UNSET,
         },
-
+        [BTTV_BOARD_KWORLD_VSTREAM_XPERT] = {
+                /* Pojar George <geoubuntu@gmail.com> */
+                .name           = "Kworld V-Stream Xpert TV PVR878",
+                .video_inputs   = 3,
+                /* .audio_inputs= 1, */
+                .svhs           = 2,
+                .gpiomask       = 0x001c0007,
+                .muxsel         = MUXSEL(2, 3, 1, 1),
+                .gpiomux        = { 0, 1, 2, 2 },
+                .gpiomute       = 3,
+                .pll            = PLL_28,
+                .tuner_type     = TUNER_TENA_9533_DI,
+                .tuner_addr    = ADDR_UNSET,
+                .has_remote     = 1,
+                .has_radio      = 1,
+        },
 };
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/pci/bt8xx/bttv-input.c b/drivers/media/pci/bt8xx/bttv-input.c
index f36821367d8d..5930bce16658 100644
--- a/drivers/media/pci/bt8xx/bttv-input.c
+++ b/drivers/media/pci/bt8xx/bttv-input.c
@@ -483,6 +483,7 @@ int bttv_input_init(struct bttv *btv)
         case BTTV_BOARD_ASKEY_CPH03X:
         case BTTV_BOARD_CONCEPTRONIC_CTVFMI2:
         case BTTV_BOARD_CONTVFMI:
+        case BTTV_BOARD_KWORLD_VSTREAM_XPERT:
                 ir_codes         = RC_MAP_PIXELVIEW;
                 ir->mask_keycode = 0x001F00;
                 ir->mask_keyup   = 0x006000;
diff --git a/drivers/media/pci/bt8xx/bttv.h b/drivers/media/pci/bt8xx/bttv.h
index df578efe03c9..bb5da349a46e 100644
--- a/drivers/media/pci/bt8xx/bttv.h
+++ b/drivers/media/pci/bt8xx/bttv.h
@@ -188,6 +188,7 @@
 #define BTTV_BOARD_ADLINK_MPG24            0xa2
 #define BTTV_BOARD_BT848_CAP_14            0xa3
 #define BTTV_BOARD_CYBERVISION_CV06        0xa4
+#define BTTV_BOARD_KWORLD_VSTREAM_XPERT    0xa5
 
 /* more card-specific defines */
 #define PT2254_L_CHANNEL 0x10