Skip to content

Commit

Permalink
Merge tag 'media/v4.14-1' of git://git.kernel.org/pub/scm/linux/kerne…
Browse files Browse the repository at this point in the history
…l/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab:
 "Brazil's Independence Day pull request :-)

  This is one of the biggest media pull requests, with 625 patches
  affecting almost all parts of media (RC, DVB, V4L2, CEC, docs).

  This contains:

   - A lot of new drivers:
     * DVB frontends: mxl5xx, stv0910, stv6111;
     * camera flash: as3645a led driver;
     * HDMI receiver: adv748X;
     * camera sensor: Omnivision 6650 5M driver (ov6650);
     * HDMI CEC: ao-cec meson driver;
     * V4L2: Qualcom camss driver;
     * Remote controller: gpio-ir-tx, pwm-ir-tx and zx-irdec drivers.

   - The DDbridge DVB driver got a massive update, with makes it in sync
     with modern hardware from that vendor;

   - There's an important milestone on this series: the DVB
     documentation was written in 2003, but only started to be updated
     in 2007. It also used to contain several gaps from the time it was
     kept out of tree, mentioning error codes and device nodes that
     never existed upstream. On this series, it received a massive
     update: all non-deprecated digital TV APIs are now in sync with the
     current implementation;

   - Some DVB APIs that aren't used by any upstream driver got removed;

   - Other parts of the media documentation algo got updated, fixing
     some bugs on its PDF output and making it compatible with Sphinx
     version 1.6.

     As the number of hacks required to build PDF output reduced, I hope
     we'll have less troubles as newer versions of our documentation
     toolchain are released (famous last words);

   - As usual, lots of driver cleanups and improvements"

* tag 'media/v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (624 commits)
  media: leds: as3645a: add V4L2_FLASH_LED_CLASS dependency
  media: get rid of removed DMX_GET_CAPS and DMX_SET_SOURCE leftovers
  media: Revert "[media] v4l: async: make v4l2 coexist with devicetree nodes in a dt overlay"
  media: staging: atomisp: sh_css_calloc shall return a pointer to the allocated space
  media: Revert "[media] lirc_dev: remove superfluous get/put_device() calls"
  media: add qcom_camss.rst to v4l-drivers rst file
  media: dvb headers: make checkpatch happier
  media: dvb uapi: move frontend legacy API to another part of the book
  media: pixfmt-srggb12p.rst: better format the table for PDF output
  media: docs-rst: media: Don't use \small for V4L2_PIX_FMT_SRGGB10 documentation
  media: index.rst: don't write "Contents:" on PDF output
  media: pixfmt*.rst: replace a two dots by a comma
  media: vidioc-g-fmt.rst: adjust table format
  media: vivid.rst: add a blank line to correct ReST format
  media: v4l2 uapi book: get rid of driver programming's chapter
  media: format.rst: use the right markup for important notes
  media: docs-rst: cardlists: change their format to flat-tables
  media: em28xx-cardlist.rst: update to reflect last changes
  media: v4l2-event.rst: adjust table to fit on PDF output
  media: docs: don't show ToC for each part on PDF output
  ...
  • Loading branch information
Linus Torvalds committed Sep 7, 2017
2 parents d969443 + 1efdf17 commit c0da4fa
Show file tree
Hide file tree
Showing 888 changed files with 44,749 additions and 10,692 deletions.
71 changes: 71 additions & 0 deletions Documentation/devicetree/bindings/leds/ams,as3645a.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
Analog devices AS3645A device tree bindings

The AS3645A flash LED controller can drive two LEDs, one high current
flash LED and one indicator LED. The high current flash LED can be
used in torch mode as well.

Ranges below noted as [a, b] are closed ranges between a and b, i.e. a
and b are included in the range.

Please also see common.txt in the same directory.


Required properties
===================

compatible : Must be "ams,as3645a".
reg : The I2C address of the device. Typically 0x30.


Required properties of the "flash" child node
=============================================

flash-timeout-us: Flash timeout in microseconds. The value must be in
the range [100000, 850000] and divisible by 50000.
flash-max-microamp: Maximum flash current in microamperes. Has to be
in the range between [200000, 500000] and
divisible by 20000.
led-max-microamp: Maximum torch (assist) current in microamperes. The
value must be in the range between [20000, 160000] and
divisible by 20000.
ams,input-max-microamp: Maximum flash controller input current. The
value must be in the range [1250000, 2000000]
and divisible by 50000.


Optional properties of the "flash" child node
=============================================

label : The label of the flash LED.


Required properties of the "indicator" child node
=================================================

led-max-microamp: Maximum indicator current. The allowed values are
2500, 5000, 7500 and 10000.

Optional properties of the "indicator" child node
=================================================

label : The label of the indicator LED.


Example
=======

as3645a@30 {
reg = <0x30>;
compatible = "ams,as3645a";
flash {
flash-timeout-us = <150000>;
flash-max-microamp = <320000>;
led-max-microamp = <60000>;
ams,input-max-microamp = <1750000>;
label = "as3645a:flash";
};
indicator {
led-max-microamp = <10000>;
label = "as3645a:indicator";
};
};
14 changes: 14 additions & 0 deletions Documentation/devicetree/bindings/leds/irled/gpio-ir-tx.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Device tree bindings for IR LED connected through gpio pin which is used as
remote controller transmitter.

Required properties:
- compatible: should be "gpio-ir-tx".
- gpios : Should specify the IR LED GPIO, see "gpios property" in
Documentation/devicetree/bindings/gpio/gpio.txt. Active low LEDs
should be indicated using flags in the GPIO specifier.

Example:
irled@0 {
compatible = "gpio-ir-tx";
gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
};
13 changes: 13 additions & 0 deletions Documentation/devicetree/bindings/leds/irled/pwm-ir-tx.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
Device tree bindings for IR LED connected through pwm pin which is used as
remote controller transmitter.

Required properties:
- compatible: should be "pwm-ir-tx".
- pwms : PWM property to point to the PWM device (phandle)/port (id)
and to specify the period time to be used: <&phandle id period_ns>;

Example:
irled {
compatible = "pwm-ir-tx";
pwms = <&pwm0 0 10000000>;
};
95 changes: 95 additions & 0 deletions Documentation/devicetree/bindings/media/i2c/adv748x.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
* Analog Devices ADV748X video decoder with HDMI receiver

The ADV7481 and ADV7482 are multi format video decoders with an integrated
HDMI receiver. They can output CSI-2 on two independent outputs TXA and TXB
from three input sources HDMI, analog and TTL.

Required Properties:

- compatible: Must contain one of the following
- "adi,adv7481" for the ADV7481
- "adi,adv7482" for the ADV7482

- reg: I2C slave address

Optional Properties:

- interrupt-names: Should specify the interrupts as "intrq1", "intrq2" and/or
"intrq3". All interrupts are optional. The "intrq3" interrupt
is only available on the adv7481
- interrupts: Specify the interrupt lines for the ADV748x

The device node must contain one 'port' child node per device input and output
port, in accordance with the video interface bindings defined in
Documentation/devicetree/bindings/media/video-interfaces.txt. The port nodes
are numbered as follows.

Name Type Port
---------------------------------------
AIN0 sink 0
AIN1 sink 1
AIN2 sink 2
AIN3 sink 3
AIN4 sink 4
AIN5 sink 5
AIN6 sink 6
AIN7 sink 7
HDMI sink 8
TTL sink 9
TXA source 10
TXB source 11

The digital output port nodes must contain at least one endpoint.

Ports are optional if they are not connected to anything at the hardware level.

Example:

video-receiver@70 {
compatible = "adi,adv7482";
reg = <0x70>;

#address-cells = <1>;
#size-cells = <0>;

interrupt-parent = <&gpio6>;
interrupt-names = "intrq1", "intrq2";
interrupts = <30 IRQ_TYPE_LEVEL_LOW>,
<31 IRQ_TYPE_LEVEL_LOW>;

port@7 {
reg = <7>;

adv7482_ain7: endpoint {
remote-endpoint = <&cvbs_in>;
};
};

port@8 {
reg = <8>;

adv7482_hdmi: endpoint {
remote-endpoint = <&hdmi_in>;
};
};

port@10 {
reg = <10>;

adv7482_txa: endpoint {
clock-lanes = <0>;
data-lanes = <1 2 3 4>;
remote-endpoint = <&csi40_in>;
};
};

port@11 {
reg = <11>;

adv7482_txb: endpoint {
clock-lanes = <0>;
data-lanes = <1>;
remote-endpoint = <&csi20_in>;
};
};
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Dongwoon Anatech DW9714 camera voice coil lens driver

DW9174 is a 10-bit DAC with current sink capability. It is intended
for driving voice coil lenses in camera modules.

Mandatory properties:

- compatible: "dongwoon,dw9714"
- reg: I²C slave address
28 changes: 28 additions & 0 deletions Documentation/devicetree/bindings/media/meson-ao-cec.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
* Amlogic Meson AO-CEC driver

The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is
to handle communication between HDMI connected devices over the CEC bus.

Required properties:
- compatible : value should be following
"amlogic,meson-gx-ao-cec"

- reg : Physical base address of the IP registers and length of memory
mapped region.

- interrupts : AO-CEC interrupt number to the CPU.
- clocks : from common clock binding: handle to AO-CEC clock.
- clock-names : from common clock binding: must contain "core",
corresponding to entry in the clocks property.
- hdmi-phandle: phandle to the HDMI controller

Example:

cec_AO: cec@100 {
compatible = "amlogic,meson-gx-ao-cec";
reg = <0x0 0x00100 0x0 0x14>;
interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>;
clocks = <&clkc_AO CLKID_AO_CEC_32K>;
clock-names = "core";
hdmi-phandle = <&hdmi_tx>;
};
8 changes: 6 additions & 2 deletions Documentation/devicetree/bindings/media/mtk-cir.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@ Device-Tree bindings for Mediatek consumer IR controller
found in Mediatek SoC family

Required properties:
- compatible : "mediatek,mt7623-cir"
- compatible : Should be
"mediatek,mt7623-cir": for MT7623 SoC
"mediatek,mt7622-cir": for MT7622 SoC
- clocks : list of clock specifiers, corresponding to
entries in clock-names property;
- clock-names : should contain "clk" entries;
- clock-names : should contain
- "clk" entries: for MT7623 SoC
- "clk", "bus" entries: for MT7622 SoC
- interrupts : should contain IR IRQ number;
- reg : should contain IO map address for IR.

Expand Down
Loading

0 comments on commit c0da4fa

Please sign in to comment.