Commit 15ac4686 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media updates from Mauro Carvalho Chehab:

 - Lots of improvement at atomisp driver, which is starting to look in
   good shape

 - Mediatek vcodec driver has gained support for av1 and hevc stateless
   codecs

 - New sensor driver: ov01a10

 - verisilicon driver has gained AV1 entropy helpers

 - tegra-video has gained support for Tegra20 parallel input

 - dvb core has gained an extra property to better support DVB-S2X

 - as usual, lots of cleanups, fixes and improvements on media drivers

* tag 'media/v6.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (253 commits)
  media: wl128x: fix a clang warning
  media: dvb: mb86a20s: get rid of a clang-15 warning
  media: cec: i2c: ch7322: also select REGMAP
  media: add HAS_IOPORT dependencies
  media: tc358746: select CONFIG_GENERIC_PHY
  media: mediatek: vcodec: Add dbgfs help function
  media: mediatek: vcodec: Add encode to support dbgfs
  media: mediatek: vcodec: Change dbgfs interface to support encode
  media: mediatek: vcodec: Get each instance format type
  media: mediatek: vcodec: Get each context resolution information
  media: mediatek: vcodec: Add a debugfs file to get different useful information
  media: mediatek: vcodec: Add debug params to control different log level
  media: mediatek: vcodec: Add debugfs interface to get debug information
  media: mediatek: vcodec: support stateless AV1 decoder
  media: verisilicon: Conditionally ignore native formats
  media: verisilicon: Enable AV1 decoder on rk3588
  media: verisilicon: Add film grain feature to AV1 driver
  media: verisilicon: Add Rockchip AV1 decoder
  media: verisilicon: Add AV1 entropy helpers
  media: verisilicon: Compute motion vectors size for AV1 frames
  ...
parents 2784d74b c61480a2

Documentation/admin-guide/media/rkisp1.rst

+2 −2
Original line number Diff line number Diff line
@@ -10,8 +10,8 @@ Introduction 
============



This file documents the driver for the Rockchip ISP1 that is part of RK3288

and RK3399 SoCs. The driver is located under drivers/staging/media/rkisp1

and uses the Media-Controller API.

and RK3399 SoCs. The driver is located under drivers/media/platform/rockchip/

rkisp1 and uses the Media-Controller API.



Revisions

=========

Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vi.yaml

+59 −0
Original line number Diff line number Diff line
@@ -73,6 +73,18 @@ properties: 
  avdd-dsi-csi-supply:

    description: DSI/CSI power supply. Must supply 1.2 V.



  vip:

    $ref: /schemas/display/tegra/nvidia,tegra20-vip.yaml



  ports:

    $ref: /schemas/graph.yaml#/properties/ports



    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Input from the VIP (parallel input capture) module



patternProperties:

  "^csi@[0-9a-f]+$":

    type: object
@@ -108,6 +120,22 @@ examples: 
    #include <dt-bindings/clock/tegra20-car.h>

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



    i2c {

        #address-cells = <1>;

        #size-cells = <0>;

        camera@48 {

            compatible = "aptina,mt9v111";

            reg = <0x48>;

            clocks = <&camera_clk>;



            port {

                mt9v111_out: endpoint {

                    remote-endpoint = <&vi_vip_in>;

                };

            };

        };

    };



    vi@54080000 {

        compatible = "nvidia,tegra20-vi";

        reg = <0x54080000 0x00040000>;
@@ -115,6 +143,37 @@ examples: 
        clocks = <&tegra_car TEGRA20_CLK_VI>;

        resets = <&tegra_car 100>;

        reset-names = "vi";



        vip {

            compatible = "nvidia,tegra20-vip";

            ports {

                #address-cells = <1>;

                #size-cells = <0>;

                port@0 {

                    reg = <0>;

                    vi_vip_in: endpoint {

                        remote-endpoint = <&mt9v111_out>;

                    };

                };

                port@1 {

                    reg = <1>;

                    vi_vip_out: endpoint {

                        remote-endpoint = <&vi_in>;

                    };

                };

            };

        };



        ports {

            #address-cells = <1>;

            #size-cells = <0>;

            port@0 {

                reg = <0>;

                vi_in: endpoint {

                    remote-endpoint = <&vi_vip_out>;

                };

            };

        };

    };



  - |

Documentation/devicetree/bindings/display/tegra/nvidia,tegra20-vip.yaml

0 → 100644
+41 −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/display/tegra/nvidia,tegra20-vip.yaml#

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



title: NVIDIA Tegra VIP (parallel video capture) controller



maintainers:

  - Luca Ceresoli <luca.ceresoli@bootlin.com>



properties:

  compatible:

    enum:

      - nvidia,tegra20-vip



  ports:

    $ref: /schemas/graph.yaml#/properties/ports



    properties:

      port@0:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Port receiving the video stream from the sensor



      port@1:

        $ref: /schemas/graph.yaml#/properties/port

        description:

          Port sending the video stream to the VI



    required:

      - port@0

      - port@1



unevaluatedProperties: false



required:

  - compatible

  - ports



# see nvidia,tegra20-vi.yaml for an example

Documentation/devicetree/bindings/media/i2c/maxim,max96712.yaml

+7 −0
Original line number Diff line number Diff line
@@ -65,9 +65,14 @@ properties: 


            properties:

              data-lanes: true

              bus-type:

                enum:

                  - 1 # MEDIA_BUS_TYPE_CSI2_CPHY

                  - 4 # MEDIA_BUS_TYPE_CSI2_DPHY



            required:

              - data-lanes

              - bus-type



    required:

      - port@4
@@ -82,6 +87,7 @@ additionalProperties: false 
examples:

  - |

    #include <dt-bindings/gpio/gpio.h>

    #include <dt-bindings/media/video-interfaces.h>



    i2c@e6508000 {

            #address-cells = <1>;
@@ -101,6 +107,7 @@ examples: 
                            port@4 {

                                    reg = <4>;

                                    max96712_out0: endpoint {

                                            bus-type = <MEDIA_BUS_TYPE_CSI2_DPHY>;

                                            clock-lanes = <0>;

                                            data-lanes = <1 2 3 4>;

                                            remote-endpoint = <&csi40_in>;

Documentation/devicetree/bindings/media/qcom,msm8916-camss.yaml

+1 −1
Original line number Diff line number Diff line
@@ -155,7 +155,7 @@ examples: 
    #include <dt-bindings/interrupt-controller/arm-gic.h>

    #include <dt-bindings/clock/qcom,gcc-msm8916.h>



    camss: camss@1b00000 {

    camss: camss@1b0ac00 {

      compatible = "qcom,msm8916-camss";



      clocks = <&gcc GCC_CAMSS_TOP_AHB_CLK>,