Commit 0072a0c1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull media fixes from Mauro Carvalho Chehab:

 - Revert a dt-bindings patch whose driver didn't make for 4.20

 - fix a kernel oops at vicodec driver

 - fix a frame overflow at gspca with was causing regressions on some
   cameras, making them to not work

 - use the proper type for wait_queue head

 - make media request API compatible with 32-bit userspace on 64-bit
   kernel

 - fix a regression on Kernel 4.19 at dvb-pll

 - don't use SPDX headers yet for GFDL

* tag 'media/v4.20-4' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  media: mediactl docs: Fix licensing message
  media: dvb-pll: don't re-validate tuner frequencies
  media: dvb-pll: fix tuner frequency ranges
  media: Revert "media: dt-bindings: Document the Rockchip VPU bindings"
  media: gspca: fix frame overflow error
  media: vicodec: fix memchr() kernel oops
  media: cedrus: add action item to the TODO
  media: media-request: Add compat ioctl
  media: Use wait_queue_head_t for media_request
parents f3f950db a7c3a0d5

Documentation/devicetree/bindings/media/rockchip-vpu.txt

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
device-tree bindings for rockchip VPU codec



Rockchip (Video Processing Unit) present in various Rockchip platforms,

such as RK3288 and RK3399.



Required properties:

- compatible: value should be one of the following

		"rockchip,rk3288-vpu";

		"rockchip,rk3399-vpu";

- interrupts: encoding and decoding interrupt specifiers

- interrupt-names: should be "vepu" and "vdpu"

- clocks: phandle to VPU aclk, hclk clocks

- clock-names: should be "aclk" and "hclk"

- power-domains: phandle to power domain node

- iommus: phandle to a iommu node



Example:

SoC-specific DT entry:

	vpu: video-codec@ff9a0000 {

		compatible = "rockchip,rk3288-vpu";

		reg = <0x0 0xff9a0000 0x0 0x800>;

		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-names = "vepu", "vdpu";

		clocks = <&cru ACLK_VCODEC>, <&cru HCLK_VCODEC>;

		clock-names = "aclk", "hclk";

		power-domains = <&power RK3288_PD_VIDEO>;

		iommus = <&vpu_mmu>;

	};

Documentation/media/uapi/mediactl/media-ioc-request-alloc.rst

+25 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections

.. This file is dual-licensed: you can use it either under the terms

.. of the GPL or the GFDL 1.1+ license, at your option. Note that this

.. dual licensing only applies to this file, and not this project as a

.. whole.

..

.. a) This file is free software; you can redistribute it and/or

..    modify it under the terms of the GNU General Public License as

..    published by the Free Software Foundation; either version 2 of

..    the License, or (at your option) any later version.

..

..    This file is distributed in the hope that it will be useful,

..    but WITHOUT ANY WARRANTY; without even the implied warranty of

..    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

..    GNU General Public License for more details.

..

.. Or, alternatively,

..

.. b) Permission is granted to copy, distribute and/or modify this

..    document under the terms of the GNU Free Documentation License,

..    Version 1.1 or any later version published by the Free Software

..    Foundation, with no Invariant Sections, no Front-Cover Texts

..    and no Back-Cover Texts. A copy of the license is included at

..    Documentation/media/uapi/fdl-appendix.rst.

..

.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections



.. _media_ioc_request_alloc:

Documentation/media/uapi/mediactl/media-request-ioc-queue.rst

+25 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections

.. This file is dual-licensed: you can use it either under the terms

.. of the GPL or the GFDL 1.1+ license, at your option. Note that this

.. dual licensing only applies to this file, and not this project as a

.. whole.

..

.. a) This file is free software; you can redistribute it and/or

..    modify it under the terms of the GNU General Public License as

..    published by the Free Software Foundation; either version 2 of

..    the License, or (at your option) any later version.

..

..    This file is distributed in the hope that it will be useful,

..    but WITHOUT ANY WARRANTY; without even the implied warranty of

..    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

..    GNU General Public License for more details.

..

.. Or, alternatively,

..

.. b) Permission is granted to copy, distribute and/or modify this

..    document under the terms of the GNU Free Documentation License,

..    Version 1.1 or any later version published by the Free Software

..    Foundation, with no Invariant Sections, no Front-Cover Texts

..    and no Back-Cover Texts. A copy of the license is included at

..    Documentation/media/uapi/fdl-appendix.rst.

..

.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections



.. _media_request_ioc_queue:

Documentation/media/uapi/mediactl/media-request-ioc-reinit.rst

+25 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections

.. This file is dual-licensed: you can use it either under the terms

.. of the GPL or the GFDL 1.1+ license, at your option. Note that this

.. dual licensing only applies to this file, and not this project as a

.. whole.

..

.. a) This file is free software; you can redistribute it and/or

..    modify it under the terms of the GNU General Public License as

..    published by the Free Software Foundation; either version 2 of

..    the License, or (at your option) any later version.

..

..    This file is distributed in the hope that it will be useful,

..    but WITHOUT ANY WARRANTY; without even the implied warranty of

..    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

..    GNU General Public License for more details.

..

.. Or, alternatively,

..

.. b) Permission is granted to copy, distribute and/or modify this

..    document under the terms of the GNU Free Documentation License,

..    Version 1.1 or any later version published by the Free Software

..    Foundation, with no Invariant Sections, no Front-Cover Texts

..    and no Back-Cover Texts. A copy of the license is included at

..    Documentation/media/uapi/fdl-appendix.rst.

..

.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections



.. _media_request_ioc_reinit:

Documentation/media/uapi/mediactl/request-api.rst

+25 −1
Original line number Diff line number Diff line 
.. SPDX-License-Identifier: GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections

.. This file is dual-licensed: you can use it either under the terms

.. of the GPL or the GFDL 1.1+ license, at your option. Note that this

.. dual licensing only applies to this file, and not this project as a

.. whole.

..

.. a) This file is free software; you can redistribute it and/or

..    modify it under the terms of the GNU General Public License as

..    published by the Free Software Foundation; either version 2 of

..    the License, or (at your option) any later version.

..

..    This file is distributed in the hope that it will be useful,

..    but WITHOUT ANY WARRANTY; without even the implied warranty of

..    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

..    GNU General Public License for more details.

..

.. Or, alternatively,

..

.. b) Permission is granted to copy, distribute and/or modify this

..    document under the terms of the GNU Free Documentation License,

..    Version 1.1 or any later version published by the Free Software

..    Foundation, with no Invariant Sections, no Front-Cover Texts

..    and no Back-Cover Texts. A copy of the license is included at

..    Documentation/media/uapi/fdl-appendix.rst.

..

.. TODO: replace it to GPL-2.0 OR GFDL-1.1-or-later WITH no-invariant-sections



.. _media-request-api:

CRA Git | Maintained and supported by SUSTech CRA and CCSE