Commit fab0fca1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - some rework at the uAPI pixel format docs

 - the smiapp driver has started to gain support for MIPI CSS camera
   sensors and was renamed

 - two new sensor drivers: ov02a10 and ov9734

 - Meson gained a driver for the 2D acceleration unit

 - Rockchip rkisp1 driver was promoted from staging

 - Cedrus driver gained support for VP8

 - two new remote controller keymaps were added

 - the usual set of fixes cleanups and driver improvements

* tag 'media/v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (447 commits)
  media: ccs: Add support for obtaining C-PHY configuration from firmware
  media: ccs-pll: Print pixel rates
  media: ccs: Print written register values
  media: ccs: Add support for DDR OP SYS and OP PIX clocks
  media: ccs-pll: Add support for DDR OP system and pixel clocks
  media: ccs: Dual PLL support
  media: ccs-pll: Add trivial dual PLL support
  media: ccs-pll: Separate VT divisor limit calculation from the rest
  media: ccs-pll: Fix VT post-PLL divisor calculation
  media: ccs-pll: Make VT divisors 16-bit
  media: ccs-pll: Rework bounds checks
  media: ccs-pll: Print relevant information on PLL tree
  media: ccs-pll: Better separate OP and VT sub-tree calculation
  media: ccs-pll: Check for derating and overrating, support non-derating sensors
  media: ccs-pll: Split off VT subtree calculation
  media: ccs-pll: Add C-PHY support
  media: ccs-pll: Add sanity checks
  media: ccs-pll: Add support flexible OP PLL pixel clock divider
  media: ccs-pll: Support two cycles per pixel on OP domain
  media: ccs-pll: Add support for extended input PLL clock divider
  ...
parents ae1985b5 7ea4d232

Documentation/admin-guide/media/rkisp1.rst

+2 −2
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ the driver through the rkisp_params node to improve image quality during a 
video stream.

The buffer format is defined by struct :c:type:`rkisp1_stat_buffer`, and

userspace should set

:ref:`V4L2_META_FMT_RK_ISP1_STAT_3A <v4l2-meta-fmt-stat-rkisp1>` as the

:ref:`V4L2_META_FMT_RK_ISP1_STAT_3A <v4l2-meta-fmt-rk-isp1-stat-3a>` as the

dataformat.



.. _rkisp1_params:
@@ -100,7 +100,7 @@ and others. 


The buffer format is defined by struct :c:type:`rkisp1_params_cfg`, and

userspace should set

:ref:`V4L2_META_FMT_RK_ISP1_PARAMS <v4l2-meta-fmt-params-rkisp1>` as the

:ref:`V4L2_META_FMT_RK_ISP1_PARAMS <v4l2-meta-fmt-rk-isp1-params>` as the

dataformat.

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

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ properties: 
      - allwinner,sun7i-a20-video-engine

      - allwinner,sun8i-a33-video-engine

      - allwinner,sun8i-h3-video-engine

      - allwinner,sun8i-v3s-video-engine

      - allwinner,sun8i-r40-video-engine

      - allwinner,sun50i-a64-video-engine

      - allwinner,sun50i-h5-video-engine

      - allwinner,sun50i-h6-video-engine

Documentation/devicetree/bindings/media/amlogic,axg-ge2d.yaml

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

# Copyright 2020 BayLibre, SAS

%YAML 1.2

---

$id: "http://devicetree.org/schemas/media/amlogic,axg-ge2d.yaml#"

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



title: Amlogic GE2D Acceleration Unit



maintainers:

  - Neil Armstrong <narmstrong@baylibre.com>



properties:

  compatible:

    enum:

      - amlogic,axg-ge2d



  interrupts:

    minItems: 1



  reg:

    minItems: 1



  resets:

    maxItems: 1



  clocks:

    minItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - resets



additionalProperties: false



examples:

  - |

    ge2d: ge2d@ff940000 {

          compatible = "amlogic,axg-ge2d";

          reg = <0xff940000 0x10000>;

          interrupts = <150>;

          clocks = <&clk_ge2d>;

          resets = <&reset_ge2d>;

    };

Documentation/devicetree/bindings/media/coda.txt

deleted100644 → 0
+0 −31
Original line number Diff line number Diff line 
Chips&Media Coda multi-standard codec IP

========================================



Coda codec IPs are present in i.MX SoCs in various versions,

called VPU (Video Processing Unit).



Required properties:

- compatible : should be "fsl,<chip>-src" for i.MX SoCs:

  (a) "fsl,imx27-vpu" for CodaDx6 present in i.MX27

  (b) "fsl,imx51-vpu" for CodaHx4 present in i.MX51

  (c) "fsl,imx53-vpu" for CODA7541 present in i.MX53

  (d) "fsl,imx6q-vpu" for CODA960 present in i.MX6q

- reg: should be register base and length as documented in the

  SoC reference manual

- interrupts : Should contain the VPU interrupt. For CODA960,

  a second interrupt is needed for the MJPEG unit.

- clocks : Should contain the ahb and per clocks, in the order

  determined by the clock-names property.

- clock-names : Should be "ahb", "per"

- iram : phandle pointing to the SRAM device node



Example:



vpu: vpu@63ff4000 {

	compatible = "fsl,imx53-vpu";

	reg = <0x63ff4000 0x1000>;

	interrupts = <9>;

	clocks = <&clks 63>, <&clks 63>;

	clock-names = "ahb", "per";

	iram = <&ocram>;

};

Documentation/devicetree/bindings/media/coda.yaml

0 → 100644
+108 −0
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/coda.yaml#

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



title: Chips&Media Coda multi-standard codec IP



maintainers:

  - Philipp Zabel <p.zabel@pengutronix.de>



description: |-

  Coda codec IPs are present in i.MX SoCs in various versions,

  called VPU (Video Processing Unit).



properties:

  compatible:

    oneOf:

      - items:

          - const: fsl,imx27-vpu

          - const: cnm,codadx6

      - items:

          - const: fsl,imx51-vpu

          - const: cnm,codahx4

      - items:

          - const: fsl,imx53-vpu

          - const: cnm,coda7541

      - items:

          - enum:

              - fsl,imx6dl-vpu

              - fsl,imx6q-vpu

          - const: cnm,coda960



  reg:

    maxItems: 1



  clocks:

    items:

      - description: PER clock

      - description: AHB interface clock



  clock-names:

    items:

      - const: per

      - const: ahb



  resets:

    maxItems: 1



  iram:

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

    description: phandle pointing to the SRAM device node

    maxItems: 1



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



allOf:

  - if:

      properties:

        compatible:

          contains:

            const: cnm,coda960

    then:

      properties:

        interrupts:

          items:

            - description: BIT processor interrupt

            - description: JPEG unit interrupt



        interrupt-names:

          items:

            - const: bit

            - const: jpeg

    else:

      properties:

        interrupts:

          items:

            - description: BIT processor interrupt



  - if:

      properties:

        compatible:

          contains:

            enum:

              - fsl,imx6dl-vpu

              - fsl,imx6q-vpu

    then:

      properties:

        power-domains:

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

          description: phandle pointing to the PU power domain

          maxItems: 1



examples:

  - |

    vpu: video-codec@63ff4000 {

        compatible = "fsl,imx53-vpu", "cnm,coda7541";

        reg = <0x63ff4000 0x1000>;

        interrupts = <9>;

        clocks = <&clks 63>, <&clks 63>;

        clock-names = "per", "ahb";

        iram = <&ocram>;

    };