summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/media
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2020-12-24 23:09:48 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2020-12-24 23:09:48 +0300
commit14571d5f22d3f7f6ecb97e037a2e346b3fb488bd (patch)
tree8b466e936cba8067fb0cf7e99887c2bb783f2b8a /Documentation/devicetree/bindings/media
parent64145482d3339d71f58857591d021588040543f4 (diff)
parent2b8f061a4f505aad11fd36adb24c3138ad09b96b (diff)
downloadlinux-14571d5f22d3f7f6ecb97e037a2e346b3fb488bd.tar.xz
Merge tag 'devicetree-fixes-for-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring: - Correct the JSON pointer syntax in binding schemas - Drop unnecessary *-supply schema constraints - Drop redundant maxItems/items on array schemas - Fix various yamllint warnings - Fix various missing 'additionalProperties' properties * tag 'devicetree-fixes-for-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: dt-bindings: Drop redundant maxItems/items dt-bindings: net: qcom,ipa: Drop unnecessary type ref on 'memory-region' dt-bindings: Drop unnecessary *-supply schemas properties dt-bindings/display: abt,y030xx067a: Fix binding dt-bindings: clock: imx8qxp-lpcg: eliminate yamllint warnings dt-bindings: display: eliminate yamllint warnings dt-bindings: media: nokia,smia: eliminate yamllint warnings dt-bindings: devapc: add the required property 'additionalProperties' dt-bindings: soc: add the required property 'additionalProperties' dt-bindings: serial: add the required property 'additionalProperties' dt-bindings: xlnx,vcu-settings: fix dt_binding_check warnings media: dt-bindings: coda: Add missing 'additionalProperties' dt-bindings: Fix JSON pointers
Diffstat (limited to 'Documentation/devicetree/bindings/media')
-rw-r--r--Documentation/devicetree/bindings/media/coda.yaml42
-rw-r--r--Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml1
-rw-r--r--Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml14
-rw-r--r--Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml3
-rw-r--r--Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml3
5 files changed, 27 insertions, 36 deletions
diff --git a/Documentation/devicetree/bindings/media/coda.yaml b/Documentation/devicetree/bindings/media/coda.yaml
index 7bac0057faf7..36781ee4617f 100644
--- a/Documentation/devicetree/bindings/media/coda.yaml
+++ b/Documentation/devicetree/bindings/media/coda.yaml
@@ -44,6 +44,21 @@ properties:
- const: per
- const: ahb
+ interrupts:
+ minItems: 1
+ items:
+ - description: BIT processor interrupt
+ - description: JPEG unit interrupt
+
+ interrupt-names:
+ minItems: 1
+ items:
+ - const: bit
+ - const: jpeg
+
+ power-domains:
+ maxItems: 1
+
resets:
maxItems: 1
@@ -59,6 +74,8 @@ required:
- clocks
- clock-names
+additionalProperties: false
+
allOf:
- if:
properties:
@@ -68,34 +85,17 @@ allOf:
then:
properties:
interrupts:
- items:
- - description: BIT processor interrupt
- - description: JPEG unit interrupt
+ minItems: 2
interrupt-names:
- items:
- - const: bit
- - const: jpeg
+ minItems: 2
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
+ power-domains: false
+
examples:
- |
vpu: video-codec@63ff4000 {
diff --git a/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml b/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
index 9ea827092fdd..68ee8c7d9e79 100644
--- a/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/maxim,max9286.yaml
@@ -40,7 +40,6 @@ properties:
poc-supply:
description: Regulator providing Power over Coax to the cameras
- maxItems: 1
enable-gpios:
description: GPIO connected to the \#PWDN pin with inverted polarity
diff --git a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
index d94bd67ccea1..bb3528315f20 100644
--- a/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/mipi-ccs.yaml
@@ -1,6 +1,7 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
# Copyright (C) 2014--2020 Intel Corporation
-
+%YAML 1.2
+---
$id: http://devicetree.org/schemas/media/i2c/mipi-ccs.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#
@@ -26,11 +27,11 @@ properties:
compatible:
oneOf:
- items:
- - const: mipi-ccs-1.1
- - const: mipi-ccs
+ - const: mipi-ccs-1.1
+ - const: mipi-ccs
- items:
- - const: mipi-ccs-1.0
- - const: mipi-ccs
+ - const: mipi-ccs-1.0
+ - const: mipi-ccs
- const: nokia,smia
reg:
@@ -38,15 +39,12 @@ properties:
vana-supply:
description: Analogue voltage supply (VANA), sensor dependent.
- maxItems: 1
vcore-supply:
description: Core voltage supply (VCore), sensor dependent.
- maxItems: 1
vio-supply:
description: I/O voltage supply (VIO), sensor dependent.
- maxItems: 1
clocks:
description: External clock to the sensor.
diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
index 1a3590dd0e98..eb12526a462f 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx214.yaml
@@ -37,15 +37,12 @@ properties:
vdddo-supply:
description: Chip digital IO regulator (1.8V).
- maxItems: 1
vdda-supply:
description: Chip analog regulator (2.7V).
- maxItems: 1
vddd-supply:
description: Chip digital core regulator (1.12V).
- maxItems: 1
flash-leds:
description: See ../video-interfaces.txt
diff --git a/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml b/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
index f697e1a20beb..a66acb20d59b 100644
--- a/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
+++ b/Documentation/devicetree/bindings/media/i2c/sony,imx274.yaml
@@ -33,15 +33,12 @@ properties:
vana-supply:
description: Sensor 2.8 V analog supply.
- maxItems: 1
vdig-supply:
description: Sensor 1.8 V digital core supply.
- maxItems: 1
vddl-supply:
description: Sensor digital IO 1.2 V supply.
- maxItems: 1
port:
type: object