Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9028f58f authored by Alexey Chernov's avatar Alexey Chernov Committed by Mauro Carvalho Chehab
Browse files

[media] support of GoTView PCI-E X5 3D Hybrid in cx23885 



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: default avatarAlexey Chernov <4ernov@gmail.com>
Reviewed-by: default avatarSteven Toth <stoth@kernellabs.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5f63306d

drivers/media/video/cx23885/cx23885-cards.c

+33 −0
Original line number Diff line number Diff line
@@ -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);

drivers/media/video/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -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