-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'media/v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel…
…/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - uAPI documentation for stateless decoders - Added a new CEC ioctl together with its documentation - Improved IPU3 documentation - New i2c drivers: hi556 and imx290 - Added support on Vivid driver for meta streams - Added de-interlace support for sunxi subdriver - Added a few new remote controler keymaps - Added H.265 support for Sunxi Cedrus driver - Another round of random driver cleanups, fixes and improvements * tag 'media/v5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (361 commits) media: Revert "media: mtk-vcodec: Remove extra area allocation in an input buffer on encoding" media: hantro: Set H264 FIELDPIC_FLAG_E flag correctly media: hantro: Remove now unused H264 pic_size media: hantro: Use output buffer width and height for H264 decoding media: hantro: Reduce H264 extra space for motion vectors media: hantro: Fix H264 motion vector buffer offset media: ti-vpe: vpe: fix compatible to match bindings media: dt-bindings: media: ti-vpe: Document VPE driver media: zr364xx: remove redundant assigmnent to idx, clean up code media: Documentation: media: *_DEFAULT targets for subdevs media: hantro: Fix s_fmt for dynamic resolution changes media: i2c: Use the correct style for SPDX License Identifier media: siano: Use the correct style for SPDX License Identifier media: vicodec: media_device_cleanup was called too early media: vim2m: media_device_cleanup was called too early media: cedrus: Increase maximum supported size media: cedrus: Fix H264 4k support media: cedrus: Properly signal size in mode register media: v4l2-ctrl: Lock main_hdl on operations of requests_queued. media: si470x-i2c: add missed operations in remove ...
- Loading branch information
Showing
299 changed files
with
12,846 additions
and
4,720 deletions.
There are no files selected for viewing
76 changes: 76 additions & 0 deletions
76
Documentation/devicetree/bindings/media/allwinner,sun8i-h3-deinterlace.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,76 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/media/allwinner,sun8i-h3-deinterlace.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Allwinner H3 Deinterlace Device Tree Bindings | ||
|
|
||
| maintainers: | ||
| - Jernej Skrabec <jernej.skrabec@siol.net> | ||
| - Chen-Yu Tsai <wens@csie.org> | ||
| - Maxime Ripard <mripard@kernel.org> | ||
|
|
||
| description: |- | ||
| The Allwinner H3 and later has a deinterlace core used for | ||
| deinterlacing interlaced video content. | ||
| properties: | ||
| compatible: | ||
| const: allwinner,sun8i-h3-deinterlace | ||
|
|
||
| reg: | ||
| maxItems: 1 | ||
|
|
||
| interrupts: | ||
| maxItems: 1 | ||
|
|
||
| clocks: | ||
| items: | ||
| - description: Deinterlace interface clock | ||
| - description: Deinterlace module clock | ||
| - description: Deinterlace DRAM clock | ||
|
|
||
| clock-names: | ||
| items: | ||
| - const: bus | ||
| - const: mod | ||
| - const: ram | ||
|
|
||
| resets: | ||
| maxItems: 1 | ||
|
|
||
| interconnects: | ||
| maxItems: 1 | ||
|
|
||
| interconnect-names: | ||
| const: dma-mem | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - interrupts | ||
| - clocks | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
| #include <dt-bindings/clock/sun8i-h3-ccu.h> | ||
| #include <dt-bindings/reset/sun8i-h3-ccu.h> | ||
| deinterlace: deinterlace@1400000 { | ||
| compatible = "allwinner,sun8i-h3-deinterlace"; | ||
| reg = <0x01400000 0x20000>; | ||
| clocks = <&ccu CLK_BUS_DEINTERLACE>, | ||
| <&ccu CLK_DEINTERLACE>, | ||
| <&ccu CLK_DRAM_DEINTERLACE>; | ||
| clock-names = "bus", "mod", "ram"; | ||
| resets = <&ccu RST_BUS_DEINTERLACE>; | ||
| interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>; | ||
| interconnects = <&mbus 9>; | ||
| interconnect-names = "dma-mem"; | ||
| }; | ||
| ... |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| * Sony IMX290 1/2.8-Inch CMOS Image Sensor | ||
|
|
||
| The Sony IMX290 is a 1/2.8-Inch CMOS Solid-state image sensor with | ||
| Square Pixel for Color Cameras. It is programmable through I2C and 4-wire | ||
| interfaces. The sensor output is available via CMOS logic parallel SDR output, | ||
| Low voltage LVDS DDR output and CSI-2 serial data output. The CSI-2 bus is the | ||
| default. No bindings have been defined for the other busses. | ||
|
|
||
| Required Properties: | ||
| - compatible: Should be "sony,imx290" | ||
| - reg: I2C bus address of the device | ||
| - clocks: Reference to the xclk clock. | ||
| - clock-names: Should be "xclk". | ||
| - clock-frequency: Frequency of the xclk clock in Hz. | ||
| - vdddo-supply: Sensor digital IO regulator. | ||
| - vdda-supply: Sensor analog regulator. | ||
| - vddd-supply: Sensor digital core regulator. | ||
|
|
||
| Optional Properties: | ||
| - reset-gpios: Sensor reset GPIO | ||
|
|
||
| The imx290 device node should contain one 'port' child node with | ||
| an 'endpoint' subnode. For further reading on port node refer to | ||
| Documentation/devicetree/bindings/media/video-interfaces.txt. | ||
|
|
||
| Required Properties on endpoint: | ||
| - data-lanes: check ../video-interfaces.txt | ||
| - link-frequencies: check ../video-interfaces.txt | ||
| - remote-endpoint: check ../video-interfaces.txt | ||
|
|
||
| Example: | ||
| &i2c1 { | ||
| ... | ||
| imx290: camera-sensor@1a { | ||
| compatible = "sony,imx290"; | ||
| reg = <0x1a>; | ||
|
|
||
| reset-gpios = <&msmgpio 35 GPIO_ACTIVE_LOW>; | ||
| pinctrl-names = "default"; | ||
| pinctrl-0 = <&camera_rear_default>; | ||
|
|
||
| clocks = <&gcc GCC_CAMSS_MCLK0_CLK>; | ||
| clock-names = "xclk"; | ||
| clock-frequency = <37125000>; | ||
|
|
||
| vdddo-supply = <&camera_vdddo_1v8>; | ||
| vdda-supply = <&camera_vdda_2v8>; | ||
| vddd-supply = <&camera_vddd_1v5>; | ||
|
|
||
| port { | ||
| imx290_ep: endpoint { | ||
| data-lanes = <1 2 3 4>; | ||
| link-frequencies = /bits/ 64 <445500000>; | ||
| remote-endpoint = <&csiphy0_ep>; | ||
| }; | ||
| }; | ||
| }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| # SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
| %YAML 1.2 | ||
| --- | ||
| $id: http://devicetree.org/schemas/media/ti,vpe.yaml# | ||
| $schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
|
||
| title: Texas Instruments DRA7x Video Processing Engine (VPE) Device Tree Bindings | ||
|
|
||
| maintainers: | ||
| - Benoit Parrot <bparrot@ti.com> | ||
|
|
||
| description: |- | ||
| The Video Processing Engine (VPE) is a key component for image post | ||
| processing applications. VPE consist of a single memory to memory | ||
| path which can perform chroma up/down sampling, deinterlacing, | ||
| scaling and color space conversion. | ||
| properties: | ||
| compatible: | ||
| const: ti,dra7-vpe | ||
|
|
||
| reg: | ||
| items: | ||
| - description: The VPE main register region | ||
| - description: Scaler (SC) register region | ||
| - description: Color Space Conversion (CSC) register region | ||
| - description: Video Port Direct Memory Access (VPDMA) register region | ||
|
|
||
| reg-names: | ||
| items: | ||
| - const: vpe_top | ||
| - const: sc | ||
| - const: csc | ||
| - const: vpdma | ||
|
|
||
| interrupts: | ||
| maxItems: 1 | ||
|
|
||
| required: | ||
| - compatible | ||
| - reg | ||
| - reg-names | ||
| - interrupts | ||
|
|
||
| additionalProperties: false | ||
|
|
||
| examples: | ||
| - | | ||
| #include <dt-bindings/interrupt-controller/arm-gic.h> | ||
| vpe: vpe@489d0000 { | ||
| compatible = "ti,dra7-vpe"; | ||
| reg = <0x489d0000 0x120>, | ||
| <0x489d0700 0x80>, | ||
| <0x489d5700 0x18>, | ||
| <0x489dd000 0x400>; | ||
| reg-names = "vpe_top", | ||
| "sc", | ||
| "csc", | ||
| "vpdma"; | ||
| interrupts = <GIC_SPI 354 IRQ_TYPE_LEVEL_HIGH>; | ||
| }; | ||
| ... |
Oops, something went wrong.