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

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

Pull media updates from Mauro Carvalho Chehab:

 - a new sensor driver for ov5675

 - a new platform driver for Allwinner A10 sensor interface

 - some new remote controller keymaps

 - some cosmetic changes at V4L2 core in order to avoid #ifdefs and to
   merge two core modules into one

 - removal of bcm2048 radio driver from staging

 - removal of davinci_vpfe video driver from staging

 - regression fix since Kernel 5.1 at the legacy VideoBuffer version 1
   core

 - added some documentation for remote controller protocols

 - pixel format documentation was split on two files

 - lots of other driver improvements and cleanups

* tag 'media/v5.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (321 commits)
  media: videobuf-core.c: poll_wait needs a non-NULL buf pointer
  media: sun4i: Make sun4i_csi_formats static
  media: imx: remove unused including <linux/version.h>
  media: stm32-dcmi: Delete an unnecessary of_node_put() call in dcmi_probe()
  media: pvrusb2: qctrl.flag will be uninitlaized if cx2341x_ctrl_query() returns error code
  media: em28xx: Fix exception handling in em28xx_alloc_urbs()
  media: don't do a 31 bit shift on a signed int
  media: use the BIT() macro
  media: ov9650: add a sanity check
  media: aspeed-video: address a protential usage of an unitialized var
  media: vicodec: make life easier for static analyzers
  media: remove include stdarg.h from some drivers
  v4l2-core: fix coding style for the two new c files
  media: v4l2-core: Remove BUG() from i2c and spi helpers
  media: v4l2-core: introduce a helper to unregister a i2c subdev
  media: v4l2-core: introduce a helper to unregister a spi subdev
  media: v4l2-core: move i2c helpers out of v4l2-common.c
  media: v4l2-core: move spi helpers out of v4l2-common.c
  media: v4l2-core: Module re-organization
  media: usbvision: Remove dead code
  ...
parents 6ab8ad31 6f51fdfd

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

0 → 100644
+109 −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/arm/allwinner,sun4i-a10-csi.yaml#

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



title: Allwinner A10 CMOS Sensor Interface (CSI) Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>



description: |-

  The Allwinner A10 and later has a CMOS Sensor Interface to retrieve

  frames from a parallel or BT656 sensor.



properties:

  compatible:

    const: allwinner,sun7i-a20-csi0



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: The CSI interface clock

      - description: The CSI module clock

      - description: The CSI ISP clock

      - description: The CSI DRAM clock



  clock-names:

    items:

      - const: bus

      - const: mod

      - const: isp

      - const: ram



  resets:

    maxItems: 1



  # See ./video-interfaces.txt for details

  port:

    type: object

    additionalProperties: false



    properties:

      endpoint:

        type: object



        properties:

          bus-width:

            enum: [8, 16]



          data-active: true

          hsync-active: true

          pclk-sample: true

          remote-endpoint: true

          vsync-active: true



        required:

          - bus-width

          - data-active

          - hsync-active

          - pclk-sample

          - remote-endpoint

          - vsync-active



    required:

      - endpoint



required:

  - compatible

  - reg

  - interrupts

  - clocks



additionalProperties: false



examples:

  - |

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

    #include <dt-bindings/clock/sun7i-a20-ccu.h>

    #include <dt-bindings/reset/sun4i-a10-ccu.h>



    csi0: csi@1c09000 {

        compatible = "allwinner,sun7i-a20-csi0";

        reg = <0x01c09000 0x1000>;

        interrupts = <GIC_SPI 42 IRQ_TYPE_LEVEL_HIGH>;

        clocks = <&ccu CLK_AHB_CSI0>, <&ccu CLK_CSI0>,

                 <&ccu CLK_CSI_SCLK>, <&ccu CLK_DRAM_CSI0>;

        clock-names = "bus", "mod", "isp", "ram";

        resets = <&ccu RST_CSI0>;



        port {

            csi_from_ov5640: endpoint {

                remote-endpoint = <&ov5640_to_csi>;

                bus-width = <8>;

                hsync-active = <1>; /* Active high */

                vsync-active = <0>; /* Active low */

                data-active = <1>;  /* Active high */

                pclk-sample = <1>;  /* Rising */

            };

        };

    };



...

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

0 → 100644
+80 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

%YAML 1.2

---

$id: http://devicetree.org/schemas/media/allwinner,sun4i-a10-ir.yaml#

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



title: Allwinner A10 Infrared Controller Device Tree Bindings



maintainers:

  - Chen-Yu Tsai <wens@csie.org>

  - Maxime Ripard <maxime.ripard@bootlin.com>



allOf:

  - $ref: "rc.yaml#"



properties:

  compatible:

    oneOf:

      - const: allwinner,sun4i-a10-ir

      - const: allwinner,sun5i-a13-ir

      - items:

          - const: allwinner,sun8i-a83t-ir

          - const: allwinner,sun6i-a31-ir

      - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun50i-a64-ir

          - const: allwinner,sun6i-a31-ir

      - items:

          - const: allwinner,sun50i-h6-ir

          - const: allwinner,sun6i-a31-ir



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  clocks:

    items:

      - description: Bus Clock

      - description: Module Clock



  clock-names:

    items:

      - const: apb

      - const: ir



  resets:

    maxItems: 1



  clock-frequency:

    default: 8000000

    description:

      IR Receiver clock frequency, in Hertz.



required:

  - compatible

  - reg

  - interrupts

  - clocks

  - clock-names



# FIXME: We should set it, but it would report all the generic

# properties as additional properties.

# additionalProperties: false



examples:

  - |

      ir0: ir@1c21800 {

          compatible = "allwinner,sun4i-a10-ir";

          clocks = <&apb0_gates 6>, <&ir0_clk>;

          clock-names = "apb", "ir";

          clock-frequency = <3000000>;

          resets = <&apb0_rst 1>;

          interrupts = <0 5 1>;

          reg = <0x01C21800 0x40>;

          linux,rc-map-name = "rc-rc6-mce";

      };



...

Documentation/devicetree/bindings/media/cdns,csi2tx.txt

+2 −1
Original line number Diff line number Diff line
@@ -5,7 +5,8 @@ The Cadence MIPI-CSI2 TX controller is a CSI-2 bridge supporting up to 
4 CSI lanes in output, and up to 4 different pixel streams in input.



Required properties:

  - compatible: must be set to "cdns,csi2tx"

  - compatible: must be set to "cdns,csi2tx" or "cdns,csi2tx-1.3"

    for version 1.3 of the controller, "cdns,csi2tx-2.1" for v2.1

  - reg: base address and size of the memory mapped region

  - clocks: phandles to the clocks driving the controller

  - clock-names: must contain:

Documentation/devicetree/bindings/media/imx7-csi.txt

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ to connect directly to external CMOS image sensors. 


Required properties:



- compatible    : "fsl,imx7-csi";

- compatible    : "fsl,imx7-csi" or "fsl,imx6ul-csi";

- reg           : base address and length of the register set for the device;

- interrupts    : should contain CSI interrupt;

- clocks        : list of clock specifiers, see

Documentation/devicetree/bindings/media/meson-ao-cec.txt

+5 −3
Original line number Diff line number Diff line
@@ -5,10 +5,12 @@ to handle communication between HDMI connected devices over the CEC bus. 


Required properties:

  - compatible : value should be following depending on the SoC :

	For GXBB, GXL, GXM and G12A (AO_CEC_A module) :

	For GXBB, GXL, GXM, G12A and SM1 (AO_CEC_A module) :

	"amlogic,meson-gx-ao-cec"

	For G12A (AO_CEC_B module) :

	"amlogic,meson-g12a-ao-cec"

	For SM1 (AO_CEC_B module) :

	"amlogic,meson-sm1-ao-cec"



  - reg : Physical base address of the IP registers and length of memory

	  mapped region.
@@ -16,9 +18,9 @@ Required properties: 
  - interrupts : AO-CEC interrupt number to the CPU.

  - clocks : from common clock binding: handle to AO-CEC clock.

  - clock-names : from common clock binding, must contain :

		For GXBB, GXL, GXM and G12A (AO_CEC_A module) :

		For GXBB, GXL, GXM, G12A and SM1 (AO_CEC_A module) :

		- "core"

		For G12A (AO_CEC_B module) :

		For G12A, SM1 (AO_CEC_B module) :

		- "oscin"

		corresponding to entry in the clocks property.

  - hdmi-phandle: phandle to the HDMI controller

CRA Git | Maintained and supported by SUSTech CRA and CCSE