Skip to content
Snippets Groups Projects
Commit 14571d5f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 64145482 2b8f061a
Branches
No related tags found
No related merge requests found
Showing
with 30 additions and 42 deletions
......@@ -313,7 +313,7 @@ patternProperties:
wakeup-latency-us by this duration.
idle-state-name:
$ref: /schemas/types.yaml#definitions/string
$ref: /schemas/types.yaml#/definitions/string
description:
A string used as a descriptive name for the idle state.
......
......@@ -34,7 +34,7 @@ properties:
description:
The SRAM that needs to be claimed to access the display engine
bus.
$ref: /schemas/types.yaml#definitions/phandle-array
$ref: /schemas/types.yaml#/definitions/phandle-array
maxItems: 1
ranges: true
......
......@@ -46,7 +46,7 @@ properties:
const: 1
syscon:
$ref: /schemas/types.yaml#definitions/phandle
$ref: /schemas/types.yaml#/definitions/phandle
description: Phandle to the Baikal-T1 System Controller DT node
interrupts:
......
......@@ -37,7 +37,7 @@ properties:
description: Size of the connector, should be specified in case of
non-fullsize 'usb-a-connector' or 'usb-b-connector' compatible
connectors.
$ref: /schemas/types.yaml#definitions/string
$ref: /schemas/types.yaml#/definitions/string
enum:
- mini
......@@ -67,7 +67,7 @@ properties:
power-role:
description: Determines the power role that the Type C connector will
support. "dual" refers to Dual Role Port (DRP).
$ref: /schemas/types.yaml#definitions/string
$ref: /schemas/types.yaml#/definitions/string
enum:
- source
......@@ -76,7 +76,7 @@ properties:
try-power-role:
description: Preferred power role.
$ref: /schemas/types.yaml#definitions/string
$ref: /schemas/types.yaml#/definitions/string
enum:
- source
......@@ -86,7 +86,7 @@ properties:
data-role:
description: Data role if Type C connector supports USB data. "dual" refers
Dual Role Device (DRD).
$ref: /schemas/types.yaml#definitions/string
$ref: /schemas/types.yaml#/definitions/string
enum:
- host
......@@ -105,7 +105,7 @@ properties:
Type-C Cable and Connector specification, when Power Delivery is not
supported.
allOf:
- $ref: /schemas/types.yaml#definitions/string
- $ref: /schemas/types.yaml#/definitions/string
enum:
- default
- 1.5A
......
......@@ -26,11 +26,9 @@ properties:
description: GPIO connected to active low reset
dvdd12-supply:
maxItems: 1
description: Regulator for 1.2V digital core power.
dvdd25-supply:
maxItems: 1
description: Regulator for 2.5V digital core power.
ports:
......
......@@ -35,11 +35,9 @@ properties:
maxItems: 1
ovdd-supply:
maxItems: 1
description: I/O voltage
pwr18-supply:
maxItems: 1
description: core voltage
interrupts:
......
......@@ -79,8 +79,7 @@ properties:
The GPIO used to control the power down line of this device.
maxItems: 1
power-supply:
maxItems: 1
power-supply: true
required:
- compatible
......
......@@ -35,11 +35,9 @@ properties:
description: GPIO connected to active low reset.
vdd12-supply:
maxItems: 1
description: Regulator for 1.2V digital core power.
vdd33-supply:
maxItems: 1
description: Regulator for 3.3V digital core power.
ports:
......
......@@ -60,7 +60,6 @@ properties:
description: GPIO controlling bridge enable
vdd-supply:
maxItems: 1
description: Power supply for the bridge
required:
......
......@@ -74,7 +74,6 @@ properties:
description: Power down GPIO signal, pin name "/PDWN", active low.
vcc-supply:
maxItems: 1
description:
Power supply for the TTL output, TTL CLOCKOUT signal, LVDS input, PLL and
digital circuitry.
......
......@@ -28,11 +28,9 @@ properties:
description: i2c address of the bridge, 0x0f
vdd-supply:
maxItems: 1
description: 1.2V LVDS Power Supply
vddio-supply:
maxItems: 1
description: 1.8V IO Power Supply
stby-gpios:
......
......@@ -32,7 +32,7 @@ required:
- power-supply
- reset-gpios
additionalProperties: false
unevaluatedProperties: false
examples:
- |
......
......@@ -98,7 +98,6 @@ properties:
maxItems: 1
dmas:
maxItems: 4
items:
- description: Video layer, plane 0 (RGB or luma)
- description: Video layer, plane 1 (U/V or U)
......
......@@ -38,12 +38,12 @@ properties:
maxItems: 255
dma-channels:
$ref: /schemas/types.yaml#definitions/uint32
$ref: /schemas/types.yaml#/definitions/uint32
description:
Number of DMA channels supported by the controller.
dma-requests:
$ref: /schemas/types.yaml#definitions/uint32
$ref: /schemas/types.yaml#/definitions/uint32
description:
Number of DMA request signals supported by the controller.
......
......@@ -23,7 +23,7 @@ properties:
pattern: "^dma-router(@.*)?$"
dma-masters:
$ref: /schemas/types.yaml#definitions/phandle-array
$ref: /schemas/types.yaml#/definitions/phandle-array
description:
Array of phandles to the DMA controllers the router can direct
the signal to.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment