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

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

Merge tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:

 - new drivers:
       - i.MX6 Video Data Order Adapter's (VDOA)
       - Toshiba et8ek8 5MP sensor
       - STM DELTA multi-format video decoder V4L2 driver
       - SPI connected IR LED
       - Mediatek IR remote receiver
       - ZyDAS ZD1301 DVB USB interface driver

 - new RC keymaps

 - some very old LIRC drivers got removed from staging

 - RC core gained support encoding IR scan codes

 - DVB si2168 gained support for DVBv5 statistics

 - lirc_sir driver ported to rc-core and promoted from staging

 - other bug fixes, board additions and driver improvements

* tag 'media/v4.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (230 commits)
  [media] mtk-vcodec: fix build warnings without DEBUG
  [media] zd1301: fix building interface driver without demodulator
  [media] usbtv: add sharpness control
  [media] cxusb: Use a dma capable buffer also for reading
  [media] ttpci: address stringop overflow warning
  [media] dvb-usb-v2: avoid use-after-free
  [media] add Hama Hybrid DVB-T Stick support
  [media] et8ek8: Fix compiler / Coccinelle warnings
  [media] media: fix semicolon.cocci warnings
  [media] media: exynos4-is: add flags to dummy Exynos IS i2c adapter
  [media] v4l: of: check for unique lanes in data-lanes and clock-lanes
  [media] coda/imx-vdoa: constify structs
  [media] st-delta: debug: trace stream/frame information & summary
  [media] st-delta: add mjpeg support
  [media] st-delta: EOS (End Of Stream) support
  [media] st-delta: rpmsg ipc support
  [media] st-delta: add memory allocator helper functions
  [media] st-delta: STiH4xx multi-format video decoder v4l2 driver
  [media] MAINTAINERS: add st-delta driver
  [media] ARM: multi_v7_defconfig: enable STMicroelectronics DELTA Support
  ...
parents 5ab35662 9eeb0ed0

Documentation/ABI/testing/sysfs-class-rc

+7 −7
Original line number Diff line number Diff line
@@ -62,18 +62,18 @@ Description: 
		This value may be reset to 0 if the current protocol is altered.



What:		/sys/class/rc/rcN/wakeup_protocols

Date:		Feb 2014

KernelVersion:	3.15

Date:		Feb 2017

KernelVersion:	4.11

Contact:	Mauro Carvalho Chehab <m.chehab@samsung.com>

Description:

		Reading this file returns a list of available protocols to use

		for the wakeup filter, something like:

		    "rc5 rc6 nec jvc [sony]"

		    "rc-5 nec nec-x rc-6-0 rc-6-6a-24 [rc-6-6a-32] rc-6-mce"

		Note that protocol variants are listed, so "nec", "sony",

		"rc-5", "rc-6" have their different bit length encodings

		listed if available.

		The enabled wakeup protocol is shown in [] brackets.

		Writing "+proto" will add a protocol to the list of enabled

		wakeup protocols.

		Writing "-proto" will remove a protocol from the list of enabled

		wakeup protocols.

		Only one protocol can be selected at a time.

		Writing "proto" will use "proto" for wakeup events.

		Writing "none" will disable wakeup.

		Write fails with EINVAL if an invalid protocol combination or

Documentation/devicetree/bindings/leds/irled/spi-ir-led.txt

0 → 100644
+29 −0
Original line number Diff line number Diff line 
Device tree bindings for IR LED connected through SPI bus which is used as

remote controller.



The IR LED switch is connected to the MOSI line of the SPI device and the data

are delivered thourgh that.



Required properties:

	- compatible: should be "ir-spi-led".



Optional properties:

	- duty-cycle: 8 bit balue that represents the percentage of one period

	  in which the signal is active.  It can be 50, 60, 70, 75, 80 or 90.

	- led-active-low: boolean value that specifies whether the output is

	  negated with a NOT gate.

	- power-supply: specifies the power source. It can either be a regulator

	  or a gpio which enables a regulator, i.e. a regulator-fixed as

	  described in

	  Documentation/devicetree/bindings/regulator/fixed-regulator.txt



Example:



	irled@0 {

		compatible = "ir-spi-led";

		reg = <0x0>;

		spi-max-frequency = <5000000>;

		power-supply = <&vdd_led>;

		led-active-low;

		duty-cycle = /bits/ 8 <60>;

	};

Documentation/devicetree/bindings/media/fsl-vdoa.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
Freescale Video Data Order Adapter

==================================



The Video Data Order Adapter (VDOA) is present on the i.MX6q. Its sole purpose

is to reorder video data from the macroblock tiled order produced by the CODA

960 VPU to the conventional raster-scan order for scanout.



Required properties:

- compatible: must be "fsl,imx6q-vdoa"

- reg: the register base and size for the device registers

- interrupts: the VDOA interrupt

- clocks: the vdoa clock



Example:



vdoa@21e4000 {

        compatible = "fsl,imx6q-vdoa";

        reg = <0x021e4000 0x4000>;

        interrupts = <0 18 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&clks IMX6QDL_CLK_VDOA>;

};

Documentation/devicetree/bindings/media/gpio-ir-receiver.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ Required properties: 
	- gpios: specifies GPIO used for IR signal reception.



Optional properties:

	- linux,rc-map-name: Linux specific remote control map name.

	- linux,rc-map-name: see rc.txt file in the same

	  directory.



Example node:

Documentation/devicetree/bindings/media/hix5hd2-ir.txt

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ Required properties: 
	- clocks: clock phandle and specifier pair.



Optional properties:

	- linux,rc-map-name : Remote control map name.

	- linux,rc-map-name: see rc.txt file in the same directory.

	- hisilicon,power-syscon: DEPRECATED. Don't use this in new dts files.

		Provide correct clocks instead.