Commit 184a0997 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
  ...
parents 40505771 c4b7779a

Documentation/admin-guide/media/ipu3.rst

+1 −5
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ frames in packed raw Bayer format to IPU3 CSI2 receiver. 
    # and that ov5670 sensor is connected to i2c bus 10 with address 0x36

    export SDEV=$(media-ctl -d $MDEV -e "ov5670 10-0036")



    # Establish the link for the media devices using media-ctl [#f3]_

    # Establish the link for the media devices using media-ctl

    media-ctl -d $MDEV -l "ov5670:0 -> ipu3-csi2 0:0[1]"



    # Set the format for the media devices
@@ -589,12 +589,8 @@ preserved. 
References

==========



.. [#f5] drivers/staging/media/ipu3/include/uapi/intel-ipu3.h



.. [#f1] https://github.com/intel/nvt



.. [#f2] http://git.ideasonboard.org/yavta.git



.. [#f3] http://git.ideasonboard.org/?p=media-ctl.git;a=summary



.. [#f4] ImgU limitation requires an additional 16x16 for all input resolutions

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

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)



%YAML 1.2

---

$id: http://devicetree.org/schemas/media/allwinner,sun50i-h6-vpu-g2.yaml#

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

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)



%YAML 1.2

---

$id: http://devicetree.org/schemas/media/amlogic,meson-ir-tx.yaml#

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

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)



%YAML 1.2

---

$id: http://devicetree.org/schemas/media/amphion,vpu.yaml#

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

+0 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)



%YAML 1.2

---

$id: http://devicetree.org/schemas/media/fsl,imx6ull-pxp.yaml#