Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / drivers / media / video / cx23885 / cx23885-cards.c

diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index 8861309268b170d8f6effd11b17365e11ea846a5..b298b730943c550498b7ec79055955a0a8fa5e33 100644 (file)
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -309,6 +309,26 @@ struct cx23885_board cx23885_boards[] = {
                                  CX25840_COMPONENT_ON,
                } },
        },
+       [CX23885_BOARD_GOTVIEW_X5_3D_HYBRID] = {
+               .name           = "GoTView X5 3D Hybrid",
+               .tuner_type     = TUNER_XC5000,
+               .tuner_addr     = 0x64,
+               .porta          = CX23885_ANALOG_VIDEO,
+               .portb          = CX23885_MPEG_DVB,
+               .input          = {{
+                       .type   = CX23885_VMUX_TELEVISION,
+                       .vmux   = CX25840_VIN2_CH1 |
+                                 CX25840_VIN5_CH2,
+                       .gpio0  = 0x02,
+               }, {
+                       .type   = CX23885_VMUX_COMPOSITE1,
+                       .vmux   = CX23885_VMUX_COMPOSITE1,
+               }, {
+                       .type   = CX23885_VMUX_SVIDEO,
+                       .vmux   = CX25840_SVIDEO_LUMA3 |
+                                 CX25840_SVIDEO_CHROMA4,
+               } },
+       },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -496,6 +516,10 @@ struct cx23885_subid cx23885_subids[] = {
                .subvendor = 0x107d,
                .subdevice = 0x6f22,
                .card      = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200,
+       }, {
+               .subvendor = 0x5654,
+               .subdevice = 0x2390,
+               .card      = CX23885_BOARD_GOTVIEW_X5_3D_HYBRID,
        },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -712,6 +736,10 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
                else if (port->nr == 2)
                        bitmask = 0x04;
                break;
+       case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
+               /* Tuner Reset Command */
+               bitmask = 0x02;
+               break;
        }
 
        if (bitmask) {
@@ -967,6 +995,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                /* CX24228 GPIO */
                /* Connected to IF / Mux */
                break;
+       case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
+               cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
+               break;
        }
 }
 
@@ -1218,6 +1249,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_GOTVIEW_X5_3D_HYBRID:
        default:
                ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -1245,6 +1277,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_GOTVIEW_X5_3D_HYBRID:
                dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                &dev->i2c_bus[2].i2c_adap,
                                "cx25840", 0x88 >> 1, NULL);