Skip to content

Commit 846de71

Browse files
committed
Merge tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - New staging driver for Rockship ISPv1 unit - New staging driver for Rockchip MIPI Synopsys DPHY RX0 - y2038 fixes at V4L2 API (backward-compatible) - A dvb core fix when receiving invalid EIT sections - Some clang-specific warnings got fixed - Added support for touch V4L2 interface at vivid - Several drivers were converted to use the new i2c_new_scanned_device() kAPI - Added sm1 support at meson's vdec driver - Several other driver cleanups, fixes and improvements * tag 'media/v5.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (207 commits) media: staging/intel-ipu3: remove TODO item about acronyms media: v4l2-fwnode: Print the node name while parsing endpoints media: Revert "media: staging/intel-ipu3: make imgu use fixed running mode" media: mt9v111: constify copied structure media: platform: VIDEO_MEDIATEK_JPEG can also depend on MTK_IOMMU media: uvcvideo: Add a quirk to force GEO GC6500 Camera bits-per-pixel value media: uvcvideo: Avoid cyclic entity chains due to malformed USB descriptors media: hantro: fix post-processing NULL pointer dereference media: rcar-vin: Use correct pixel format when aligning format media: MAINTAINERS: add entry for Rockchip ISP1 driver media: staging: rkisp1: add TODO file for staging media: staging: rkisp1: add document for rkisp1 meta buffer format media: staging: rkisp1: add output device for parameters media: staging: rkisp1: add capture device for statistics media: staging: rkisp1: add user space ABI definitions media: staging: rkisp1: add streaming paths media: staging: rkisp1: add Rockchip ISP1 base driver media: staging: phy-rockchip-dphy-rx0: add Rockchip MIPI Synopsys DPHY RX0 driver media: staging: dt-bindings: add Rockchip MIPI RX D-PHY RX0 yaml bindings media: staging: dt-bindings: add Rockchip ISP1 yaml bindings ...
2 parents 8fdd401 + 1697d98 commit 846de71

File tree

215 files changed

+14973
-2355
lines changed

Some content is hidden

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

215 files changed

+14973
-2355
lines changed

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-csi.yaml

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,15 @@ description: |-
1616
1717
properties:
1818
compatible:
19-
const: allwinner,sun7i-a20-csi0
19+
oneOf:
20+
- const: allwinner,sun4i-a10-csi1
21+
- const: allwinner,sun7i-a20-csi0
22+
- items:
23+
- const: allwinner,sun7i-a20-csi1
24+
- const: allwinner,sun4i-a10-csi1
25+
- items:
26+
- const: allwinner,sun8i-r40-csi0
27+
- const: allwinner,sun7i-a20-csi0
2028

2129
reg:
2230
maxItems: 1
@@ -25,12 +33,16 @@ properties:
2533
maxItems: 1
2634

2735
clocks:
36+
minItems: 2
37+
maxItems: 3
2838
items:
2939
- description: The CSI interface clock
3040
- description: The CSI ISP clock
3141
- description: The CSI DRAM clock
3242

3343
clock-names:
44+
minItems: 2
45+
maxItems: 3
3446
items:
3547
- const: bus
3648
- const: isp
Lines changed: 141 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,141 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
# Copyright 2019 BayLibre, SAS
3+
%YAML 1.2
4+
---
5+
$id: "http://devicetree.org/schemas/media/amlogic,gx-vdec.yaml#"
6+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
7+
8+
title: Amlogic Video Decoder
9+
10+
maintainers:
11+
- Neil Armstrong <[email protected]>
12+
- Maxime Jourdan <[email protected]>
13+
14+
description: |
15+
The video decoding IP lies within the DOS memory region,
16+
except for the hardware bitstream parser that makes use of an undocumented
17+
region.
18+
19+
It makes use of the following blocks:
20+
- ESPARSER is a bitstream parser that outputs to a VIFIFO. Further VDEC blocks
21+
then feed from this VIFIFO.
22+
- VDEC_1 can decode MPEG-1, MPEG-2, MPEG-4 part 2, MJPEG, H.263, H.264, VC-1.
23+
- VDEC_HEVC can decode HEVC and VP9.
24+
25+
Both VDEC_1 and VDEC_HEVC share the "vdec" IRQ and as such cannot run
26+
concurrently.
27+
28+
properties:
29+
compatible:
30+
oneOf:
31+
- items:
32+
- enum:
33+
- amlogic,gxbb-vdec # GXBB (S905)
34+
- amlogic,gxl-vdec # GXL (S905X, S905D)
35+
- amlogic,gxm-vdec # GXM (S912)
36+
- const: amlogic,gx-vdec
37+
- enum:
38+
- amlogic,g12a-vdec # G12A (S905X2, S905D2)
39+
- amlogic,sm1-vdec # SM1 (S905X3, S905D3)
40+
41+
interrupts:
42+
minItems: 2
43+
44+
interrupt-names:
45+
items:
46+
- const: vdec
47+
- const: esparser
48+
49+
reg:
50+
minItems: 2
51+
52+
reg-names:
53+
items:
54+
- const: dos
55+
- const: esparser
56+
57+
resets:
58+
maxItems: 1
59+
60+
reset-names:
61+
items:
62+
- const: esparser
63+
64+
clocks:
65+
minItems: 4
66+
maxItems: 5
67+
68+
clock-names:
69+
minItems: 4
70+
maxItems: 5
71+
items:
72+
- const: dos_parser
73+
- const: dos
74+
- const: vdec_1
75+
- const: vdec_hevc
76+
- const: vdec_hevcf
77+
78+
amlogic,ao-sysctrl:
79+
description: should point to the AOBUS sysctrl node
80+
allOf:
81+
- $ref: /schemas/types.yaml#/definitions/phandle
82+
83+
amlogic,canvas:
84+
description: should point to a canvas provider node
85+
allOf:
86+
- $ref: /schemas/types.yaml#/definitions/phandle
87+
88+
allOf:
89+
- if:
90+
properties:
91+
compatible:
92+
contains:
93+
enum:
94+
- amlogic,gx-vdec
95+
96+
then:
97+
properties:
98+
clock-names:
99+
maxItems: 4
100+
101+
- if:
102+
properties:
103+
compatible:
104+
contains:
105+
enum:
106+
- amlogic,g12a-vdec
107+
- amlogic,sm1-vdec
108+
109+
then:
110+
properties:
111+
clock-names:
112+
minItems: 5
113+
114+
required:
115+
- compatible
116+
- reg
117+
- reg-names
118+
- interrupts
119+
- interrupt-names
120+
- clocks
121+
- clock-names
122+
- resets
123+
- reset-names
124+
- amlogic,ao-sysctrl
125+
- amlogic,canvas
126+
127+
examples:
128+
- |
129+
vdec: video-decoder@c8820000 {
130+
compatible = "amlogic,gxl-vdec", "amlogic,gx-vdec";
131+
reg = <0xc8820000 0x10000>, <0xc110a580 0xe4>;
132+
reg-names = "dos", "esparser";
133+
interrupts = <44>, <32>;
134+
interrupt-names = "vdec", "esparser";
135+
clocks = <&clk_dos_parser> ,<&clk_dos>, <&clk_vdec_1>, <&clk_vdec_hevc>;
136+
clock-names = "dos_parser", "dos", "vdec_1", "vdec_hevc";
137+
resets = <&reset_parser>;
138+
reset-names = "esparser";
139+
amlogic,ao-sysctrl = <&sysctrl_AO>;
140+
amlogic,canvas = <&canvas>;
141+
};

Documentation/devicetree/bindings/media/amlogic,vdec.txt

Lines changed: 0 additions & 72 deletions
This file was deleted.

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
Device-Tree bindings for hix5hd2 ir IP
22

33
Required properties:
4-
- compatible: Should contain "hisilicon,hix5hd2-ir".
4+
- compatible: Should contain "hisilicon,hix5hd2-ir", or:
5+
- "hisilicon,hi3796cv300-ir" for Hi3796CV300 IR device.
56
- reg: Base physical address of the controller and length of memory
67
mapped region.
78
- interrupts: interrupt-specifier for the sole interrupt generated by

Documentation/devicetree/bindings/media/renesas,vin.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ on Gen3 and RZ/G2 platforms to a CSI-2 receiver.
1313
- "renesas,vin-r8a7743" for the R8A7743 device
1414
- "renesas,vin-r8a7744" for the R8A7744 device
1515
- "renesas,vin-r8a7745" for the R8A7745 device
16+
- "renesas,vin-r8a77470" for the R8A77470 device
1617
- "renesas,vin-r8a774a1" for the R8A774A1 device
1718
- "renesas,vin-r8a774b1" for the R8A774B1 device
1819
- "renesas,vin-r8a774c0" for the R8A774C0 device
@@ -41,9 +42,6 @@ on Gen3 and RZ/G2 platforms to a CSI-2 receiver.
4142
- interrupts: the interrupt for the device
4243
- clocks: Reference to the parent clock
4344

44-
Additionally, an alias named vinX will need to be created to specify
45-
which video input device this is.
46-
4745
The per-board settings for Gen2 and RZ/G1 platforms:
4846

4947
- port - sub-node describing a single endpoint connected to the VIN

0 commit comments

Comments
 (0)