V4L/DVB (11950): cx18: Split LeadTek PVR2100 and DVR3100 H into 2 separate card entries (9d5af862) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+58 −3

Original line number	Original line	Diff line number	Diff line
	@@ -340,13 +340,12 @@ static const struct cx18_card cx18_card_toshiba_qosmio_dvbt = {

	static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {		static const struct cx18_card_pci_info cx18_pci_leadtek_pvr2100[] = {
	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 }, /* PVR2100 */		{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6f27 }, /* PVR2100 */
	{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6690 }, /* DVR3100 H */
	{ 0, 0, 0 }		{ 0, 0, 0 }
	};		};

	static const struct cx18_card cx18_card_leadtek_pvr2100 = {		static const struct cx18_card cx18_card_leadtek_pvr2100 = {
	.type = CX18_CARD_LEADTEK_PVR2100,		.type = CX18_CARD_LEADTEK_PVR2100,
	.name = "Leadtek WinFast PVR2100/DVR3100 H",		.name = "Leadtek WinFast PVR2100",
	.comment = "Experimenters and photos needed for device to work well.\n"		.comment = "Experimenters and photos needed for device to work well.\n"
	"\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",		"\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
	.v4l2_capabilities = CX18_CAP_ENCODER,		.v4l2_capabilities = CX18_CAP_ENCODER,
	@@ -365,7 +364,7 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = {
	{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },		{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },
	},		},
	.tuners = {		.tuners = {
	/* XC3028 tuner */		/* XC2028 tuner */
	{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },		{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
	},		},
	.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },		.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },
	@@ -392,6 +391,61 @@ static const struct cx18_card cx18_card_leadtek_pvr2100 = {

	/* ------------------------------------------------------------------------- */		/* ------------------------------------------------------------------------- */

			/* Leadtek WinFast DVR3100 H */

			static const struct cx18_card_pci_info cx18_pci_leadtek_dvr3100h[] = {
			{ PCI_DEVICE_ID_CX23418, CX18_PCI_ID_LEADTEK, 0x6690 }, /* DVR3100 H */
			{ 0, 0, 0 }
			};

			static const struct cx18_card cx18_card_leadtek_dvr3100h = {
			.type = CX18_CARD_LEADTEK_DVR3100H,
			.name = "Leadtek WinFast DVR3100 H",
			.comment = "Experimenters and photos needed for device to work well.\n"
			"\tTo help, mail the ivtv-devel list (www.ivtvdriver.org).\n",
			.v4l2_capabilities = CX18_CAP_ENCODER,
			.hw_audio_ctrl = CX18_HW_418_AV,
			.hw_muxer = CX18_HW_GPIO_MUX,
			.hw_all = CX18_HW_418_AV \| CX18_HW_TUNER \| CX18_HW_GPIO_MUX \|
			CX18_HW_GPIO_RESET_CTRL,
			.video_inputs = {
			{ CX18_CARD_INPUT_VID_TUNER, 0, CX18_AV_COMPOSITE2 },
			{ CX18_CARD_INPUT_SVIDEO1, 1,
			CX18_AV_SVIDEO_LUMA3 \| CX18_AV_SVIDEO_CHROMA4 },
			{ CX18_CARD_INPUT_COMPOSITE1, 1, CX18_AV_COMPOSITE7 },
			},
			.audio_inputs = {
			{ CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 0 },
			{ CX18_CARD_INPUT_LINE_IN1, CX18_AV_AUDIO_SERIAL1, 1 },
			},
			.tuners = {
			/* XC3028 tuner */
			{ .std = V4L2_STD_ALL, .tuner = TUNER_XC2028 },
			},
			.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO5, 2 },
			.ddr = {
			/*
			* Pointer to proper DDR config values provided by
			* Terry Wu <terrywu at leadtek.com.tw>
			*/
			.chip_config = 0x303,
			.refresh = 0x3bb,
			.timing1 = 0x24220e83,
			.timing2 = 0x1f,
			.tune_lane = 0,
			.initial_emrs = 0x2,
			},
			.gpio_init.initial_value = 0x6,
			.gpio_init.direction = 0x7,
			.gpio_audio_input = { .mask = 0x7,
			.tuner = 0x6, .linein = 0x2, .radio = 0x2 },
			.xceive_pin = 15,
			.pci_list = cx18_pci_leadtek_dvr3100h,
			.i2c = &cx18_i2c_std,
			};

			/* ------------------------------------------------------------------------- */

	static const struct cx18_card *cx18_card_list[] = {		static const struct cx18_card *cx18_card_list[] = {
	&cx18_card_hvr1600_esmt,		&cx18_card_hvr1600_esmt,
	&cx18_card_hvr1600_samsung,		&cx18_card_hvr1600_samsung,
	@@ -400,6 +454,7 @@ static const struct cx18_card *cx18_card_list[] = {
	&cx18_card_cnxt_raptor_pal,		&cx18_card_cnxt_raptor_pal,
	&cx18_card_toshiba_qosmio_dvbt,		&cx18_card_toshiba_qosmio_dvbt,
	&cx18_card_leadtek_pvr2100,		&cx18_card_leadtek_pvr2100,
			&cx18_card_leadtek_dvr3100h,
	};		};

	const struct cx18_card *cx18_get_card(u16 index)		const struct cx18_card *cx18_get_card(u16 index)

drivers/media/video/cx18/cx18-driver.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -152,7 +152,8 @@ MODULE_PARM_DESC(cardtype,
	"\t\t\t 4 = Yuan MPC718\n"		"\t\t\t 4 = Yuan MPC718\n"
	"\t\t\t 5 = Conexant Raptor PAL/SECAM\n"		"\t\t\t 5 = Conexant Raptor PAL/SECAM\n"
	"\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"		"\t\t\t 6 = Toshiba Qosmio DVB-T/Analog\n"
	"\t\t\t 7 = Leadtek WinFast PVR2100/DVR3100 H\n"		"\t\t\t 7 = Leadtek WinFast PVR2100\n"
			"\t\t\t 8 = Leadtek WinFast DVR3100 H\n"
	"\t\t\t 0 = Autodetect (default)\n"		"\t\t\t 0 = Autodetect (default)\n"
	"\t\t\t-1 = Ignore this card\n\t\t");		"\t\t\t-1 = Ignore this card\n\t\t");
	MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");		MODULE_PARM_DESC(pal, "Set PAL standard: B, G, H, D, K, I, M, N, Nc, 60");

drivers/media/video/cx18/cx18-driver.h

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -80,8 +80,9 @@
	#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */		#define CX18_CARD_YUAN_MPC718 3 /* Yuan MPC718 */
	#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */		#define CX18_CARD_CNXT_RAPTOR_PAL 4 /* Conexant Raptor PAL */
	#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/		#define CX18_CARD_TOSHIBA_QOSMIO_DVBT 5 /* Toshiba Qosmio Interal DVB-T/Analog*/
	#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100/DVR3100 H */		#define CX18_CARD_LEADTEK_PVR2100 6 /* Leadtek WinFast PVR2100 */
	#define CX18_CARD_LAST 6		#define CX18_CARD_LEADTEK_DVR3100H 7 /* Leadtek WinFast DVR3100 H */
			#define CX18_CARD_LAST 7

	#define CX18_ENC_STREAM_TYPE_MPG 0		#define CX18_ENC_STREAM_TYPE_MPG 0
	#define CX18_ENC_STREAM_TYPE_TS 1		#define CX18_ENC_STREAM_TYPE_TS 1