Skip to content

Commit 5813540

Browse files
torvaldstorvalds
committed
Merge tag 'media/v4.20-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: "First set of media patches contains: - Three new platform drivers: aspeed-video seco-sed and sun5i-csi; - One new sensor driver: imx214; - Support for Xbox DVD Movie Playback kit remote controller; - Removal of the legacy friio driver. The functionalities were ported to another driver, already merged; - New staging driver: Rockchip VPU; - Added license text or SPDX tags to all media documentation files; - Usual set of cleanup, fixes and enhancements" * tag 'media/v4.20-6' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (263 commits) media: cx23885: only reset DMA on problematic CPUs media: ddbridge: Move asm includes after linux ones media: drxk_hard: check if parameter is not NULL media: docs: fix some GPL licensing ambiguity at the text media: platform: Add Aspeed Video Engine driver media: dt-bindings: media: Add Aspeed Video Engine binding documentation media: vimc: fix start stream when link is disabled media: v4l2-device: Link subdevices to their parent devices if available media: siano: Use kmemdup instead of duplicating its function media: rockchip vpu: remove some unused vars media: cedrus: don't initialize pointers with zero media: cetrus: return an error if alloc fails media: cedrus: Add device-tree compatible and variant for A64 support media: cedrus: Add device-tree compatible and variant for H5 support media: dt-bindings: media: cedrus: Add compatibles for the A64 and H5 media: video-i2c: check if chip struct has set_power function media: video-i2c: support runtime PM media: staging: media: imx: Use of_node_name_eq for node name comparisons media: v4l2-subdev: document controls need _FL_HAS_DEVNODE media: vivid: Improve timestamping ...
2 parents eaa7649 + 4bd46aa commit 5813540

File tree

780 files changed

+17553
-3643
lines changed

Some content is hidden

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

780 files changed

+17553
-3643
lines changed

‎Documentation/devicetree/bindings/media/aspeed-video.txt

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
* Device tree bindings for Aspeed Video Engine
2+
3+
The Video Engine (VE) embedded in the Aspeed AST2400 and AST2500 SOCs can
4+
capture and compress video data from digital or analog sources.
5+
6+
Required properties:
7+
- compatible: "aspeed,ast2400-video-engine" or
8+
"aspeed,ast2500-video-engine"
9+
- reg: contains the offset and length of the VE memory region
10+
- clocks: clock specifiers for the syscon clocks associated with
11+
the VE (ordering must match the clock-names property)
12+
- clock-names: "vclk" and "eclk"
13+
- resets: reset specifier for the syscon reset associated with
14+
the VE
15+
- interrupts: the interrupt associated with the VE on this platform
16+
17+
Example:
18+
19+
video-engine@1e700000 {
20+
compatible = "aspeed,ast2500-video-engine";
21+
reg = <0x1e700000 0x20000>;
22+
clocks = <&syscon ASPEED_CLK_GATE_VCLK>, <&syscon ASPEED_CLK_GATE_ECLK>;
23+
clock-names = "vclk", "eclk";
24+
resets = <&syscon ASPEED_RESET_VIDEO>;
25+
interrupts = <7>;
26+
};

‎Documentation/devicetree/bindings/media/cedrus.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ Required properties:
1111
- "allwinner,sun7i-a20-video-engine"
1212
- "allwinner,sun8i-a33-video-engine"
1313
- "allwinner,sun8i-h3-video-engine"
14+
- "allwinner,sun50i-a64-video-engine"
15+
- "allwinner,sun50i-h5-video-engine"
1416
- reg : register base and length of VE;
1517
- clocks : list of clock specifiers, corresponding to entries in
1618
the clock-names property;

‎Documentation/devicetree/bindings/media/i2c/mt9m111.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,14 @@ Required Properties:
99
- clocks: reference to the master clock.
1010
- clock-names: shall be "mclk".
1111

12-
For further reading on port node refer to
13-
Documentation/devicetree/bindings/media/video-interfaces.txt.
12+
The device node must contain one 'port' child node with one 'endpoint' child
13+
sub-node for its digital output video port, in accordance with the video
14+
interface bindings defined in:
15+
Documentation/devicetree/bindings/media/video-interfaces.txt
16+
17+
Optional endpoint properties:
18+
- pclk-sample: For information see ../video-interfaces.txt. The value is set to
19+
0 if it isn't specified.
1420

1521
Example:
1622

@@ -21,11 +27,10 @@ Example:
2127
clocks = <&mclk>;
2228
clock-names = "mclk";
2329

24-
remote = <&pxa_camera>;
2530
port {
2631
mt9m111_1: endpoint {
27-
bus-width = <8>;
2832
remote-endpoint = <&pxa_camera>;
33+
pclk-sample = <1>;
2934
};
3035
};
3136
};

‎Documentation/devicetree/bindings/media/i2c/sony,imx214.txt

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
* Sony 1/3.06-Inch 13.13Mp CMOS Digital Image Sensor
2+
3+
The Sony imx214 is a 1/3.06-inch CMOS active pixel digital image sensor with
4+
an active array size of 4224H x 3200V. It is programmable through an I2C
5+
interface.
6+
Image data is sent through MIPI CSI-2, through 2 or 4 lanes at a maximum
7+
throughput of 1.2Gbps/lane.
8+
9+
10+
Required Properties:
11+
- compatible: Shall be "sony,imx214".
12+
- reg: I2C bus address of the device. Depending on how the sensor is wired,
13+
it shall be <0x10> or <0x1a>;
14+
- enable-gpios: GPIO descriptor for the enable pin.
15+
- vdddo-supply: Chip digital IO regulator (1.8V).
16+
- vdda-supply: Chip analog regulator (2.7V).
17+
- vddd-supply: Chip digital core regulator (1.12V).
18+
- clocks: Reference to the xclk clock.
19+
- clock-frequency: Frequency of the xclk clock.
20+
21+
Optional Properties:
22+
- flash-leds: See ../video-interfaces.txt
23+
- lens-focus: See ../video-interfaces.txt
24+
25+
The imx214 device node shall contain one 'port' child node with
26+
an 'endpoint' subnode. For further reading on port node refer to
27+
Documentation/devicetree/bindings/media/video-interfaces.txt.
28+
29+
Required Properties on endpoint:
30+
- data-lanes: check ../video-interfaces.txt
31+
- link-frequencies: check ../video-interfaces.txt
32+
- remote-endpoint: check ../video-interfaces.txt
33+
34+
Example:
35+
36+
camera-sensor@1a {
37+
compatible = "sony,imx214";
38+
reg = <0x1a>;
39+
vdddo-supply = <&pm8994_lvs1>;
40+
vddd-supply = <&camera_vddd_1v12>;
41+
vdda-supply = <&pm8994_l17>;
42+
lens-focus = <&ad5820>;
43+
enable-gpios = <&msmgpio 25 GPIO_ACTIVE_HIGH>;
44+
clocks = <&mmcc CAMSS_MCLK0_CLK>;
45+
clock-frequency = <24000000>;
46+
port {
47+
imx214_ep: endpoint {
48+
data-lanes = <1 2 3 4>;
49+
link-frequencies = /bits/ 64 <480000000>;
50+
remote-endpoint = <&csiphy0_ep>;
51+
};
52+
};
53+
};

‎Documentation/devicetree/bindings/media/qcom,venus.txt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,8 @@
5353

5454
* Subnodes
5555
The Venus video-codec node must contain two subnodes representing
56-
video-decoder and video-encoder.
56+
video-decoder and video-encoder, and one optional firmware subnode.
57+
Firmware subnode is needed when the platform does not have TrustZone.
5758

5859
Every of video-encoder or video-decoder subnode should have:
5960

@@ -79,6 +80,13 @@ Every of video-encoder or video-decoder subnode should have:
7980
power domain which is responsible for collapsing
8081
and restoring power to the subcore.
8182

83+
The firmware subnode must have:
84+
85+
- iommus:
86+
Usage: required
87+
Value type: <prop-encoded-array>
88+
Definition: A list of phandle and IOMMU specifier pairs.
89+
8290
* An Example
8391
video-codec@1d00000 {
8492
compatible = "qcom,msm8916-venus";
@@ -105,4 +113,8 @@ Every of video-encoder or video-decoder subnode should have:
105113
clock-names = "core";
106114
power-domains = <&mmcc VENUS_CORE1_GDSC>;
107115
};
116+
117+
video-firmware {
118+
iommus = <&apps_iommu 0x10b2 0x0>;
119+
};
108120
};

‎Documentation/devicetree/bindings/media/rcar_vin.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ on Gen3 platforms to a CSI-2 receiver.
2424
- "renesas,vin-r8a7796" for the R8A7796 device
2525
- "renesas,vin-r8a77965" for the R8A77965 device
2626
- "renesas,vin-r8a77970" for the R8A77970 device
27+
- "renesas,vin-r8a77980" for the R8A77980 device
28+
- "renesas,vin-r8a77990" for the R8A77990 device
2729
- "renesas,vin-r8a77995" for the R8A77995 device
2830
- "renesas,rcar-gen2-vin" for a generic R-Car Gen2 or RZ/G1 compatible
2931
device.

‎Documentation/devicetree/bindings/media/renesas,rcar-csi2.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ Mandatory properties
1212
- "renesas,r8a7796-csi2" for the R8A7796 device.
1313
- "renesas,r8a77965-csi2" for the R8A77965 device.
1414
- "renesas,r8a77970-csi2" for the R8A77970 device.
15+
- "renesas,r8a77980-csi2" for the R8A77980 device.
16+
- "renesas,r8a77990-csi2" for the R8A77990 device.
1517

1618
- reg: the register base and size for the device registers
1719
- interrupts: the interrupt for the device

‎Documentation/devicetree/bindings/media/rockchip-vpu.txt

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
device-tree bindings for rockchip VPU codec
2+
3+
Rockchip (Video Processing Unit) present in various Rockchip platforms,
4+
such as RK3288 and RK3399.
5+
6+
Required properties:
7+
- compatible: value should be one of the following
8+
"rockchip,rk3288-vpu";
9+
"rockchip,rk3399-vpu";
10+
- interrupts: encoding and decoding interrupt specifiers
11+
- interrupt-names: should be "vepu" and "vdpu"
12+
- clocks: phandle to VPU aclk, hclk clocks
13+
- clock-names: should be "aclk" and "hclk"
14+
- power-domains: phandle to power domain node
15+
- iommus: phandle to a iommu node
16+
17+
Example:
18+
SoC-specific DT entry:
19+
vpu: video-codec@ff9a0000 {
20+
compatible = "rockchip,rk3288-vpu";
21+
reg = <0x0 0xff9a0000 0x0 0x800>;
22+
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
23+
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
24+
interrupt-names = "vepu", "vdpu";
25+
clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;
26+
clock-names = "aclk", "hclk";
27+
power-domains = <&power RK3288_PD_VIDEO>;
28+
iommus = <&vpu_mmu>;
29+
};

‎Documentation/devicetree/bindings/media/spi/sony-cxd2880.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ Required properties:
55
- reg: SPI chip select number for the device.
66
- spi-max-frequency: Maximum bus speed, should be set to <55000000> (55MHz).
77

8+
Optional properties:
9+
- vcc-supply: Optional phandle to the vcc regulator to power the adapter,
10+
as described in the file ../regulator/regulator.txt
11+
812
Example:
913

1014
cxd2880@0 {

‎Documentation/devicetree/bindings/media/sun6i-csi.txt

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
Allwinner V3s Camera Sensor Interface
2+
-------------------------------------
3+
4+
Allwinner V3s SoC features a CSI module(CSI1) with parallel interface.
5+
6+
Required properties:
7+
- compatible: value must be one of:
8+
* "allwinner,sun6i-a31-csi"
9+
* "allwinner,sun8i-h3-csi", "allwinner,sun6i-a31-csi"
10+
* "allwinner,sun8i-v3s-csi"
11+
- reg: base address and size of the memory-mapped region.
12+
- interrupts: interrupt associated to this IP
13+
- clocks: phandles to the clocks feeding the CSI
14+
* bus: the CSI interface clock
15+
* mod: the CSI module clock
16+
* ram: the CSI DRAM clock
17+
- clock-names: the clock names mentioned above
18+
- resets: phandles to the reset line driving the CSI
19+
20+
The CSI node should contain one 'port' child node with one child 'endpoint'
21+
node, according to the bindings defined in
22+
Documentation/devicetree/bindings/media/video-interfaces.txt.
23+
24+
Endpoint node properties for CSI
25+
---------------------------------
26+
See the video-interfaces.txt for a detailed description of these properties.
27+
- remote-endpoint : (required) a phandle to the bus receiver's endpoint
28+
node
29+
- bus-width: : (required) must be 8, 10, 12 or 16
30+
- pclk-sample : (optional) (default: sample on falling edge)
31+
- hsync-active : (required; parallel-only)
32+
- vsync-active : (required; parallel-only)
33+
34+
Example:
35+
36+
csi1: csi@1cb4000 {
37+
compatible = "allwinner,sun8i-v3s-csi";
38+
reg = <0x01cb4000 0x1000>;
39+
interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
40+
clocks = <&ccu CLK_BUS_CSI>,
41+
<&ccu CLK_CSI1_SCLK>,
42+
<&ccu CLK_DRAM_CSI>;
43+
clock-names = "bus", "mod", "ram";
44+
resets = <&ccu RST_BUS_CSI>;
45+
46+
port {
47+
/* Parallel bus endpoint */
48+
csi1_ep: endpoint {
49+
remote-endpoint = <&adv7611_ep>;
50+
bus-width = <16>;
51+
52+
/* If hsync-active/vsync-active are missing,
53+
embedded BT.656 sync is used */
54+
hsync-active = <0>; /* Active low */
55+
vsync-active = <0>; /* Active low */
56+
pclk-sample = <1>; /* Rising */
57+
};
58+
};
59+
};

‎Documentation/media/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
*.pdf
24
# Files generated from *.dot
35
uapi/v4l/pipeline.svg

‎Documentation/media/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
# Rules to convert a .h file to inline RST documentation
24

35
SRC_DIR=$(srctree)/Documentation/media

‎Documentation/media/audio.h.rst.exceptions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
# Ignore header name
24
ignore define _DVBAUDIO_H_
35

‎Documentation/media/ca.h.rst.exceptions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
# Ignore header name
24
ignore define _DVBCA_H_
35

‎Documentation/media/cec-drivers/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. -*- coding: utf-8; mode: rst -*-
1+
.. SPDX-License-Identifier: GPL-2.0
22
33
.. include:: <isonum.txt>
44

‎Documentation/media/cec-drivers/pulse8-cec.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Pulse-Eight CEC Adapter driver
24
==============================
35

‎Documentation/media/cec.h.rst.exceptions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
# Ignore header name
24
ignore define _CEC_UAPI_H
35

‎Documentation/media/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- coding: utf-8; mode: python -*-
22

3+
# SPDX-License-Identifier: GPL-2.0
4+
35
project = 'Linux Media Subsystem Documentation'
46

57
tags.add("subproject")

‎Documentation/media/conf_nitpick.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# -*- coding: utf-8; mode: python -*-
22

3+
# SPDX-License-Identifier: GPL-2.0
4+
35
project = 'Linux Media Subsystem Documentation'
46

57
# It is possible to run Sphinx in nickpick mode with:

‎Documentation/media/dmx.h.rst.exceptions

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
13
# Ignore header name
24
ignore define _UAPI_DVBDMX_H_
35

‎Documentation/media/dvb-drivers/avermedia.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
HOWTO: Get An Avermedia DVB-T working under Linux
24
-------------------------------------------------
35

‎Documentation/media/dvb-drivers/bt8xx.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
How to get the bt8xx cards working
24
==================================
35

‎Documentation/media/dvb-drivers/cards.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Hardware supported by the linuxtv.org DVB drivers
24
=================================================
35

‎Documentation/media/dvb-drivers/ci.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Digital TV Conditional Access Interface (CI API)
24
================================================
35

‎Documentation/media/dvb-drivers/contributors.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Contributors
24
============
35

‎Documentation/media/dvb-drivers/dvb-usb.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Idea behind the dvb-usb-framework
24
=================================
35

‎Documentation/media/dvb-drivers/faq.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
FAQ
24
===
35

‎Documentation/media/dvb-drivers/frontends.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
****************
24
Frontend drivers
35
****************

‎Documentation/media/dvb-drivers/index.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
.. -*- coding: utf-8; mode: rst -*-
1+
.. SPDX-License-Identifier: GPL-2.0
22
33
.. include:: <isonum.txt>
44

‎Documentation/media/dvb-drivers/intro.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
.. SPDX-License-Identifier: GPL-2.0
2+
13
Introduction
24
============
35

0 commit comments

Comments
 (0)