Skip to content

Commit c0da4fa

Browse files
committed
Merge tag 'media/v4.14-1' of git://git.kernel.org/pub/scm/linux/kernel/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 ...
2 parents d969443 + 1efdf17 commit c0da4fa

File tree

888 files changed

+44749
-10692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

888 files changed

+44749
-10692
lines changed
Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
Analog devices AS3645A device tree bindings
2+
3+
The AS3645A flash LED controller can drive two LEDs, one high current
4+
flash LED and one indicator LED. The high current flash LED can be
5+
used in torch mode as well.
6+
7+
Ranges below noted as [a, b] are closed ranges between a and b, i.e. a
8+
and b are included in the range.
9+
10+
Please also see common.txt in the same directory.
11+
12+
13+
Required properties
14+
===================
15+
16+
compatible : Must be "ams,as3645a".
17+
reg : The I2C address of the device. Typically 0x30.
18+
19+
20+
Required properties of the "flash" child node
21+
=============================================
22+
23+
flash-timeout-us: Flash timeout in microseconds. The value must be in
24+
the range [100000, 850000] and divisible by 50000.
25+
flash-max-microamp: Maximum flash current in microamperes. Has to be
26+
in the range between [200000, 500000] and
27+
divisible by 20000.
28+
led-max-microamp: Maximum torch (assist) current in microamperes. The
29+
value must be in the range between [20000, 160000] and
30+
divisible by 20000.
31+
ams,input-max-microamp: Maximum flash controller input current. The
32+
value must be in the range [1250000, 2000000]
33+
and divisible by 50000.
34+
35+
36+
Optional properties of the "flash" child node
37+
=============================================
38+
39+
label : The label of the flash LED.
40+
41+
42+
Required properties of the "indicator" child node
43+
=================================================
44+
45+
led-max-microamp: Maximum indicator current. The allowed values are
46+
2500, 5000, 7500 and 10000.
47+
48+
Optional properties of the "indicator" child node
49+
=================================================
50+
51+
label : The label of the indicator LED.
52+
53+
54+
Example
55+
=======
56+
57+
as3645a@30 {
58+
reg = <0x30>;
59+
compatible = "ams,as3645a";
60+
flash {
61+
flash-timeout-us = <150000>;
62+
flash-max-microamp = <320000>;
63+
led-max-microamp = <60000>;
64+
ams,input-max-microamp = <1750000>;
65+
label = "as3645a:flash";
66+
};
67+
indicator {
68+
led-max-microamp = <10000>;
69+
label = "as3645a:indicator";
70+
};
71+
};
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
Device tree bindings for IR LED connected through gpio pin which is used as
2+
remote controller transmitter.
3+
4+
Required properties:
5+
- compatible: should be "gpio-ir-tx".
6+
- gpios : Should specify the IR LED GPIO, see "gpios property" in
7+
Documentation/devicetree/bindings/gpio/gpio.txt. Active low LEDs
8+
should be indicated using flags in the GPIO specifier.
9+
10+
Example:
11+
irled@0 {
12+
compatible = "gpio-ir-tx";
13+
gpios = <&gpio1 2 GPIO_ACTIVE_HIGH>;
14+
};
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
Device tree bindings for IR LED connected through pwm pin which is used as
2+
remote controller transmitter.
3+
4+
Required properties:
5+
- compatible: should be "pwm-ir-tx".
6+
- pwms : PWM property to point to the PWM device (phandle)/port (id)
7+
and to specify the period time to be used: <&phandle id period_ns>;
8+
9+
Example:
10+
irled {
11+
compatible = "pwm-ir-tx";
12+
pwms = <&pwm0 0 10000000>;
13+
};
Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
* Analog Devices ADV748X video decoder with HDMI receiver
2+
3+
The ADV7481 and ADV7482 are multi format video decoders with an integrated
4+
HDMI receiver. They can output CSI-2 on two independent outputs TXA and TXB
5+
from three input sources HDMI, analog and TTL.
6+
7+
Required Properties:
8+
9+
- compatible: Must contain one of the following
10+
- "adi,adv7481" for the ADV7481
11+
- "adi,adv7482" for the ADV7482
12+
13+
- reg: I2C slave address
14+
15+
Optional Properties:
16+
17+
- interrupt-names: Should specify the interrupts as "intrq1", "intrq2" and/or
18+
"intrq3". All interrupts are optional. The "intrq3" interrupt
19+
is only available on the adv7481
20+
- interrupts: Specify the interrupt lines for the ADV748x
21+
22+
The device node must contain one 'port' child node per device input and output
23+
port, in accordance with the video interface bindings defined in
24+
Documentation/devicetree/bindings/media/video-interfaces.txt. The port nodes
25+
are numbered as follows.
26+
27+
Name Type Port
28+
---------------------------------------
29+
AIN0 sink 0
30+
AIN1 sink 1
31+
AIN2 sink 2
32+
AIN3 sink 3
33+
AIN4 sink 4
34+
AIN5 sink 5
35+
AIN6 sink 6
36+
AIN7 sink 7
37+
HDMI sink 8
38+
TTL sink 9
39+
TXA source 10
40+
TXB source 11
41+
42+
The digital output port nodes must contain at least one endpoint.
43+
44+
Ports are optional if they are not connected to anything at the hardware level.
45+
46+
Example:
47+
48+
video-receiver@70 {
49+
compatible = "adi,adv7482";
50+
reg = <0x70>;
51+
52+
#address-cells = <1>;
53+
#size-cells = <0>;
54+
55+
interrupt-parent = <&gpio6>;
56+
interrupt-names = "intrq1", "intrq2";
57+
interrupts = <30 IRQ_TYPE_LEVEL_LOW>,
58+
<31 IRQ_TYPE_LEVEL_LOW>;
59+
60+
port@7 {
61+
reg = <7>;
62+
63+
adv7482_ain7: endpoint {
64+
remote-endpoint = <&cvbs_in>;
65+
};
66+
};
67+
68+
port@8 {
69+
reg = <8>;
70+
71+
adv7482_hdmi: endpoint {
72+
remote-endpoint = <&hdmi_in>;
73+
};
74+
};
75+
76+
port@10 {
77+
reg = <10>;
78+
79+
adv7482_txa: endpoint {
80+
clock-lanes = <0>;
81+
data-lanes = <1 2 3 4>;
82+
remote-endpoint = <&csi40_in>;
83+
};
84+
};
85+
86+
port@11 {
87+
reg = <11>;
88+
89+
adv7482_txb: endpoint {
90+
clock-lanes = <0>;
91+
data-lanes = <1>;
92+
remote-endpoint = <&csi20_in>;
93+
};
94+
};
95+
};
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Dongwoon Anatech DW9714 camera voice coil lens driver
2+
3+
DW9174 is a 10-bit DAC with current sink capability. It is intended
4+
for driving voice coil lenses in camera modules.
5+
6+
Mandatory properties:
7+
8+
- compatible: "dongwoon,dw9714"
9+
- reg: I²C slave address
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
* Amlogic Meson AO-CEC driver
2+
3+
The Amlogic Meson AO-CEC module is present is Amlogic SoCs and its purpose is
4+
to handle communication between HDMI connected devices over the CEC bus.
5+
6+
Required properties:
7+
- compatible : value should be following
8+
"amlogic,meson-gx-ao-cec"
9+
10+
- reg : Physical base address of the IP registers and length of memory
11+
mapped region.
12+
13+
- interrupts : AO-CEC interrupt number to the CPU.
14+
- clocks : from common clock binding: handle to AO-CEC clock.
15+
- clock-names : from common clock binding: must contain "core",
16+
corresponding to entry in the clocks property.
17+
- hdmi-phandle: phandle to the HDMI controller
18+
19+
Example:
20+
21+
cec_AO: cec@100 {
22+
compatible = "amlogic,meson-gx-ao-cec";
23+
reg = <0x0 0x00100 0x0 0x14>;
24+
interrupts = <GIC_SPI 199 IRQ_TYPE_EDGE_RISING>;
25+
clocks = <&clkc_AO CLKID_AO_CEC_32K>;
26+
clock-names = "core";
27+
hdmi-phandle = <&hdmi_tx>;
28+
};

Documentation/devicetree/bindings/media/mtk-cir.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,14 @@ Device-Tree bindings for Mediatek consumer IR controller
22
found in Mediatek SoC family
33

44
Required properties:
5-
- compatible : "mediatek,mt7623-cir"
5+
- compatible : Should be
6+
"mediatek,mt7623-cir": for MT7623 SoC
7+
"mediatek,mt7622-cir": for MT7622 SoC
68
- clocks : list of clock specifiers, corresponding to
79
entries in clock-names property;
8-
- clock-names : should contain "clk" entries;
10+
- clock-names : should contain
11+
- "clk" entries: for MT7623 SoC
12+
- "clk", "bus" entries: for MT7622 SoC
913
- interrupts : should contain IR IRQ number;
1014
- reg : should contain IO map address for IR.
1115

0 commit comments

Comments
 (0)