Commit 1e26c5e2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'media/v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 

Pull media updates from Mauro Carvalho Chehab:

 - platform: synopsys: hdmirx: Fix 64-bit division for 32-bit targets

 - vim2m: print device name after registering device

 - Synopsys DesignWare HDMI RX Driver and various fixes

 - cec/printk fixes and the removal of the vidioc_g/s_ctrl and
   vidioc_queryctrl callbacks

 - AVerMedia H789-C PCIe support and rc-core structs padding

 - Several camera sensor patches

 - uvcvideo improvements

 - visl: Fix ERANGE error when setting enum controls

 - codec fixes

 - V4L2 camera sensor patches mostly

 - chips-media: wave5: Fixes

 - Add SDM670 camera subsystem

 - Qualcomm iris video decoder driver

 - dt-bindings: update clocks for sc7280-camss

 - various fixes and enhancements

* tag 'media/v6.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (264 commits)
  media: pci: mgb4: include linux/errno.h
  media: synopsys: hdmirx: Fix signedness bug in hdmirx_parse_dt()
  media: platform: synopsys: hdmirx: Fix 64-bit division for 32-bit targets
  media: vim2m: print device name after registering device
  media: vivid: Introduce VIDEO_VIVID_OSD
  media: vivid: Move all fb_info references into vivid-osd
  media: platform: synopsys: hdmirx: Optimize struct snps_hdmirx_dev
  media: platform: synopsys: hdmirx: Remove unused HDMI audio CODEC relics
  media: platform: synopsys: hdmirx: Remove duplicated header inclusion
  media: qcom: Clean up Kconfig dependencies
  media: dvb-frontends: tda10048: Make the range of z explicit.
  media: platform: stm32: Add check for clk_enable()
  media: xilinx-tpg: fix double put in xtpg_parse_of()
  media: siano: Fix error handling in smsdvb_module_init()
  media: c8sectpfe: Call of_node_put(i2c_bus) only once in c8sectpfe_probe()
  media: i2c: tda1997x: Call of_node_put(ep) only once in tda1997x_parse_dt()
  dt-bindings: media: mediatek,vcodec: Revise description
  dt-bindings: media: mediatek,jpeg: Relax IOMMU max item count
  media: v4l2-dv-timings: prevent possible overflow in v4l2_detect_gtf()
  media: rockchip: rga: fix rga offset lookup
  ...
parents c84907a1 f2151613

Documentation/admin-guide/media/cec.rst

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ configure the CEC devices for HDMI Input and the HDMI Outputs manually. 
---------------------



A three character manufacturer name that is used in the EDID for the HDMI

Input. If not set, then userspace is reponsible for configuring an EDID.

Input. If not set, then userspace is responsible for configuring an EDID.

If set, then the driver will update the EDID automatically based on the

resolutions supported by the connected displays, and it will not be possible

anymore to manually set the EDID for the HDMI Input.

Documentation/admin-guide/media/mgb4.rst

+3 −1
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ Global (PCI card) parameters 


    | 0 - No module present

    | 1 - FPDL3

    | 2 - GMSL

    | 2 - GMSL (one serializer, two daisy chained deserializers)

    | 3 - GMSL (one serializer, two deserializers)

    | 4 - GMSL (two deserializers with two daisy chain outputs)



**module_version** (R):

    Module version number. Zero in case of a missing module.

Documentation/devicetree/bindings/media/aspeed,video-engine.yaml

0 → 100644
+70 −0
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/aspeed,video-engine.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ASPEED Video Engine



maintainers:

  - Eddie James <eajames@linux.ibm.com>



description:

  The Video Engine (VE) embedded in the ASPEED SOCs can be configured to

  capture and compress video data from digital or analog sources.



properties:

  compatible:

    enum:

      - aspeed,ast2400-video-engine

      - aspeed,ast2500-video-engine

      - aspeed,ast2600-video-engine



  reg:

    maxItems: 1



  clocks:

    maxItems: 2



  clock-names:

    items:

      - const: vclk

      - const: eclk



  resets:

    maxItems: 1



  interrupts:

    maxItems: 1



  memory-region:

    maxItems: 1

    description: |

      Phandle to the reserved memory nodes to be associated with the

      VE. VE will acquires memory space for 3 purposes:

        1. JPEG header

        2. Compressed result

        3. Temporary transformed image data



required:

  - compatible

  - reg

  - clocks

  - clock-names

  - interrupts



additionalProperties: false



examples:

  - |

    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/ast2600-clock.h>



    video@1e700000 {

        compatible = "aspeed,ast2600-video-engine";

        reg = <0x1e700000 0x1000>;

        clocks = <&syscon ASPEED_CLK_GATE_VCLK>,

                 <&syscon ASPEED_CLK_GATE_ECLK>;

        clock-names = "vclk", "eclk";

        interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;

    };

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

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
* Device tree bindings for Aspeed Video Engine



The Video Engine (VE) embedded in the Aspeed AST2400/2500/2600 SOCs can

capture and compress video data from digital or analog sources.



Required properties:

 - compatible:		"aspeed,ast2400-video-engine" or

			"aspeed,ast2500-video-engine" or

			"aspeed,ast2600-video-engine"

 - reg:			contains the offset and length of the VE memory region

 - clocks:		clock specifiers for the syscon clocks associated with

			the VE (ordering must match the clock-names property)

 - clock-names:		"vclk" and "eclk"

 - resets:		reset specifier for the syscon reset associated with

			the VE

 - interrupts:		the interrupt associated with the VE on this platform



Optional properties:

 - memory-region:

	phandle to a memory region to allocate from, as defined in

	Documentation/devicetree/bindings/reserved-memory/reserved-memory.txt



Example:



video-engine@1e700000 {

    compatible = "aspeed,ast2500-video-engine";

    reg = <0x1e700000 0x20000>;

    clocks = <&syscon ASPEED_CLK_GATE_VCLK>, <&syscon ASPEED_CLK_GATE_ECLK>;

    clock-names = "vclk", "eclk";

    resets = <&syscon ASPEED_RESET_VIDEO>;

    interrupts = <7>;

    memory-region = <&video_engine_memory>;

};

Documentation/devicetree/bindings/media/i2c/adv7180.yaml

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,10 @@ properties: 
      Indicates that the output is a BT.656-4 compatible stream.

    type: boolean



  interrupts:

    items:

      - description: The GPIO connected to the INTRQ pin.



  port:

    $ref: /schemas/graph.yaml#/$defs/port-base

    unevaluatedProperties: false