Skip to content

Commit f79e772

Browse files
committed
Merge tag 'media/v6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media updates from Mauro Carvalho Chehab: - Added a new V4L2 clock helper - New camera sensor drivers - iris: Enable H.264/H.265 encoder support and fixes in iris driver common code - camss: add support for new SoC flavors - venus: add new SoC support - tc358743: support more infoframe types - Various fixes, driver improvements and cleanups * tag 'media/v6.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (439 commits) media: venus: pm_helpers: add fallback for the opp-table media: qcom: camss: vfe: Fix BPL alignment for QCM2290 media: tuner: xc5000: Fix use-after-free in xc5000_release media: i2c: tc358743: Fix use-after-free bugs caused by orphan timer in probe media: b2c2: Fix use-after-free causing by irq_check_work in flexcop_pci_remove media: vsp1: Export missing vsp1_isp_free_buffer symbol media: renesas: vsp1: Convert to SYSTEM_SLEEP/RUNTIME_PM_OPS() media: renesas: ceu: Convert to RUNTIME_PM_OPS() media: renesas: fdp1: Convert to RUNTIME_PM_OPS() media: renesas: rcar-vin: Convert to DEFINE_SIMPLE_DEV_PM_OPS() media: renesas: rcar_drif: Convert to DEFINE_SIMPLE_DEV_PM_OPS() media: uvcvideo: Mark invalid entities with id UVC_INVALID_ENTITY_ID media: uvcvideo: Support UVC_CROSXU_CONTROL_IQ_PROFILE media: uvcvideo: Run uvc_ctrl_init_ctrl for all controls media: uvcvideo: Shorten the transfer size non compliance message media: uvcvideo: Do not re-reference dev->udev media: uvcvideo: Use intf instead of udev for printks media: uvcvideo: Move video_device under video_queue media: uvcvideo: Drop stream->mutex media: uvcvideo: Move MSXU_CONTROL_METADATA definition to header ...
2 parents 58809f6 + afb100a commit f79e772

File tree

576 files changed

+16905
-9289
lines changed

Some content is hidden

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

576 files changed

+16905
-9289
lines changed

.mailmap

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,8 @@ Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@gmail.com>
216216
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@imgtec.com>
217217
Dengcheng Zhu <dzhu@wavecomp.com> <dengcheng.zhu@mips.com>
218218
<dev.kurt@vandijck-laurijssen.be> <kurt.van.dijck@eia.be>
219-
Dikshita Agarwal <quic_dikshita@quicinc.com> <dikshita@codeaurora.org>
219+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <dikshita@codeaurora.org>
220+
Dikshita Agarwal <dikshita.agarwal@oss.qualcomm.com> <quic_dikshita@quicinc.com>
220221
Dmitry Baryshkov <lumag@kernel.org> <dbaryshkov@gmail.com>
221222
Dmitry Baryshkov <lumag@kernel.org> <[dbaryshkov@gmail.com]>
222223
Dmitry Baryshkov <lumag@kernel.org> <dmitry_baryshkov@mentor.com>
@@ -819,7 +820,8 @@ Valentin Schneider <vschneid@redhat.com> <valentin.schneider@arm.com>
819820
Veera Sundaram Sankaran <quic_veeras@quicinc.com> <veeras@codeaurora.org>
820821
Veerabhadrarao Badiganti <quic_vbadigan@quicinc.com> <vbadigan@codeaurora.org>
821822
Venkateswara Naralasetty <quic_vnaralas@quicinc.com> <vnaralas@codeaurora.org>
822-
Vikash Garodia <quic_vgarodia@quicinc.com> <vgarodia@codeaurora.org>
823+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <vgarodia@codeaurora.org>
824+
Vikash Garodia <vikash.garodia@oss.qualcomm.com> <quic_vgarodia@quicinc.com>
823825
Vinod Koul <vkoul@kernel.org> <vinod.koul@intel.com>
824826
Vinod Koul <vkoul@kernel.org> <vinod.koul@linux.intel.com>
825827
Vinod Koul <vkoul@kernel.org> <vkoul@infradead.org>

Documentation/ABI/testing/debugfs-cec-error-inj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
What: /sys/kernel/debug/cec/*/error-inj
22
Date: March 2018
3-
Contact: Hans Verkuil <hverkuil-cisco@xs4all.nl>
3+
Contact: Hans Verkuil <hverkuil@kernel.org>
44
Description:
55

66
The CEC Framework allows for CEC error injection commands through

Documentation/admin-guide/bug-hunting.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ For example, if you find a bug at the gspca's sonixj.c file, you can get
252252
its maintainers with::
253253

254254
$ ./scripts/get_maintainer.pl --bug -f drivers/media/usb/gspca/sonixj.c
255-
Hans Verkuil <hverkuil@xs4all.nl> (odd fixer:GSPCA USB WEBCAM DRIVER,commit_signer:1/1=100%)
255+
Hans Verkuil <hverkuil@kernel.org> (odd fixer:GSPCA USB WEBCAM DRIVER,commit_signer:1/1=100%)
256256
Mauro Carvalho Chehab <mchehab@kernel.org> (maintainer:MEDIA INPUT INFRASTRUCTURE (V4L/DVB),commit_signer:1/1=100%)
257257
Tejun Heo <tj@kernel.org> (commit_signer:1/1=100%)
258258
Bhaktipriya Shridhar <bhaktipriya96@gmail.com> (commit_signer:1/1=100%,authored:1/1=100%,added_lines:4/4=100%,removed_lines:9/9=100%)

Documentation/admin-guide/media/i2c-cardlist.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@ ov5647 OmniVision OV5647 sensor
9191
ov5670 OmniVision OV5670 sensor
9292
ov5675 OmniVision OV5675 sensor
9393
ov5695 OmniVision OV5695 sensor
94-
ov6650 OmniVision OV6650 sensor
9594
ov7251 OmniVision OV7251 sensor
9695
ov7640 OmniVision OV7640 sensor
9796
ov7670 OmniVision OV7670 sensor

Documentation/admin-guide/media/ivtv.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
The ivtv driver
44
===============
55

6-
Author: Hans Verkuil <hverkuil@xs4all.nl>
6+
Author: Hans Verkuil <hverkuil@kernel.org>
77

88
This is a v4l2 device driver for the Conexant cx23415/6 MPEG encoder/decoder.
99
The cx23415 can do both encoding and decoding, the cx23416 can only do MPEG

Documentation/devicetree/bindings/i2c/qcom,i2c-cci.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,8 @@ examples:
312312
313313
clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
314314
clock-names = "xvclk";
315-
clock-frequency = <19200000>;
315+
assigned-clocks = <&clock_camcc CAM_CC_MCLK0_CLK>;
316+
assigned-clock-rates = <19200000>;
316317
317318
dovdd-supply = <&vreg_lvs1a_1p8>;
318319
avdd-supply = <&cam0_avdd_2v8>;
@@ -344,7 +345,8 @@ examples:
344345
345346
clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
346347
clock-names = "xclk";
347-
clock-frequency = <24000000>;
348+
assigned-clocks = <&clock_camcc CAM_CC_MCLK3_CLK>;
349+
assigned-clock-rates = <24000000>;
348350
349351
vdddo-supply = <&vreg_lvs1a_1p8>;
350352
vdda-supply = <&cam3_avdd_2v8>;

Documentation/devicetree/bindings/media/cec/cec-common.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: HDMI CEC Adapters Common Properties
88

99
maintainers:
10-
- Hans Verkuil <hverkuil@xs4all.nl>
10+
- Hans Verkuil <hverkuil@kernel.org>
1111

1212
properties:
1313
$nodename:

Documentation/devicetree/bindings/media/cec/cec-gpio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: HDMI CEC GPIO
88

99
maintainers:
10-
- Hans Verkuil <hverkuil-cisco@xs4all.nl>
10+
- Hans Verkuil <hverkuil@kernel.org>
1111

1212
description: |
1313
The HDMI CEC GPIO module supports CEC implementations where the CEC line is

Documentation/devicetree/bindings/media/cec/nvidia,tegra114-cec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: NVIDIA Tegra HDMI CEC
88

99
maintainers:
10-
- Hans Verkuil <hverkuil-cisco@xs4all.nl>
10+
- Hans Verkuil <hverkuil@kernel.org>
1111

1212
allOf:
1313
- $ref: cec-common.yaml#

Documentation/devicetree/bindings/media/i2c/adi,adv7604.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Analog Devices ADV7604/10/11/12 video decoder with HDMI receiver
88

99
maintainers:
10-
- Hans Verkuil <hverkuil-cisco@xs4all.nl>
10+
- Hans Verkuil <hverkuil@kernel.org>
1111

1212
description:
1313
The ADV7604 and ADV7610/11/12 are multiformat video decoders with

0 commit comments

Comments
 (0)