Commit 3aa139aa authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - addition of a maintainer's profile for the media subsystem

 - addition of i.MX8 IP support

 - qcom/camss gained support for hardware version Titan 170

 - new RC keymaps

 - Lots of other improvements, cleanups and bug fixes

* tag 'media/v5.13-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (488 commits)
  media: coda: fix macroblocks count control usage
  media: rkisp1: params: fix wrong bits settings
  media: cedrus: Fix H265 status definitions
  media: meson-ge2d: fix rotation parameters
  media: v4l2-ctrls: fix reference to freed memory
  media: venus : hfi: add venus image info into smem
  media: venus: Fix internal buffer size calculations for v6.
  media: venus: helpers: keep max bandwidth when mbps exceeds the supported range
  media: venus: fix hw overload error log condition
  media: venus: core: correct firmware name for sm8250
  media: venus: core,pm: fix potential infinite loop
  media: venus: core: Fix kerneldoc warnings
  media: gscpa/stv06xx: fix memory leak
  media: cx25821: remove unused including <linux/version.h>
  media: staging: media/meson: remove redundant dev_err call
  media: adv7842: support 1 block EDIDs, fix clearing EDID
  media: adv7842: configure all pads
  media: allegro: change kernel-doc comment blocks to normal comments
  media: camss: ispif: Remove redundant dev_err call in msm_ispif_subdev_init()
  media: i2c: rdamc21: Fix warning on u8 cast
  ...
parents acd3d285 0b276e47

Documentation/devicetree/bindings/display/mediatek/mediatek,disp.txt

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ Required properties (DMA function blocks): 
- larb: Should contain a phandle pointing to the local arbiter device as defined

  in Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

- iommus: Should point to the respective IOMMU block with master port as

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

  for details.



Optional properties (RDMA function blocks):

Documentation/devicetree/bindings/i3c/cdns,i3c-master.txt

+3 −3
Original line number Diff line number Diff line
@@ -10,19 +10,19 @@ Required properties: 
- reg: I3C master registers



Mandatory properties defined by the generic binding (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details):

Documentation/devicetree/bindings/i3c/i3c.yaml for more details):



- #address-cells: shall be set to 1

- #size-cells: shall be set to 0



Optional properties defined by the generic binding (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details):

Documentation/devicetree/bindings/i3c/i3c.yaml for more details):



- i2c-scl-hz

- i3c-scl-hz



I3C device connected on the bus follow the generic description (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details).

Documentation/devicetree/bindings/i3c/i3c.yaml for more details).



Example:

Documentation/devicetree/bindings/i3c/snps,dw-i3c-master.txt

+3 −3
Original line number Diff line number Diff line
@@ -9,19 +9,19 @@ Required properties: 
- reg: Offset and length of I3C master registers



Mandatory properties defined by the generic binding (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details):

Documentation/devicetree/bindings/i3c/i3c.yaml for more details):



- #address-cells: shall be set to 3

- #size-cells: shall be set to 0



Optional properties defined by the generic binding (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details):

Documentation/devicetree/bindings/i3c/i3c.yaml for more details):



- i2c-scl-hz

- i3c-scl-hz



I3C device connected on the bus follow the generic description (see

Documentation/devicetree/bindings/i3c/i3c.txt for more details).

Documentation/devicetree/bindings/i3c/i3c.yaml for more details).



Example:

Documentation/devicetree/bindings/media/allwinner,sun4i-a10-ir.yaml

+6 −10
Original line number Diff line number Diff line
@@ -20,16 +20,12 @@ properties: 
      - const: allwinner,sun5i-a13-ir

      - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun8i-a83t-ir

          - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun8i-r40-ir

          - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun50i-a64-ir

          - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun50i-h6-ir

          - enum:

              - allwinner,sun8i-a83t-ir

              - allwinner,sun8i-r40-ir

              - allwinner,sun50i-a64-ir

              - allwinner,sun50i-h6-ir

              - allwinner,sun50i-h616-ir

          - const: allwinner,sun6i-a31-ir



  reg:

Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.txt

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Required properties: 
  Documentation/devicetree/bindings/memory-controllers/mediatek,smi-larb.yaml

  for details.

- iommus: should point to the respective IOMMU block with master port as

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.txt

  argument, see Documentation/devicetree/bindings/iommu/mediatek,iommu.yaml

  for details.



Example: