Skip to content

Commit 184a099

Browse files
torvaldstorvalds
committed
Merge tag 'media/v6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - Sensor driver fixes - remove dead TI wl128x FM radio driver - Add support for the imx462 sensor at the IMX290 binding - V4L2 pixel data transmitter and receiver documentation improvements - Add support for MIPI Discovery and Configuration for C-PHY line orders - imx8-isi fixes and improvements - stm32: dcmipp: add core support for the stm32mp25 - qcom: camss: Add sc7280 support - Various fixes and enhancements * tag 'media/v6.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (152 commits) media: nuvoton: Fix an error check in npcm_video_ece_init() media: dvb-usb-v2: af9035: fix ISO C90 compilation error on af9035_i2c_master_xfer media: platform: rzg2l-cru: rzg2l-video: Fix the comment in rzg2l_cru_start_streaming_vq() media: fix secfeed undefined when filter alloc fail media: dt-bindings: trivial white-space and example cleanup MAINTAINERS: repair file entry in MEDIA DRIVERS FOR STM32 - CSI media: solo6x10: Use const 'struct bin_attribute' callback media: saa7164: Remove unused values staging: media: imx: fix OF node leak in imx_media_add_of_subdevs() media: platform: exynos4-is: Remove unused __is_get_frame_size media: vidtv: Fix a null-ptr-deref in vidtv_mux_stop_thread media: mmp: Bring back registration of the device media: cec: include linux/debugfs.h and linux/seq_file.h where needed Revert "media: qcom: camss: Restructure camss_link_entities" media: venus: Remove unused hfi_core_ping() media: dt-bindings: qcom-venus: Deprecate video-decoder and video-encoder where applicable media: venus: Populate video encoder/decoder nodename entries media: venus: Add support for static video encoder/decoder declarations media: venus: match instance creation and destruction order media: venus: destroy hfi session after m2m_ctx release ...
2 parents 4050577 + c4b7779 commit 184a099

File tree

164 files changed

+4606
-6317
lines changed

Some content is hidden

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

164 files changed

+4606
-6317
lines changed

‎Documentation/admin-guide/media/ipu3.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ frames in packed raw Bayer format to IPU3 CSI2 receiver.
9898
# and that ov5670 sensor is connected to i2c bus 10 with address 0x36
9999
export SDEV=$(media-ctl -d $MDEV -e "ov5670 10-0036")
100100
101-
# Establish the link for the media devices using media-ctl [#f3]_
101+
# Establish the link for the media devices using media-ctl
102102
media-ctl -d $MDEV -l "ov5670:0 -> ipu3-csi2 0:0[1]"
103103
104104
# Set the format for the media devices
@@ -589,12 +589,8 @@ preserved.
589589
References
590590
==========
591591

592-
.. [#f5] drivers/staging/media/ipu3/include/uapi/intel-ipu3.h
593-
594592
.. [#f1] https://github.com/intel/nvt
595593
596594
.. [#f2] http://git.ideasonboard.org/yavta.git
597595
598-
.. [#f3] http://git.ideasonboard.org/?p=media-ctl.git;a=summary
599-
600596
.. [#f4] ImgU limitation requires an additional 16x16 for all input resolutions

‎Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/allwinner,sun50i-h6-vpu-g2.yaml#

‎Documentation/devicetree/bindings/media/amlogic,meson-ir-tx.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/amlogic,meson-ir-tx.yaml#

‎Documentation/devicetree/bindings/media/amphion,vpu.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/amphion,vpu.yaml#

‎Documentation/devicetree/bindings/media/fsl,imx6ull-pxp.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/fsl,imx6ull-pxp.yaml#

‎Documentation/devicetree/bindings/media/i2c/sony,imx290.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ properties:
3333
- sony,imx290lqr # Colour
3434
- sony,imx290llr # Monochrome
3535
- sony,imx327lqr # Colour
36+
- sony,imx462lqr # Colour
37+
- sony,imx462llr # Monochrome
3638
- const: sony,imx290
3739
deprecated: true
3840

‎Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/mediatek,vcodec-decoder.yaml#

‎Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/mediatek,vcodec-encoder.yaml#

‎Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/mediatek,vcodec-subdev-decoder.yaml#

‎Documentation/devicetree/bindings/media/microchip,sama5d4-vdec.yaml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/microchip,sama5d4-vdec.yaml#
@@ -36,12 +35,12 @@ additionalProperties: false
3635

3736
examples:
3837
- |
39-
#include <dt-bindings/clock/at91.h>
40-
#include <dt-bindings/interrupt-controller/irq.h>
41-
42-
vdec0: vdec@300000 {
43-
compatible = "microchip,sama5d4-vdec";
44-
reg = <0x00300000 0x100000>;
45-
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
46-
clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
47-
};
38+
#include <dt-bindings/clock/at91.h>
39+
#include <dt-bindings/interrupt-controller/irq.h>
40+
41+
vdec@300000 {
42+
compatible = "microchip,sama5d4-vdec";
43+
reg = <0x00300000 0x100000>;
44+
interrupts = <19 IRQ_TYPE_LEVEL_HIGH 4>;
45+
clocks = <&pmc PMC_TYPE_PERIPHERAL 19>;
46+
};

‎Documentation/devicetree/bindings/media/nxp,imx8-isi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ properties:
2121
enum:
2222
- fsl,imx8mn-isi
2323
- fsl,imx8mp-isi
24+
- fsl,imx8ulp-isi
2425
- fsl,imx93-isi
2526

2627
reg:
@@ -75,6 +76,7 @@ allOf:
7576
contains:
7677
enum:
7778
- fsl,imx8mn-isi
79+
- fsl,imx8ulp-isi
7880
- fsl,imx93-isi
7981
then:
8082
properties:

‎Documentation/devicetree/bindings/media/nxp,imx8mq-vpu.yaml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/nxp,imx8mq-vpu.yaml#
@@ -44,26 +43,26 @@ additionalProperties: false
4443

4544
examples:
4645
- |
47-
#include <dt-bindings/clock/imx8mq-clock.h>
48-
#include <dt-bindings/power/imx8mq-power.h>
49-
#include <dt-bindings/interrupt-controller/arm-gic.h>
46+
#include <dt-bindings/clock/imx8mq-clock.h>
47+
#include <dt-bindings/power/imx8mq-power.h>
48+
#include <dt-bindings/interrupt-controller/arm-gic.h>
5049
51-
vpu_g1: video-codec@38300000 {
52-
compatible = "nxp,imx8mq-vpu-g1";
53-
reg = <0x38300000 0x10000>;
54-
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
55-
clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>;
56-
power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>;
57-
};
50+
video-codec@38300000 {
51+
compatible = "nxp,imx8mq-vpu-g1";
52+
reg = <0x38300000 0x10000>;
53+
interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
54+
clocks = <&clk IMX8MQ_CLK_VPU_G1_ROOT>;
55+
power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G1>;
56+
};
5857
- |
59-
#include <dt-bindings/clock/imx8mq-clock.h>
60-
#include <dt-bindings/power/imx8mq-power.h>
61-
#include <dt-bindings/interrupt-controller/arm-gic.h>
58+
#include <dt-bindings/clock/imx8mq-clock.h>
59+
#include <dt-bindings/power/imx8mq-power.h>
60+
#include <dt-bindings/interrupt-controller/arm-gic.h>
6261
63-
vpu_g2: video-codec@38300000 {
64-
compatible = "nxp,imx8mq-vpu-g2";
65-
reg = <0x38310000 0x10000>;
66-
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
67-
clocks = <&clk IMX8MQ_CLK_VPU_G2_ROOT>;
68-
power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G2>;
69-
};
62+
video-codec@38300000 {
63+
compatible = "nxp,imx8mq-vpu-g2";
64+
reg = <0x38310000 0x10000>;
65+
interrupts = <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH>;
66+
clocks = <&clk IMX8MQ_CLK_VPU_G2_ROOT>;
67+
power-domains = <&vpu_blk_ctrl IMX8MQ_VPUBLK_PD_G2>;
68+
};

‎Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/qcom,msm8916-camss.yaml#

‎Documentation/devicetree/bindings/media/qcom,msm8916-venus.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ properties:
4545
required:
4646
- compatible
4747

48+
deprecated: true
4849
additionalProperties: false
4950

5051
video-encoder:
@@ -57,13 +58,12 @@ properties:
5758
required:
5859
- compatible
5960

61+
deprecated: true
6062
additionalProperties: false
6163

6264
required:
6365
- compatible
6466
- iommus
65-
- video-decoder
66-
- video-encoder
6767

6868
unevaluatedProperties: false
6969

@@ -83,12 +83,4 @@ examples:
8383
power-domains = <&gcc VENUS_GDSC>;
8484
iommus = <&apps_iommu 5>;
8585
memory-region = <&venus_mem>;
86-
87-
video-decoder {
88-
compatible = "venus-decoder";
89-
};
90-
91-
video-encoder {
92-
compatible = "venus-encoder";
93-
};
9486
};

‎Documentation/devicetree/bindings/media/qcom,msm8996-camss.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2-
32
%YAML 1.2
43
---
54
$id: http://devicetree.org/schemas/media/qcom,msm8996-camss.yaml#

‎Documentation/devicetree/bindings/media/qcom,sc7180-venus.yaml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ properties:
7070
required:
7171
- compatible
7272

73+
deprecated: true
7374
additionalProperties: false
7475

7576
video-encoder:
@@ -82,14 +83,13 @@ properties:
8283
required:
8384
- compatible
8485

86+
deprecated: true
8587
additionalProperties: false
8688

8789
required:
8890
- compatible
8991
- power-domain-names
9092
- iommus
91-
- video-decoder
92-
- video-encoder
9393

9494
unevaluatedProperties: false
9595

@@ -114,12 +114,4 @@ examples:
114114
"vcodec0_core", "vcodec0_bus";
115115
iommus = <&apps_smmu 0x0c00 0x60>;
116116
memory-region = <&venus_mem>;
117-
118-
video-decoder {
119-
compatible = "venus-decoder";
120-
};
121-
122-
video-encoder {
123-
compatible = "venus-encoder";
124-
};
125117
};

0 commit comments

Comments
 (0)