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

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

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:
 "This series include:
   - a new Remote Controller driver for ST SoC with the corresponding DT
     bindings
   - a new frontend (cx24117)
   - a new I2C camera flash driver (lm3560)
   - a new mem2mem driver for TI SoC (ti-vpe)
   - support for Raphael r828d added to r820t driver
   - some improvements on buffer allocation at VB2 core
   - usual driver fixes and improvements

  PS this time, we have a smaller number of patches.  While it is hard
  to pinpoint to the reasons, I believe that it is mainly due to:

   1) there are several patch series ready, but depending on DT review.
      I decided to grant some extra time for DT maintainers to look on
      it, as they're expecting to have more time with the changes agreed
      during ARM mini-summit and KS.  If they can't review in time for
      3.14, I'll review myself and apply for the next merge window.

   2) I suspect that having both LinuxCon EU and LinuxCon NA happening
      during the same merge window affected the development
      productivity, as several core media developers participated on
      both events"

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (151 commits)
  [media] media: st-rc: Add ST remote control driver
  [media] gpio-ir-recv: Include linux/of.h header
  [media] tvp7002: Include linux/of.h header
  [media] tvp514x: Include linux/of.h header
  [media] ths8200: Include linux/of.h header
  [media] adv7343: Include linux/of.h header
  [media] v4l: Fix typo in v4l2_subdev_get_try_crop()
  [media] media: i2c: add driver for dual LED Flash, lm3560
  [media] rtl28xxu: add 15f4:0131 Astrometa DVB-T2
  [media] rtl28xxu: add RTL2832P + R828D support
  [media] rtl2832: add new tuner R828D
  [media] r820t: add support for R828D
  [media] media/i2c: ths8200: fix build failure with gcc 4.5.4
  [media] Add support for KWorld UB435-Q V2
  [media] staging/media: fix msi3101 build errors
  [media] ddbridge: Remove casting the return value which is a void pointer
  [media] ngene: Remove casting the return value which is a void pointer
  [media] dm1105: remove unneeded not-null test
  [media] sh_mobile_ceu_camera: remove deprecated IRQF_DISABLED
  [media] media: rcar_vin: Add preliminary r8a7790 support
  ...
parents cdd278db 80f93c7b

Documentation/devicetree/bindings/media/st-rc.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Device-Tree bindings for ST IRB IP



Required properties:

	- compatible: Should contain "st,comms-irb".

	- reg: Base physical address of the controller and length of memory

	  mapped region.

	- interrupts: interrupt-specifier for the sole interrupt generated by

	  the device. The interrupt specifier format depends on the interrupt

	  controller parent.

	- rx-mode: can be "infrared" or "uhf". This property specifies the L1

	  protocol used for receiving remote control signals. rx-mode should

	  be present iff the rx pins are wired up.

	- tx-mode: should be "infrared". This property specifies the L1

	  protocol used for transmitting remote control signals. tx-mode should

	  be present iff the tx pins are wired up.



Optional properties:

	- pinctrl-names, pinctrl-0: the pincontrol settings to configure muxing

	  properly for IRB pins.

	- clocks : phandle with clock-specifier pair for IRB.



Example node:



	rc: rc@fe518000 {

		compatible	= "st,comms-irb";

		reg		= <0xfe518000 0x234>;

		interrupts	= <0 203 0>;

		rx-mode		= "infrared";

	};

drivers/media/common/b2c2/flexcop-sram.c

+3 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static void flexcop_sram_write(struct adapter *adapter, u32 bank, u32 addr, u8 * 
		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {

			mdelay(1);

			retries--;

		};

		}



		if (retries == 0)

			printk("%s: SRAM timeout\n", __func__);
@@ -110,7 +110,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, 
		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {

			mdelay(1);

			retries--;

		};

		}



		if (retries == 0)

			printk("%s: SRAM timeout\n", __func__);
@@ -122,7 +122,7 @@ static void flex_sram_read(struct adapter *adapter, u32 bank, u32 addr, u8 *buf, 
		while (((read_reg_dw(adapter, 0x700) & 0x80000000) != 0) && (retries > 0)) {

			mdelay(1);

			retries--;

		};

		}



		if (retries == 0)

			printk("%s: SRAM timeout\n", __func__);

drivers/media/common/saa7146/saa7146_core.c

+1 −3
Original line number Diff line number Diff line
@@ -411,7 +411,7 @@ static int saa7146_init_one(struct pci_dev *pci, const struct pci_device_id *ent 
	saa7146_write(dev, MC2, 0xf8000000);



	/* request an interrupt for the saa7146 */

	err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED | IRQF_DISABLED,

	err = request_irq(pci->irq, interrupt_hw, IRQF_SHARED,

			  dev->name, dev);

	if (err < 0) {

		ERR("request_irq() failed\n");
@@ -524,8 +524,6 @@ static void saa7146_remove_one(struct pci_dev *pdev) 
	DEB_EE("dev:%p\n", dev);



	dev->ext->detach(dev);

	/* Zero the PCI drvdata after use. */

	pci_set_drvdata(pdev, NULL);



	/* shut down all video dma transfers */

	saa7146_write(dev, MC1, 0x00ff0000);

drivers/media/common/siano/smscoreapi.c

+4 −4
Original line number Diff line number Diff line
@@ -922,8 +922,8 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, 
	u32 i, *ptr;

	u8 *payload = firmware->payload;

	int rc = 0;

	firmware->start_address = le32_to_cpu(firmware->start_address);

	firmware->length = le32_to_cpu(firmware->length);

	firmware->start_address = le32_to_cpup((__le32 *)&firmware->start_address);

	firmware->length = le32_to_cpup((__le32 *)&firmware->length);



	mem_address = firmware->start_address;
@@ -982,7 +982,7 @@ static int smscore_load_firmware_family2(struct smscore_device_t *coredev, 
	if (rc < 0)

		goto exit_fw_download;



	sms_err("sending MSG_SMS_DATA_VALIDITY_REQ expecting 0x%x",

	sms_debug("sending MSG_SMS_DATA_VALIDITY_REQ expecting 0x%x",

		calc_checksum);

	SMS_INIT_MSG(&msg->x_msg_header, MSG_SMS_DATA_VALIDITY_REQ,

			sizeof(msg->x_msg_header) +
@@ -1562,7 +1562,7 @@ void smscore_onresponse(struct smscore_device_t *coredev, 
		{

			struct sms_msg_data *validity = (struct sms_msg_data *) phdr;



			sms_err("MSG_SMS_DATA_VALIDITY_RES, checksum = 0x%x",

			sms_debug("MSG_SMS_DATA_VALIDITY_RES, checksum = 0x%x",

				validity->msg_data[0]);

			complete(&coredev->data_validity_done);

			break;

drivers/media/common/siano/smsdvb-main.c

+4 −4
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ module_param_named(debug, sms_dbg, int, 0644); 
MODULE_PARM_DESC(debug, "set debug level (info=1, adv=2 (or-able))");





u32 sms_to_guard_interval_table[] = {

static u32 sms_to_guard_interval_table[] = {

	[0] = GUARD_INTERVAL_1_32,

	[1] = GUARD_INTERVAL_1_16,

	[2] = GUARD_INTERVAL_1_8,

	[3] = GUARD_INTERVAL_1_4,

};



u32 sms_to_code_rate_table[] = {

static u32 sms_to_code_rate_table[] = {

	[0] = FEC_1_2,

	[1] = FEC_2_3,

	[2] = FEC_3_4,
@@ -60,14 +60,14 @@ u32 sms_to_code_rate_table[] = { 
};





u32 sms_to_hierarchy_table[] = {

static u32 sms_to_hierarchy_table[] = {

	[0] = HIERARCHY_NONE,

	[1] = HIERARCHY_1,

	[2] = HIERARCHY_2,

	[3] = HIERARCHY_4,

};



u32 sms_to_modulation_table[] = {

static u32 sms_to_modulation_table[] = {

	[0] = QPSK,

	[1] = QAM_16,

	[2] = QAM_64,