diff mbox

Leadtek WinFast PxPVR2200

Message ID AANLkTikJj2qAxWUust0t0UyG-uqqr+MnpVUCvEGg5NJj@mail.gmail.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Anca Emanuel Nov. 12, 2010, 10:31 p.m. UTC 
None
diff mbox

Patch

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/c
index db05400..5ee5afa 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -309,6 +309,23 @@  struct cx23885_board cx23885_boards[] = {
                                  CX25840_COMPONENT_ON,
                } },
        },
+       [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
+               .name           = "LEADTEK WinFast PxPVR2200",
+               .porta          = CX23885_ANALOG_VIDEO,
+               .portb          = CX23885_MPEG_ENCODER,
+               .tuner_type     = TUNER_XC2028,
+               .tuner_addr     = 0x61,
+               .input          = {{
+                       .type   = CX23885_VMUX_TELEVISION,
+                       .vmux   = CX25840_VIN2_CH1 |
+                                 CX25840_VIN5_CH2 |
+                                 CX25840_NONE0_CH3,
+               }, {
+                       .type   = CX23885_VMUX_SVIDEO,
+                       .vmux   = CX25840_SVIDEO_LUMA3 |
+                                 CX25840_SVIDEO_CHROMA4,
+               } },
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);

@@ -496,6 +513,10 @@  struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x107d,
                .subdevice = 0x6f22,
                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200,
+       }, {
+               .subvendor = 0x107d,
+               .subdevice = 0x6f21,
+               .card      = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -791,6 +812,7 @@  void cx23885_gpio_setup(struct cx23885_dev *dev)
                cx_set(GP0_IO, 0x00050005);
                break;
        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
                /* GPIO-0 TDA10048 demodulator reset */
                /* GPIO-2 TDA8295A Reset */
                /* GPIO-3-10 cx23417 data0-7 */
@@ -1218,6 +1240,7 @@  void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -1245,6 +1268,7 @@  void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_MAGICPRO_PROHDTVE2:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
        case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[2].i2c_adap,
                                NULL, "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885
index ed94b17..0dc8e44 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -84,6 +84,7 @@ 
 #define CX23885_BOARD_HAUPPAUGE_HVR1290        26
 #define CX23885_BOARD_MYGICA_X8558PRO          27
 #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 29

 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519
index 6cf6855..46c62ec 100644
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/c
index db05400..5ee5afa 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -309,6 +309,23 @@  struct cx23885_board cx23885_boards[] = {
                                  CX25840_COMPONENT_ON,
                } },
        },
+       [CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200] = {
+               .name           = "LEADTEK WinFast PxPVR2200",
+               .porta          = CX23885_ANALOG_VIDEO,
+               .portb          = CX23885_MPEG_ENCODER,
+               .tuner_type     = TUNER_XC2028,
+               .tuner_addr     = 0x61,
+               .input          = {{
+                       .type   = CX23885_VMUX_TELEVISION,
+                       .vmux   = CX25840_VIN2_CH1 |
+                                 CX25840_VIN5_CH2 |
+                                 CX25840_NONE0_CH3,
+               }, {
+                       .type   = CX23885_VMUX_SVIDEO,
+                       .vmux   = CX25840_SVIDEO_LUMA3 |
+                                 CX25840_SVIDEO_CHROMA4,
+               } },
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);

@@ -496,6 +513,10 @@  struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x107d,
                .subdevice = 0x6f22,
                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200,
+       }, {
+               .subvendor = 0x107d,
+               .subdevice = 0x6f21,
+               .card      = CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -791,6 +812,7 @@  void cx23885_gpio_setup(struct cx23885_dev *dev)
                cx_set(GP0_IO, 0x00050005);
                break;
        case CX23885_BOARD_HAUPPAUGE_HVR1700:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
                /* GPIO-0 TDA10048 demodulator reset */
                /* GPIO-2 TDA8295A Reset */
                /* GPIO-3-10 cx23417 data0-7 */
@@ -1218,6 +1240,7 @@  void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_HAUPPAUGE_HVR1850:
        case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -1245,6 +1268,7 @@  void cx23885_card_setup(struct cx23885_dev *dev)
        case CX23885_BOARD_MAGICPRO_PROHDTVE2:
        case CX23885_BOARD_HAUPPAUGE_HVR1290:
        case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
+       case CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200:
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[2].i2c_adap,
                                NULL, "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885
index ed94b17..0dc8e44 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -84,6 +84,7 @@ 
 #define CX23885_BOARD_HAUPPAUGE_HVR1290        26
 #define CX23885_BOARD_MYGICA_X8558PRO          27
 #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 29

 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
diff --git a/drivers/media/video/gspca/ov519.c b/drivers/media/video/gspca/ov519
index 6cf6855..46c62ec 100644
                                &dev->i2c_bus[2].i2c_adap,
                                NULL, "cx25840", 0x88 >> 1, NULL);
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885
index ed94b17..0dc8e44 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -84,6 +84,7 @@ 
 #define CX23885_BOARD_HAUPPAUGE_HVR1290        26
 #define CX23885_BOARD_MYGICA_X8558PRO          27
 #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
+#define CX23885_BOARD_LEADTEK_WINFAST_PXPVR2200 29

 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002