Commit 3178804c authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab Committed by Hans Verkuil
Browse files

Merge tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree into media_stage 



Tag branch

Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>

* tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree: (31 commits)
  media: s5c73m3: Switch to GPIO descriptors
  media: i2c: s5k5baf: switch to using gpiod API
  media: i2c: s5k6a3: switch to using gpiod API
  media: imx: remove code for non-existing config IMX_GPT_ICAP
  media: si470x: Fix use-after-free in si470x_int_in_callback()
  media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies
  media: coda: Add check for kmalloc
  media: coda: Add check for dcoda_iram_alloc
  dt-bindings: media: s5c73m3: Fix reset-gpio descriptor
  media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property
  media: s5k4ecgx: Delete driver
  media: s5k4ecgx: Switch to GPIO descriptors
  media: Switch to use dev_err_probe() helper
  headers: Remove some left-over license text in include/uapi/linux/v4l2-*
  headers: Remove some left-over license text in include/uapi/linux/dvb/
  media: usb: pwc-uncompress: Use flex array destination for memcpy()
  media: s5p-mfc: Fix to handle reference queue during finishing
  media: s5p-mfc: Clear workbit to handle error condition
  media: s5p-mfc: Fix in register read and write for H264
  media: imx: Use get_mbus_config instead of parsing upstream DT endpoints
  ...
parents b2ea130c a14e84db

Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml

+5 −0
Original line number Diff line number Diff line
@@ -36,6 +36,9 @@ properties: 
  resets:

    maxItems: 1



  iommus:

    maxItems: 1



required:

  - compatible

  - reg
@@ -43,6 +46,7 @@ required: 
  - clocks

  - clock-names

  - resets

  - iommus



additionalProperties: false
@@ -59,6 +63,7 @@ examples: 
        clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>;

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

        resets = <&ccu RST_BUS_VP9>;

        iommus = <&iommu 5>;

    };



...

Documentation/devicetree/bindings/media/samsung-s5c73m3.txt

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ i2c@138a000000 { 
		clock-frequency = <24000000>;

		clocks = <&clk 0>;

		clock-names = "cis_extclk";

		reset-gpios = <&gpf1 3 1>;

		xshutdown-gpios = <&gpf1 3 1>;

		standby-gpios = <&gpm0 1 1>;

		port {

			s5c73m3_ep: endpoint {

Documentation/devicetree/bindings/media/video-interfaces.yaml

+3 −2
Original line number Diff line number Diff line
@@ -145,9 +145,10 @@ properties: 


  pclk-sample:

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

    enum: [ 0, 1 ]

    enum: [ 0, 1, 2 ]

    description:

      Sample data on rising (1) or falling (0) edge of the pixel clock signal.

      Sample data on falling (0), rising (1) or both (2) edges of the pixel

      clock signal.



  sync-on-green-active:

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

drivers/media/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -182,7 +182,7 @@ config MEDIA_CONTROLLER 
#



config DVB_CORE

	tristate

	tristate "DVB Core"

	depends on MEDIA_DIGITAL_TV_SUPPORT

	depends on (I2C || I2C=n)

	default MEDIA_DIGITAL_TV_SUPPORT

drivers/media/cec/platform/stm32/stm32-cec.c

+3 −6
Original line number Diff line number Diff line
@@ -288,12 +288,9 @@ static int stm32_cec_probe(struct platform_device *pdev) 
		return ret;



	cec->clk_cec = devm_clk_get(&pdev->dev, "cec");

	if (IS_ERR(cec->clk_cec)) {

		if (PTR_ERR(cec->clk_cec) != -EPROBE_DEFER)

			dev_err(&pdev->dev, "Cannot get cec clock\n");



		return PTR_ERR(cec->clk_cec);

	}

	if (IS_ERR(cec->clk_cec))

		return dev_err_probe(&pdev->dev, PTR_ERR(cec->clk_cec),

				     "Cannot get cec clock\n");



	ret = clk_prepare(cec->clk_cec);

	if (ret) {