[media] Add analog support for Pixelvied Hybrid SBTVD (9417bc6d) · Commits · jan.koester / Linux

drivers/media/video/cx231xx/cx231xx-avcore.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -354,6 +354,7 @@ int cx231xx_afe_update_power_control(struct cx231xx *dev,
		case CX231XX_BOARD_CNXT_VIDEO_GRABBER:
		case CX231XX_BOARD_HAUPPAUGE_EXETER:
		case CX231XX_BOARD_HAUPPAUGE_USBLIVE2:
		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
		if (avmode == POLARIS_AVMODE_ANALOGT_TV) {
		while (afe_power_status != (FLD_PWRDN_TUNING_BIAS \|
		FLD_PWRDN_ENABLE_PLL)) {

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

+39 −2

Original line number	Diff line number	Diff line
		@@ -395,6 +395,43 @@ struct cx231xx_board cx231xx_boards[] = {
		.gpio = 0,
		} },
		},
		[CX231XX_BOARD_PV_PLAYTV_USB_HYBRID] = {
		.name = "Pixelview PlayTV USB Hybrid",
		.tuner_type = TUNER_NXP_TDA18271,
		.tuner_addr = 0x60,
		.decoder = CX231XX_AVDECODER,
		.output_mode = OUT_MODE_VIP11,
		.demod_xfer_mode = 0,
		.ctl_pin_status_mask = 0xFFFFFFC4,
		.agc_analog_digital_select_gpio = 0x00, /* According with PV cxPolaris.inf file */
		.tuner_sif_gpio = -1,
		.tuner_scl_gpio = -1,
		.tuner_sda_gpio = -1,
		.gpio_pin_status_mask = 0x4001000,
		.tuner_i2c_master = 2,
		.demod_i2c_master = 1,
		.has_dvb = 0, /* FIXME: need driver for mb86a20s */
		.demod_addr = 0x10,
		.norm = V4L2_STD_PAL_M,
		.input = {{
		.type = CX231XX_VMUX_TELEVISION,
		.vmux = CX231XX_VIN_3_1,
		.amux = CX231XX_AMUX_VIDEO,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_COMPOSITE1,
		.vmux = CX231XX_VIN_2_1,
		.amux = CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		}, {
		.type = CX231XX_VMUX_SVIDEO,
		.vmux = CX231XX_VIN_1_1 \|
		(CX231XX_VIN_1_2 << 8) \|
		CX25840_SVIDEO_ON,
		.amux = CX231XX_AMUX_LINE_IN,
		.gpio = 0,
		} },
		},
		};
		const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);

		@@ -402,8 +439,6 @@ const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
		struct usb_device_id cx231xx_id_table[] = {
		{USB_DEVICE(0x0572, 0x5A3C),
		.driver_info = CX231XX_BOARD_UNKNOWN},
		{USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000,0x4fff),
		.driver_info = CX231XX_BOARD_UNKNOWN},
		{USB_DEVICE(0x0572, 0x58A2),
		.driver_info = CX231XX_BOARD_CNXT_CARRAERA},
		{USB_DEVICE(0x0572, 0x58A1),
		@@ -424,6 +459,8 @@ struct usb_device_id cx231xx_id_table[] = {
		.driver_info = CX231XX_BOARD_HAUPPAUGE_EXETER},
		{USB_DEVICE(0x2040, 0xc200),
		.driver_info = CX231XX_BOARD_HAUPPAUGE_USBLIVE2},
		{USB_DEVICE_VER(USB_VID_PIXELVIEW, USB_PID_PIXELVIEW_SBTVD, 0x4000, 0x4001),
		.driver_info = CX231XX_BOARD_PV_PLAYTV_USB_HYBRID},
		{},
		};

drivers/media/video/cx231xx/cx231xx-core.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -719,6 +719,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)
		break;
		case CX231XX_BOARD_CNXT_RDE_253S:
		case CX231XX_BOARD_CNXT_RDU_253S:
		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
		errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 1);
		break;
		case CX231XX_BOARD_HAUPPAUGE_EXETER:
		@@ -740,6 +741,7 @@ int cx231xx_set_mode(struct cx231xx *dev, enum cx231xx_mode set_mode)
		case CX231XX_BOARD_CNXT_RDE_253S:
		case CX231XX_BOARD_CNXT_RDU_253S:
		case CX231XX_BOARD_HAUPPAUGE_EXETER:
		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
		errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
		break;
		default:
		@@ -1381,6 +1383,7 @@ int cx231xx_dev_init(struct cx231xx *dev)
		case CX231XX_BOARD_CNXT_RDE_253S:
		case CX231XX_BOARD_CNXT_RDU_253S:
		case CX231XX_BOARD_HAUPPAUGE_EXETER:
		case CX231XX_BOARD_PV_PLAYTV_USB_HYBRID:
		errCode = cx231xx_set_agc_analog_digital_mux_select(dev, 0);
		break;
		default:

drivers/media/video/cx231xx/cx231xx.h

+1 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,7 @@
		#define CX231XX_BOARD_CNXT_RDU_250 7
		#define CX231XX_BOARD_HAUPPAUGE_EXETER 8
		#define CX231XX_BOARD_HAUPPAUGE_USBLIVE2 9
		#define CX231XX_BOARD_PV_PLAYTV_USB_HYBRID 10

		/* Limits minimum and default number of buffers */
		#define CX231XX_MIN_BUF 4