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

Commit af469b37 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media fixes from Mauro Carvalho Chehab:
  - fix some race conditions caused by a regression on videobuf2
  - fix a interrupt release bug on cx23885
  - fix support for Mygica T230 and HVR4400
  - fix compilation breakage when USB is not selected on tlg2300
  - fix capabilities report on ompa3isp, soc-camera, rcar_vin and
    pvrusb2

* tag 'media/v3.19-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] omap3isp: Correctly set QUERYCAP capabilities
  [media] cx23885: fix free interrupt bug
  [media] pvrusb2: fix missing device_caps in querycap
  [media] vb2: fix vb2_thread_stop race conditions
  [media] rcar_vin: Update device_caps and capabilities in querycap
  [media] soc-camera: fix device capabilities in multiple camera host drivers
  [media] Fix Mygica T230 support
  [media] cx23885: Split Hauppauge WinTV Starburst from HVR4400 card entry
  [media] tlg2300: Fix media dependencies
parents c4e00f1d 2c0108e1

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

+17 −6
Original line number Diff line number Diff line
@@ -614,7 +614,7 @@ struct cx23885_board cx23885_boards[] = { 
		.portb		= CX23885_MPEG_DVB,

	},

	[CX23885_BOARD_HAUPPAUGE_HVR4400] = {

		.name		= "Hauppauge WinTV-HVR4400",

		.name		= "Hauppauge WinTV-HVR4400/HVR5500",

		.porta		= CX23885_ANALOG_VIDEO,

		.portb		= CX23885_MPEG_DVB,

		.portc		= CX23885_MPEG_DVB,
@@ -622,6 +622,10 @@ struct cx23885_board cx23885_boards[] = { 
		.tuner_addr	= 0x60, /* 0xc0 >> 1 */

		.tuner_bus	= 1,

	},

	[CX23885_BOARD_HAUPPAUGE_STARBURST] = {

		.name		= "Hauppauge WinTV Starburst",

		.portb		= CX23885_MPEG_DVB,

	},

	[CX23885_BOARD_AVERMEDIA_HC81R] = {

		.name		= "AVerTV Hybrid Express Slim HC81R",

		.tuner_type	= TUNER_XC2028,
@@ -936,19 +940,19 @@ struct cx23885_subid cx23885_subids[] = { 
	}, {

		.subvendor = 0x0070,

		.subdevice = 0xc108,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400, /* Hauppauge WinTV HVR-4400 (Model 121xxx, Hybrid DVB-T/S2, IR) */

	}, {

		.subvendor = 0x0070,

		.subdevice = 0xc138,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400, /* Hauppauge WinTV HVR-5500 (Model 121xxx, Hybrid DVB-T/C/S2, IR) */

	}, {

		.subvendor = 0x0070,

		.subdevice = 0xc12a,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400,

		.card      = CX23885_BOARD_HAUPPAUGE_STARBURST, /* Hauppauge WinTV Starburst (Model 121x00, DVB-S2, IR) */

	}, {

		.subvendor = 0x0070,

		.subdevice = 0xc1f8,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR4400, /* Hauppauge WinTV HVR-5500 (Model 121xxx, Hybrid DVB-T/C/S2, IR) */

	}, {

		.subvendor = 0x1461,

		.subdevice = 0xd939,
@@ -1545,8 +1549,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) 
		cx_write(GPIO_ISM, 0x00000000);/* INTERRUPTS active low*/

		break;

	case CX23885_BOARD_HAUPPAUGE_HVR4400:

	case CX23885_BOARD_HAUPPAUGE_STARBURST:

		/* GPIO-8 tda10071 demod reset */

		/* GPIO-9 si2165 demod reset */

		/* GPIO-9 si2165 demod reset (only HVR4400/HVR5500)*/



		/* Put the parts into reset and back */

		cx23885_gpio_enable(dev, GPIO_8 | GPIO_9, 1);
@@ -1872,6 +1877,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:

	case CX23885_BOARD_HAUPPAUGE_HVR4400:

	case CX23885_BOARD_HAUPPAUGE_STARBURST:

	case CX23885_BOARD_HAUPPAUGE_IMPACTVCBE:

		if (dev->i2c_bus[0].i2c_rc == 0)

			hauppauge_eeprom(dev, eeprom+0xc0);
@@ -1980,6 +1986,11 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
		ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */

		ts2->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;

		break;

	case CX23885_BOARD_HAUPPAUGE_STARBURST:

		ts1->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */

		ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */

		ts1->src_sel_val   = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO;

		break;

	case CX23885_BOARD_DVBSKY_T9580:

	case CX23885_BOARD_DVBSKY_T982:

		ts1->gen_ctrl_val  = 0x5; /* Parallel */

drivers/media/pci/cx23885/cx23885-core.c

+2 −2
Original line number Diff line number Diff line
@@ -2049,11 +2049,11 @@ static void cx23885_finidev(struct pci_dev *pci_dev) 


	cx23885_shutdown(dev);



	pci_disable_device(pci_dev);



	/* unregister stuff */

	free_irq(pci_dev->irq, dev);



	pci_disable_device(pci_dev);



	cx23885_dev_unregister(dev);

	vb2_dma_sg_cleanup_ctx(dev->alloc_ctx);

	v4l2_ctrl_handler_free(&dev->ctrl_handler);

drivers/media/pci/cx23885/cx23885-dvb.c

+11 −0
Original line number Diff line number Diff line
@@ -1710,6 +1710,17 @@ static int dvb_register(struct cx23885_tsport *port) 
			break;

		}

		break;

	case CX23885_BOARD_HAUPPAUGE_STARBURST:

		i2c_bus = &dev->i2c_bus[0];

		fe0->dvb.frontend = dvb_attach(tda10071_attach,

						&hauppauge_tda10071_config,

						&i2c_bus->i2c_adap);

		if (fe0->dvb.frontend != NULL) {

			dvb_attach(a8293_attach, fe0->dvb.frontend,

				   &i2c_bus->i2c_adap,

				   &hauppauge_a8293_config);

		}

		break;

	case CX23885_BOARD_DVBSKY_T9580:

	case CX23885_BOARD_DVBSKY_S950:

		i2c_bus = &dev->i2c_bus[0];

drivers/media/pci/cx23885/cx23885.h

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,7 @@ 
#define CX23885_BOARD_DVBSKY_S950              49

#define CX23885_BOARD_DVBSKY_S952              50

#define CX23885_BOARD_DVBSKY_T982              51

#define CX23885_BOARD_HAUPPAUGE_STARBURST      52



#define GPIO_0 0x00000001

#define GPIO_1 0x00000002

drivers/media/platform/omap3isp/ispvideo.c

+5 −2
Original line number Diff line number Diff line
@@ -602,10 +602,13 @@ isp_video_querycap(struct file *file, void *fh, struct v4l2_capability *cap) 
	strlcpy(cap->card, video->video.name, sizeof(cap->card));

	strlcpy(cap->bus_info, "media", sizeof(cap->bus_info));



	cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_VIDEO_OUTPUT

		| V4L2_CAP_STREAMING | V4L2_CAP_DEVICE_CAPS;



	if (video->type == V4L2_BUF_TYPE_VIDEO_CAPTURE)

		cap->capabilities = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

		cap->device_caps = V4L2_CAP_VIDEO_CAPTURE | V4L2_CAP_STREAMING;

	else

		cap->capabilities = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;

		cap->device_caps = V4L2_CAP_VIDEO_OUTPUT | V4L2_CAP_STREAMING;



	return 0;

}