Commit 5d435a3f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - New driver for Mediatek MDP V3

 - New driver for NXP i.MX DW100 dewarper

 - Zoran driver got promoted from staging

 - Hantro and related drivers got promoted from staging

 - Several VB1 drivers got moved to staging/deprecated (cpia2, fsl-viu,
   meye, saa7146, av7110, stkwebcam, tm6000, vpfe_capture, davinci,
   zr364xx)

 - Usual set of driver fixes, improvements and cleanups

* tag 'media/v6.1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (107 commits)
  media: destage Hantro VPU driver
  media: platform: mtk-mdp3: add MediaTek MDP3 driver
  media: dt-binding: mediatek: add bindings for MediaTek CCORR and WDMA
  media: dt-binding: mediatek: add bindings for MediaTek MDP3 components
  media: xilinx: vipp: Fix refcount leak in xvip_graph_dma_init
  media: xilinx: video: Add 1X12 greyscale format
  media: xilinx: csi2rxss: Add 1X12 greyscale format
  media: staging: media: imx: imx7-media-csi: Increase video mem limit
  media: uvcvideo: Limit power line control for Sonix Technology
  media: uvcvideo: Use entity get_cur in uvc_ctrl_set
  media: uvcvideo: Fix typo 'the the' in comment
  media: uvcvideo: Use indexed loops in uvc_ctrl_init_ctrl()
  media: uvcvideo: Fix memory leak in uvc_gpio_parse
  media: renesas: vsp1: Add support for RZ/G2L VSPD
  media: renesas: vsp1: Add VSP1_HAS_NON_ZERO_LBA feature bit
  media: renesas: vsp1: Add support for VSP software version
  media: renesas: vsp1: Add support to deassert/assert reset line
  media: dt-bindings: media: renesas,vsp1: Document RZ/G2L VSPD bindings
  media: meson: vdec: add missing clk_disable_unprepare on error in vdec_hevc_start()
  media: amphion: fix a bug that vpu core may not resume after suspend
  ...
parents 4078aa68 fbb6c848

Documentation/devicetree/bindings/media/mediatek,mdp3-rdma.yaml

0 → 100644
+95 −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/mediatek,mdp3-rdma.yaml#

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



title: MediaTek Read Direct Memory Access



maintainers:

  - Matthias Brugger <matthias.bgg@gmail.com>

  - Moudy Ho <moudy.ho@mediatek.com>



description: |

  MediaTek Read Direct Memory Access(RDMA) component used to do read DMA.

  It contains one line buffer to store the sufficient pixel data, and

  must be siblings to the central MMSYS_CONFIG node.

  For a description of the MMSYS_CONFIG binding, see

  Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

  for details.



properties:

  compatible:

    items:

      - const: mediatek,mt8183-mdp3-rdma



  reg:

    maxItems: 1



  mediatek,gce-client-reg:

    $ref: '/schemas/types.yaml#/definitions/phandle-array'

    items:

      items:

        - description: phandle of GCE

        - description: GCE subsys id

        - description: register offset

        - description: register size

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property. Each GCE subsys id is mapping to

      a client defined in the header include/dt-bindings/gce/<chip>-gce.h.



  mediatek,gce-events:

    description:

      The event id which is mapping to the specific hardware event signal

      to gce. The event id is defined in the gce header

      include/dt-bindings/gce/<chip>-gce.h of each chips.

    $ref: /schemas/types.yaml#/definitions/uint32-array



  power-domains:

    maxItems: 1



  clocks:

    items:

      - description: RDMA clock

      - description: RSZ clock



  iommus:

    maxItems: 1



  mboxes:

    items:

      - description: used for 1st data pipe from RDMA

      - description: used for 2nd data pipe from RDMA



required:

  - compatible

  - reg

  - mediatek,gce-client-reg

  - mediatek,gce-events

  - power-domains

  - clocks

  - iommus

  - mboxes



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/mt8183-clk.h>

    #include <dt-bindings/gce/mt8183-gce.h>

    #include <dt-bindings/power/mt8183-power.h>

    #include <dt-bindings/memory/mt8183-larb-port.h>



    mdp3_rdma0: mdp3-rdma0@14001000 {

      compatible = "mediatek,mt8183-mdp3-rdma";

      reg = <0x14001000 0x1000>;

      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x1000 0x1000>;

      mediatek,gce-events = <CMDQ_EVENT_MDP_RDMA0_SOF>,

                            <CMDQ_EVENT_MDP_RDMA0_EOF>;

      power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;

      clocks = <&mmsys CLK_MM_MDP_RDMA0>,

               <&mmsys CLK_MM_MDP_RSZ1>;

      iommus = <&iommu>;

      mboxes = <&gce 20 CMDQ_THR_PRIO_LOWEST>,

               <&gce 21 CMDQ_THR_PRIO_LOWEST>;

    };

Documentation/devicetree/bindings/media/mediatek,mdp3-rsz.yaml

0 → 100644
+77 −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/mediatek,mdp3-rsz.yaml#

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



title: MediaTek Resizer



maintainers:

  - Matthias Brugger <matthias.bgg@gmail.com>

  - Moudy Ho <moudy.ho@mediatek.com>



description: |

  One of Media Data Path 3 (MDP3) components used to do frame resizing.



properties:

  compatible:

    items:

      - enum:

          - mediatek,mt8183-mdp3-rsz



  reg:

    maxItems: 1



  mediatek,gce-client-reg:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      items:

        - description: phandle of GCE

        - description: GCE subsys id

        - description: register offset

        - description: register size

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property. Each GCE subsys id is mapping to

      a client defined in the header include/dt-bindings/gce/<chip>-gce.h.



  mediatek,gce-events:

    description:

      The event id which is mapping to the specific hardware event signal

      to gce. The event id is defined in the gce header

      include/dt-bindings/gce/<chip>-gce.h of each chips.

    $ref: /schemas/types.yaml#/definitions/uint32-array



  clocks:

    minItems: 1



required:

  - compatible

  - reg

  - mediatek,gce-client-reg

  - mediatek,gce-events

  - clocks



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/mt8183-clk.h>

    #include <dt-bindings/gce/mt8183-gce.h>



    mdp3_rsz0: mdp3-rsz0@14003000 {

      compatible = "mediatek,mt8183-mdp3-rsz";

      reg = <0x14003000 0x1000>;

      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x3000 0x1000>;

      mediatek,gce-events = <CMDQ_EVENT_MDP_RSZ0_SOF>,

                            <CMDQ_EVENT_MDP_RSZ0_EOF>;

      clocks = <&mmsys CLK_MM_MDP_RSZ0>;

    };



    mdp3_rsz1: mdp3-rsz1@14004000 {

      compatible = "mediatek,mt8183-mdp3-rsz";

      reg = <0x14004000 0x1000>;

      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x4000 0x1000>;

      mediatek,gce-events = <CMDQ_EVENT_MDP_RSZ1_SOF>,

                            <CMDQ_EVENT_MDP_RSZ1_EOF>;

      clocks = <&mmsys CLK_MM_MDP_RSZ1>;

    };

Documentation/devicetree/bindings/media/mediatek,mdp3-wrot.yaml

0 → 100644
+80 −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/mediatek,mdp3-wrot.yaml#

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



title: MediaTek Write DMA with Rotation



maintainers:

  - Matthias Brugger <matthias.bgg@gmail.com>

  - Moudy Ho <moudy.ho@mediatek.com>



description: |

  One of Media Data Path 3 (MDP3) components used to write DMA with frame rotation.



properties:

  compatible:

    items:

      - enum:

          - mediatek,mt8183-mdp3-wrot



  reg:

    maxItems: 1



  mediatek,gce-client-reg:

    $ref: /schemas/types.yaml#/definitions/phandle-array

    items:

      items:

        - description: phandle of GCE

        - description: GCE subsys id

        - description: register offset

        - description: register size

    description: The register of client driver can be configured by gce with

      4 arguments defined in this property. Each GCE subsys id is mapping to

      a client defined in the header include/dt-bindings/gce/<chip>-gce.h.



  mediatek,gce-events:

    description:

      The event id which is mapping to the specific hardware event signal

      to gce. The event id is defined in the gce header

      include/dt-bindings/gce/<chip>-gce.h of each chips.

    $ref: /schemas/types.yaml#/definitions/uint32-array



  power-domains:

    maxItems: 1



  clocks:

    minItems: 1



  iommus:

    maxItems: 1



required:

  - compatible

  - reg

  - mediatek,gce-client-reg

  - mediatek,gce-events

  - power-domains

  - clocks

  - iommus



additionalProperties: false



examples:

  - |

    #include <dt-bindings/clock/mt8183-clk.h>

    #include <dt-bindings/gce/mt8183-gce.h>

    #include <dt-bindings/power/mt8183-power.h>

    #include <dt-bindings/memory/mt8183-larb-port.h>



    mdp3_wrot0: mdp3-wrot0@14005000 {

      compatible = "mediatek,mt8183-mdp3-wrot";

      reg = <0x14005000 0x1000>;

      mediatek,gce-client-reg = <&gce SUBSYS_1400XXXX 0x5000 0x1000>;

      mediatek,gce-events = <CMDQ_EVENT_MDP_WROT0_SOF>,

                            <CMDQ_EVENT_MDP_WROT0_EOF>;

      power-domains = <&spm MT8183_POWER_DOMAIN_DISP>;

      clocks = <&mmsys CLK_MM_MDP_WROT0>;

      iommus = <&iommu>;

    };

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ properties: 
      - mediatek,mt8173-vcodec-enc-vp8

      - mediatek,mt8173-vcodec-enc

      - mediatek,mt8183-vcodec-enc

      - mediatek,mt8188-vcodec-enc

      - mediatek,mt8192-vcodec-enc

      - mediatek,mt8195-vcodec-enc

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

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ properties: 
    enum:

      - mediatek,mt8192-vcodec-dec

      - mediatek,mt8186-vcodec-dec

      - mediatek,mt8188-vcodec-dec

      - mediatek,mt8195-vcodec-dec



  reg: