Skip to content

Commit 063d194

Browse files
committed
Merge tag 'media/v5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - New sensor driver: imx219 - Support for some new pixelformats - Support for Sun8i SoC - Added more codecs to meson vdec driver - Prepare for removing the legacy usbvision driver by moving it to staging. This driver has issues and use legacy core APIs. If nobody steps up to address those, it is time for its retirement. - Several cleanups and improvements on drivers, with the addition of new supported boards * tag 'media/v5.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (236 commits) media: venus: firmware: Ignore secure call error on first resume media: mtk-vpu: load vpu firmware from the new location media: i2c: video-i2c: fix build errors due to 'imply hwmon' media: MAINTAINERS: add myself to co-maintain Hantro G1/G2 for i.MX8MQ media: hantro: add initial i.MX8MQ support media: dt-bindings: Document i.MX8MQ VPU bindings media: vivid: fix incorrect PA assignment to HDMI outputs media: hantro: Add linux-rockchip mailing list to MAINTAINERS media: cedrus: h264: Fix 4K decoding on H6 media: siano: Use scnprintf() for avoiding potential buffer overflow media: rc: Use scnprintf() for avoiding potential buffer overflow media: allegro: create new struct for channel parameters media: allegro: move mail definitions to separate file media: allegro: pass buffers through firmware media: allegro: verify source and destination buffer in VCU response media: allegro: handle dependency of bitrate and bitrate_peak media: allegro: read bitrate mode directly from control media: allegro: make QP configurable media: allegro: make frame rate configurable media: allegro: skip filler data if possible ...
2 parents 47acac8 + 2632e7b commit 063d194

File tree

343 files changed

+14879
-3012
lines changed

Some content is hidden

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

343 files changed

+14879
-3012
lines changed

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ Santosh Shilimkar <[email protected]>
244244
Santosh Shilimkar <[email protected]>
245245
Sascha Hauer <[email protected]>
246246
S.Çağlar Onur <[email protected]>
247+
247248
248249
249250

Documentation/devicetree/bindings/display/connector/analog-tv-connector.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,22 @@ Required properties:
66

77
Optional properties:
88
- label: a symbolic name for the connector
9+
- sdtv-standards: limit the supported TV standards on a connector to the given
10+
ones. If not specified all TV standards are allowed.
11+
Possible TV standards are defined in
12+
include/dt-bindings/display/sdtv-standards.h.
913

1014
Required nodes:
1115
- Video port for TV input
1216

1317
Example
1418
-------
19+
#include <dt-bindings/display/sdtv-standards.h>
1520

1621
tv: connector {
1722
compatible = "composite-video-connector";
1823
label = "tv";
24+
sdtv-standards = <(SDTV_STD_PAL | SDTV_STD_NTSC)>;
1925

2026
port {
2127
tv_connector_in: endpoint {
Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/allwinner,sun8i-a83t-de2-rotate.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Allwinner A83T DE2 Rotate Device Tree Bindings
8+
9+
maintainers:
10+
- Jernej Skrabec <[email protected]>
11+
- Chen-Yu Tsai <[email protected]>
12+
- Maxime Ripard <[email protected]>
13+
14+
description: |-
15+
The Allwinner A83T and A64 have a rotation core used for
16+
rotating and flipping images.
17+
18+
properties:
19+
compatible:
20+
oneOf:
21+
- const: allwinner,sun8i-a83t-de2-rotate
22+
- items:
23+
- const: allwinner,sun50i-a64-de2-rotate
24+
- const: allwinner,sun8i-a83t-de2-rotate
25+
26+
reg:
27+
maxItems: 1
28+
29+
interrupts:
30+
maxItems: 1
31+
32+
clocks:
33+
items:
34+
- description: Rotate interface clock
35+
- description: Rotate module clock
36+
37+
clock-names:
38+
items:
39+
- const: bus
40+
- const: mod
41+
42+
resets:
43+
maxItems: 1
44+
45+
required:
46+
- compatible
47+
- reg
48+
- interrupts
49+
- clocks
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |
55+
#include <dt-bindings/interrupt-controller/arm-gic.h>
56+
#include <dt-bindings/clock/sun8i-de2.h>
57+
#include <dt-bindings/reset/sun8i-de2.h>
58+
59+
rotate: rotate@1020000 {
60+
compatible = "allwinner,sun8i-a83t-de2-rotate";
61+
reg = <0x1020000 0x10000>;
62+
interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
63+
clocks = <&display_clocks CLK_BUS_ROT>,
64+
<&display_clocks CLK_ROT>;
65+
clock-names = "bus",
66+
"mod";
67+
resets = <&display_clocks RST_ROT>;
68+
};
69+
70+
...

Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,11 @@ description: |-
1717
1818
properties:
1919
compatible:
20-
const: allwinner,sun8i-h3-deinterlace
20+
oneOf:
21+
- const: allwinner,sun8i-h3-deinterlace
22+
- items:
23+
- const: allwinner,sun50i-a64-deinterlace
24+
- const: allwinner,sun8i-h3-deinterlace
2125

2226
reg:
2327
maxItems: 1

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
* Device tree bindings for Aspeed Video Engine
22

3-
The Video Engine (VE) embedded in the Aspeed AST2400 and AST2500 SOCs can
3+
The Video Engine (VE) embedded in the Aspeed AST2400/2500/2600 SOCs can
44
capture and compress video data from digital or analog sources.
55

66
Required properties:
77
- compatible: "aspeed,ast2400-video-engine" or
8-
"aspeed,ast2500-video-engine"
8+
"aspeed,ast2500-video-engine" or
9+
"aspeed,ast2600-video-engine"
910
- reg: contains the offset and length of the VE memory region
1011
- clocks: clock specifiers for the syscon clocks associated with
1112
the VE (ordering must match the clock-names property)
Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/media/i2c/imx219.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Sony 1/4.0-Inch 8Mpixel CMOS Digital Image Sensor
8+
9+
maintainers:
10+
- Dave Stevenson <[email protected]>
11+
12+
description: |-
13+
The Sony imx219 is a 1/4.0-inch CMOS active pixel digital image sensor
14+
with an active array size of 3280H x 2464V. It is programmable through
15+
I2C interface. The I2C address is fixed to 0x10 as per sensor data sheet.
16+
Image data is sent through MIPI CSI-2, which is configured as either 2 or
17+
4 data lanes.
18+
19+
properties:
20+
compatible:
21+
const: sony,imx219
22+
23+
reg:
24+
description: I2C device address
25+
maxItems: 1
26+
27+
clocks:
28+
maxItems: 1
29+
30+
VDIG-supply:
31+
description:
32+
Digital I/O voltage supply, 1.8 volts
33+
34+
VANA-supply:
35+
description:
36+
Analog voltage supply, 2.8 volts
37+
38+
VDDL-supply:
39+
description:
40+
Digital core voltage supply, 1.2 volts
41+
42+
reset-gpios:
43+
description: |-
44+
Reference to the GPIO connected to the xclr pin, if any.
45+
Must be released (set high) after all supplies are applied.
46+
47+
# See ../video-interfaces.txt for more details
48+
port:
49+
type: object
50+
properties:
51+
endpoint:
52+
type: object
53+
properties:
54+
data-lanes:
55+
description: |-
56+
The sensor supports either two-lane, or four-lane operation.
57+
If this property is omitted four-lane operation is assumed.
58+
For two-lane operation the property must be set to <1 2>.
59+
items:
60+
- const: 1
61+
- const: 2
62+
63+
clock-noncontinuous:
64+
type: boolean
65+
description: |-
66+
MIPI CSI-2 clock is non-continuous if this property is present,
67+
otherwise it's continuous.
68+
69+
link-frequencies:
70+
allOf:
71+
- $ref: /schemas/types.yaml#/definitions/uint64-array
72+
description:
73+
Allowed data bus frequencies.
74+
75+
required:
76+
- link-frequencies
77+
78+
required:
79+
- compatible
80+
- reg
81+
- clocks
82+
- VANA-supply
83+
- VDIG-supply
84+
- VDDL-supply
85+
- port
86+
87+
additionalProperties: false
88+
89+
examples:
90+
- |
91+
i2c0 {
92+
#address-cells = <1>;
93+
#size-cells = <0>;
94+
95+
imx219: sensor@10 {
96+
compatible = "sony,imx219";
97+
reg = <0x10>;
98+
clocks = <&imx219_clk>;
99+
VANA-supply = <&imx219_vana>; /* 2.8v */
100+
VDIG-supply = <&imx219_vdig>; /* 1.8v */
101+
VDDL-supply = <&imx219_vddl>; /* 1.2v */
102+
103+
port {
104+
imx219_0: endpoint {
105+
remote-endpoint = <&csi1_ep>;
106+
data-lanes = <1 2>;
107+
clock-noncontinuous;
108+
link-frequencies = /bits/ 64 <456000000>;
109+
};
110+
};
111+
};
112+
};
113+
114+
...

0 commit comments

Comments
 (0)