forked from torvalds/linux
-
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.11-1' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/mchehab/linux-media Pull media updates from Mauro Carvalho Chehab: - some rework at the uAPI pixel format docs - the smiapp driver has started to gain support for MIPI CSS camera sensors and was renamed - two new sensor drivers: ov02a10 and ov9734 - Meson gained a driver for the 2D acceleration unit - Rockchip rkisp1 driver was promoted from staging - Cedrus driver gained support for VP8 - two new remote controller keymaps were added - the usual set of fixes cleanups and driver improvements * tag 'media/v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (447 commits) media: ccs: Add support for obtaining C-PHY configuration from firmware media: ccs-pll: Print pixel rates media: ccs: Print written register values media: ccs: Add support for DDR OP SYS and OP PIX clocks media: ccs-pll: Add support for DDR OP system and pixel clocks media: ccs: Dual PLL support media: ccs-pll: Add trivial dual PLL support media: ccs-pll: Separate VT divisor limit calculation from the rest media: ccs-pll: Fix VT post-PLL divisor calculation media: ccs-pll: Make VT divisors 16-bit media: ccs-pll: Rework bounds checks media: ccs-pll: Print relevant information on PLL tree media: ccs-pll: Better separate OP and VT sub-tree calculation media: ccs-pll: Check for derating and overrating, support non-derating sensors media: ccs-pll: Split off VT subtree calculation media: ccs-pll: Add C-PHY support media: ccs-pll: Add sanity checks media: ccs-pll: Add support flexible OP PLL pixel clock divider media: ccs-pll: Support two cycles per pixel on OP domain media: ccs-pll: Add support for extended input PLL clock divider ...
- Loading branch information
Showing
408 changed files
with
23,940 additions
and
13,923 deletions.
There are no files selected for viewing
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
47 changes: 47 additions & 0 deletions
47
Documentation/devicetree/bindings/media/amlogic,axg-ge2d.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,47 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
# Copyright 2020 BayLibre, SAS | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/media/amlogic,axg-ge2d.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: Amlogic GE2D Acceleration Unit | ||
|
||
maintainers: | ||
- Neil Armstrong <[email protected]> | ||
|
||
properties: | ||
compatible: | ||
enum: | ||
- amlogic,axg-ge2d | ||
|
||
interrupts: | ||
minItems: 1 | ||
|
||
reg: | ||
minItems: 1 | ||
|
||
resets: | ||
maxItems: 1 | ||
|
||
clocks: | ||
minItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- resets | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
ge2d: ge2d@ff940000 { | ||
compatible = "amlogic,axg-ge2d"; | ||
reg = <0xff940000 0x10000>; | ||
interrupts = <150>; | ||
clocks = <&clk_ge2d>; | ||
resets = <&reset_ge2d>; | ||
}; |
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,108 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/media/coda.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: Chips&Media Coda multi-standard codec IP | ||
|
||
maintainers: | ||
- Philipp Zabel <[email protected]> | ||
|
||
description: |- | ||
Coda codec IPs are present in i.MX SoCs in various versions, | ||
called VPU (Video Processing Unit). | ||
properties: | ||
compatible: | ||
oneOf: | ||
- items: | ||
- const: fsl,imx27-vpu | ||
- const: cnm,codadx6 | ||
- items: | ||
- const: fsl,imx51-vpu | ||
- const: cnm,codahx4 | ||
- items: | ||
- const: fsl,imx53-vpu | ||
- const: cnm,coda7541 | ||
- items: | ||
- enum: | ||
- fsl,imx6dl-vpu | ||
- fsl,imx6q-vpu | ||
- const: cnm,coda960 | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
clocks: | ||
items: | ||
- description: PER clock | ||
- description: AHB interface clock | ||
|
||
clock-names: | ||
items: | ||
- const: per | ||
- const: ahb | ||
|
||
resets: | ||
maxItems: 1 | ||
|
||
iram: | ||
$ref: /schemas/types.yaml#/definitions/phandle | ||
description: phandle pointing to the SRAM device node | ||
maxItems: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- interrupts | ||
- clocks | ||
- clock-names | ||
|
||
allOf: | ||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
const: cnm,coda960 | ||
then: | ||
properties: | ||
interrupts: | ||
items: | ||
- description: BIT processor interrupt | ||
- description: JPEG unit interrupt | ||
|
||
interrupt-names: | ||
items: | ||
- const: bit | ||
- const: jpeg | ||
else: | ||
properties: | ||
interrupts: | ||
items: | ||
- description: BIT processor interrupt | ||
|
||
- if: | ||
properties: | ||
compatible: | ||
contains: | ||
enum: | ||
- fsl,imx6dl-vpu | ||
- fsl,imx6q-vpu | ||
then: | ||
properties: | ||
power-domains: | ||
$ref: /schemas/types.yaml#/definitions/phandle | ||
description: phandle pointing to the PU power domain | ||
maxItems: 1 | ||
|
||
examples: | ||
- | | ||
vpu: video-codec@63ff4000 { | ||
compatible = "fsl,imx53-vpu", "cnm,coda7541"; | ||
reg = <0x63ff4000 0x1000>; | ||
interrupts = <9>; | ||
clocks = <&clks 63>, <&clks 63>; | ||
clock-names = "per", "ahb"; | ||
iram = <&ocram>; | ||
}; |
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.