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

Commit 931efdf5 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab
Browse files

Merge branch 'v4l_for_linus' into staging/for_v3.6 

* v4l_for_linus: (31 commits)
  [media] Revert "[media] V4L: JPEG class documentation corrections"
  [media] s5p-fimc: Add missing FIMC-LITE file operations locking
  [media] omap3isp: preview: Fix contrast and brightness handling
  [media] omap3isp: preview: Fix output size computation depending on input format
  [media] winbond-cir: Initialise timeout, driver_type and allowed_protos
  [media] winbond-cir: Fix txandrx module info
  [media] cx23885: Silence unknown command warnings
  [media] cx23885: add support for HVR-1255 analog (cx23888 variant)
  [media] cx23885: make analog support work for HVR_1250 (cx23885 variant)
  [media] cx25840: fix vsrc/hsrc usage on cx23888 designs
  [media] cx25840: fix regression in HVR-1800 analog audio
  [media] cx25840: fix regression in analog support hue/saturation controls
  [media] cx25840: fix regression in HVR-1800 analog support
  [media] s5p-mfc: Fixed setup of custom controls in decoder and encoder
  [media] cx231xx: don't DMA to random addresses
  [media] em28xx: fix em28xx-rc load
  [media] dvb-core: Release semaphore on error path dvb_register_device()
  [media] s5p-fimc: Stop media entity pipeline if fimc_pipeline_validate fails
  [media] s5p-fimc: Fix compiler warning in fimc-lite.c
  [media] s5p-fimc: media_entity_pipeline_start() may fail
  ...
parents 2cefabc0 ec3ed85f

Documentation/DocBook/media/v4l/controls.xml

+1 −1
Original line number Diff line number Diff line
@@ -3988,7 +3988,7 @@ interface and may change in the future.</para> 
	    from RGB to Y'CbCr color space.

	    </entry>

	  </row>

	  <row id = "v4l2-jpeg-chroma-subsampling">

	  <row>

	    <entrytbl spanname="descr" cols="2">

	      <tbody valign="top">

		<row>

Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml

+0 −7
Original line number Diff line number Diff line
@@ -284,13 +284,6 @@ These controls are described in <xref 
	    processing controls. These controls are described in <xref

	    linkend="image-process-controls" />.</entry>

	  </row>

	  <row>

	    <entry><constant>V4L2_CTRL_CLASS_JPEG</constant></entry>

	    <entry>0x9d0000</entry>

	    <entry>The class containing JPEG compression controls.

These controls are described in <xref

		linkend="jpeg-controls" />.</entry>

	  </row>

	</tbody>

      </tgroup>

    </table>

drivers/media/dvb/dvb-core/dvbdev.c

+1 −0
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ int dvb_register_device(struct dvb_adapter *adap, struct dvb_device **pdvbdev, 
	if (minor == MAX_DVB_MINORS) {

		kfree(dvbdevfops);

		kfree(dvbdev);

		up_write(&minor_rwsem);

		mutex_unlock(&dvbdev_register_lock);

		return -EINVAL;

	}

drivers/media/rc/winbond-cir.c

+3 −1
Original line number Diff line number Diff line
@@ -232,7 +232,7 @@ MODULE_PARM_DESC(invert, "Invert the signal from the IR receiver"); 


static bool txandrx; /* default = 0 */

module_param(txandrx, bool, 0444);

MODULE_PARM_DESC(invert, "Allow simultaneous TX and RX");

MODULE_PARM_DESC(txandrx, "Allow simultaneous TX and RX");



static unsigned int wake_sc = 0x800F040C;

module_param(wake_sc, uint, 0644);
@@ -1032,6 +1032,8 @@ wbcir_probe(struct pnp_dev *device, const struct pnp_device_id *dev_id) 
	data->dev->tx_ir = wbcir_tx;

	data->dev->priv = data;

	data->dev->dev.parent = &device->dev;

	data->dev->timeout = MS_TO_NS(100);

	data->dev->allowed_protos = RC_TYPE_ALL;



	if (!request_region(data->wbase, WAKEUP_IOMEM_LEN, DRVNAME)) {

		dev_err(dev, "Region 0x%lx-0x%lx already in use!\n",

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

+79 −10
Original line number Diff line number Diff line
@@ -127,22 +127,37 @@ struct cx23885_board cx23885_boards[] = { 
	},

	[CX23885_BOARD_HAUPPAUGE_HVR1250] = {

		.name		= "Hauppauge WinTV-HVR1250",

		.porta		= CX23885_ANALOG_VIDEO,

		.portc		= CX23885_MPEG_DVB,

#ifdef MT2131_NO_ANALOG_SUPPORT_YET

		.tuner_type	= TUNER_PHILIPS_TDA8290,

		.tuner_addr	= 0x42, /* 0x84 >> 1 */

		.tuner_bus	= 1,

#endif

		.force_bff	= 1,

		.input          = {{

#ifdef MT2131_NO_ANALOG_SUPPORT_YET

			.type   = CX23885_VMUX_TELEVISION,

			.vmux   = 0,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN5_CH2 |

					CX25840_VIN2_CH1,

			.amux   = CX25840_AUDIO8,

			.gpio0  = 0xff00,

		}, {

			.type   = CX23885_VMUX_DEBUG,

			.vmux   = 0,

			.gpio0  = 0xff01,

		}, {

#endif

			.type   = CX23885_VMUX_COMPOSITE1,

			.vmux   = 1,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN4_CH2 |

					CX25840_VIN6_CH1,

			.amux   = CX25840_AUDIO7,

			.gpio0  = 0xff02,

		}, {

			.type   = CX23885_VMUX_SVIDEO,

			.vmux   = 2,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN4_CH2 |

					CX25840_VIN8_CH1 |

					CX25840_SVIDEO_ON,

			.amux   = CX25840_AUDIO7,

			.gpio0  = 0xff02,

		} },

	},
@@ -267,7 +282,55 @@ struct cx23885_board cx23885_boards[] = { 
	},

	[CX23885_BOARD_HAUPPAUGE_HVR1255] = {

		.name		= "Hauppauge WinTV-HVR1255",

		.porta		= CX23885_ANALOG_VIDEO,

		.portc		= CX23885_MPEG_DVB,

		.tuner_type	= TUNER_ABSENT,

		.tuner_addr	= 0x42, /* 0x84 >> 1 */

		.force_bff	= 1,

		.input          = {{

			.type   = CX23885_VMUX_TELEVISION,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN5_CH2 |

					CX25840_VIN2_CH1 |

					CX25840_DIF_ON,

			.amux   = CX25840_AUDIO8,

		}, {

			.type   = CX23885_VMUX_COMPOSITE1,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN4_CH2 |

					CX25840_VIN6_CH1,

			.amux   = CX25840_AUDIO7,

		}, {

			.type   = CX23885_VMUX_SVIDEO,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN4_CH2 |

					CX25840_VIN8_CH1 |

					CX25840_SVIDEO_ON,

			.amux   = CX25840_AUDIO7,

		} },

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1255_22111] = {

		.name		= "Hauppauge WinTV-HVR1255",

		.porta		= CX23885_ANALOG_VIDEO,

		.portc		= CX23885_MPEG_DVB,

		.tuner_type	= TUNER_ABSENT,

		.tuner_addr	= 0x42, /* 0x84 >> 1 */

		.force_bff	= 1,

		.input          = {{

			.type   = CX23885_VMUX_TELEVISION,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN5_CH2 |

					CX25840_VIN2_CH1 |

					CX25840_DIF_ON,

			.amux   = CX25840_AUDIO8,

		}, {

			.type   = CX23885_VMUX_SVIDEO,

			.vmux   =	CX25840_VIN7_CH3 |

					CX25840_VIN4_CH2 |

					CX25840_VIN8_CH1 |

					CX25840_SVIDEO_ON,

			.amux   = CX25840_AUDIO7,

		} },

	},

	[CX23885_BOARD_HAUPPAUGE_HVR1210] = {

		.name		= "Hauppauge WinTV-HVR1210",
@@ -624,7 +687,7 @@ struct cx23885_subid cx23885_subids[] = { 
	}, {

		.subvendor = 0x0070,

		.subdevice = 0x2259,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1255,

		.card      = CX23885_BOARD_HAUPPAUGE_HVR1255_22111,

	}, {

		.subvendor = 0x0070,

		.subdevice = 0x2291,
@@ -900,7 +963,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg) 
	struct cx23885_dev *dev = port->dev;

	u32 bitmask = 0;



	if (command == XC2028_RESET_CLK)

	if ((command == XC2028_RESET_CLK) || (command == XC2028_I2C_FLUSH))

		return 0;



	if (command != 0) {
@@ -1130,6 +1193,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:

	case CX23885_BOARD_HAUPPAUGE_HVR1210:

		/* GPIO-5 RF Control: 0 = RF1 Terrestrial, 1 = RF2 Cable */

		/* GPIO-6 I2C Gate which can isolate the demod from the bus */
@@ -1267,6 +1331,7 @@ int cx23885_ir_init(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1400:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:

	case CX23885_BOARD_HAUPPAUGE_HVR1210:

		/* FIXME: Implement me */

		break;
@@ -1424,6 +1489,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:

	case CX23885_BOARD_HAUPPAUGE_HVR1210:

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:
@@ -1511,6 +1577,7 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1275:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:

	case CX23885_BOARD_HAUPPAUGE_HVR1210:

	case CX23885_BOARD_COMPRO_VIDEOMATE_E800:

	case CX23885_BOARD_HAUPPAUGE_HVR1290:
@@ -1526,10 +1593,10 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	 */

	switch (dev->board) {

	case CX23885_BOARD_TEVII_S470:

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

		/* Currently only enabled for the integrated IR controller */

		if (!enable_885_ir)

			break;

	case CX23885_BOARD_HAUPPAUGE_HVR1250:

	case CX23885_BOARD_HAUPPAUGE_HVR1800:

	case CX23885_BOARD_HAUPPAUGE_HVR1800lp:

	case CX23885_BOARD_HAUPPAUGE_HVR1700:
@@ -1539,6 +1606,8 @@ void cx23885_card_setup(struct cx23885_dev *dev) 
	case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:

	case CX23885_BOARD_NETUP_DUAL_DVB_T_C_CI_RF:

	case CX23885_BOARD_COMPRO_VIDEOMATE_E800:

	case CX23885_BOARD_HAUPPAUGE_HVR1255:

	case CX23885_BOARD_HAUPPAUGE_HVR1255_22111:

	case CX23885_BOARD_HAUPPAUGE_HVR1270:

	case CX23885_BOARD_HAUPPAUGE_HVR1850:

	case CX23885_BOARD_MYGICA_X8506: