Re: [PATCH] support of GoTView PCI-E X5 3D Hybrid in cx23885

[4ernov <4ernov@xxxxxxxxx>]

Could anybody confirm this updated version, please?
Thanks in advance.

2010/12/6 Alexey Chernov <4ernov@xxxxxxxxx>:
> Another version of my patch without DVB code.
>
> Some comments:
> 1. Everything initialize properly except radio.
> 2. All analog inputs (TV, composite, S-Video) are tested by myself in several
> TV norms (SECAM-D, PAL, NTSC), everything work fine.
>
> So the patch adds general support/detection of the card with working analog
> part, DVB part is not supported for now.
>
> Signed-off-by: Alexey Chernov <4ernov@xxxxxxxxx>
>
> diff -upr v4l-dvb.orig/drivers/media/video/cx23885/cx23885-cards.c v4l-dvb/drivers/media/video/cx23885/cx23885-cards.c
> --- v4l-dvb.orig/drivers/media/video/cx23885/cx23885-cards.c  Â2010-12-03 00:16:09.000000000 +0300
> +++ v4l-dvb/drivers/media/video/cx23885/cx23885-cards.c 2010-12-06 22:25:56.000000000 +0300
> @@ -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, i
> Â Â Â Â Â Â Â Â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_d
> Â Â Â Â Â Â Â Â/* 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_d
> Â Â Â Â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_d
> Â Â Â Â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,
> Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â ÂNULL, "cx25840", 0x88 >> 1, NULL);
> diff -upr v4l-dvb.orig/drivers/media/video/cx23885/cx23885.h v4l-dvb/drivers/media/video/cx23885/cx23885.h
> --- v4l-dvb.orig/drivers/media/video/cx23885/cx23885.h Â2010-12-03 00:16:09.000000000 +0300
> +++ v4l-dvb/drivers/media/video/cx23885/cx23885.h    2010-12-06 22:27:41.000000000 +0300
> @@ -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_GOTVIEW_X5_3D_HYBRID Â Â 29
>
> Â#define GPIO_0 0x00000001
> Â#define GPIO_1 0x00000002
>
ÿô.nlj·Ÿ®‰­†+%ŠË±é¥Šwÿº{.nlj·¥Š{±þg‰¯â^n‡r¡öë¨è&£ûz¹Þúzf£¢·hšˆ§~†­†Ûÿÿïÿ‘ê_èæ+v‰¨þ)ßø