Commit b07175dc authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'devicetree-fixes-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux

Pull devicetree fixes from Rob Herring:
 "Another round of 'allOf' removals and whitespace clean-ups of schemas"

* tag 'devicetree-fixes-for-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: Remove more cases of 'allOf' containing a '$ref'
  dt-bindings: Whitespace clean-ups in schema files
parents 341323fa 5f0b06da
...@@ -273,8 +273,8 @@ properties: ...@@ -273,8 +273,8 @@ properties:
- fsl,imx6ull-14x14-evk # i.MX6 UltraLiteLite 14x14 EVK Board - fsl,imx6ull-14x14-evk # i.MX6 UltraLiteLite 14x14 EVK Board
- kontron,imx6ull-n6411-som # Kontron N6411 SOM - kontron,imx6ull-n6411-som # Kontron N6411 SOM
- myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board - myir,imx6ull-mys-6ulx-eval # MYiR Tech iMX6ULL Evaluation Board
- toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Evaluation Board - toradex,colibri-imx6ull-eval # Colibri iMX6ULL Module on Colibri Eval Board
- toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / Bluetooth Module on Colibri Evaluation Board - toradex,colibri-imx6ull-wifi-eval # Colibri iMX6ULL Wi-Fi / BT Module on Colibri Eval Board
- const: fsl,imx6ull - const: fsl,imx6ull
- description: Kontron N6411 S Board - description: Kontron N6411 S Board
...@@ -312,9 +312,12 @@ properties: ...@@ -312,9 +312,12 @@ properties:
- toradex,colibri-imx7d # Colibri iMX7 Dual Module - toradex,colibri-imx7d # Colibri iMX7 Dual Module
- toradex,colibri-imx7d-aster # Colibri iMX7 Dual Module on Aster Carrier Board - toradex,colibri-imx7d-aster # Colibri iMX7 Dual Module on Aster Carrier Board
- toradex,colibri-imx7d-emmc # Colibri iMX7 Dual 1GB (eMMC) Module - toradex,colibri-imx7d-emmc # Colibri iMX7 Dual 1GB (eMMC) Module
- toradex,colibri-imx7d-emmc-aster # Colibri iMX7 Dual 1GB (eMMC) Module on Aster Carrier Board - toradex,colibri-imx7d-emmc-aster # Colibri iMX7 Dual 1GB (eMMC) Module on
- toradex,colibri-imx7d-emmc-eval-v3 # Colibri iMX7 Dual 1GB (eMMC) Module on Colibri Evaluation Board V3 # Aster Carrier Board
- toradex,colibri-imx7d-eval-v3 # Colibri iMX7 Dual Module on Colibri Evaluation Board V3 - toradex,colibri-imx7d-emmc-eval-v3 # Colibri iMX7 Dual 1GB (eMMC) Module on
# Colibri Evaluation Board V3
- toradex,colibri-imx7d-eval-v3 # Colibri iMX7 Dual Module on
# Colibri Evaluation Board V3
- tq,imx7d-mba7 # i.MX7D TQ MBa7 with TQMa7D SoM - tq,imx7d-mba7 # i.MX7D TQ MBa7 with TQMa7D SoM
- zii,imx7d-rmu2 # ZII RMU2 Board - zii,imx7d-rmu2 # ZII RMU2 Board
- zii,imx7d-rpu2 # ZII RPU2 Board - zii,imx7d-rpu2 # ZII RPU2 Board
......
...@@ -16,7 +16,7 @@ properties: ...@@ -16,7 +16,7 @@ properties:
"#clock-cells": "#clock-cells":
const: 1 const: 1
compatible : compatible:
enum: enum:
- sprd,sc9863a-ap-clk - sprd,sc9863a-ap-clk
- sprd,sc9863a-aon-clk - sprd,sc9863a-aon-clk
......
...@@ -32,8 +32,7 @@ properties: ...@@ -32,8 +32,7 @@ properties:
- const: hdmi - const: hdmi
ddc: ddc:
allOf: $ref: /schemas/types.yaml#/definitions/phandle
- $ref: /schemas/types.yaml#/definitions/phandle
description: > description: >
Phandle of the I2C controller used for DDC EDID probing Phandle of the I2C controller used for DDC EDID probing
......
...@@ -163,7 +163,6 @@ additionalProperties: false ...@@ -163,7 +163,6 @@ additionalProperties: false
examples: examples:
- | - |
#include <dt-bindings/clock/imx8mq-clock.h> #include <dt-bindings/clock/imx8mq-clock.h>
#include <dt-bindings/gpio/gpio.h> #include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
......
...@@ -26,7 +26,6 @@ properties: ...@@ -26,7 +26,6 @@ properties:
items: items:
- enum: - enum:
- dlink,dir-685-panel - dlink,dir-685-panel
- const: ilitek,ili9322 - const: ilitek,ili9322
reset-gpios: true reset-gpios: true
......
...@@ -14,7 +14,6 @@ properties: ...@@ -14,7 +14,6 @@ properties:
items: items:
- enum: - enum:
- bananapi,lhr050h41 - bananapi,lhr050h41
- const: ilitek,ili9881c - const: ilitek,ili9881c
backlight: true backlight: true
......
...@@ -147,4 +147,3 @@ examples: ...@@ -147,4 +147,3 @@ examples:
... ...
...@@ -177,10 +177,10 @@ properties: ...@@ -177,10 +177,10 @@ properties:
dependencies: dependencies:
# 'vendor,bool-property' is only allowed when 'vendor,string-array-property' # 'vendor,bool-property' is only allowed when 'vendor,string-array-property'
# is present # is present
vendor,bool-property: [ vendor,string-array-property ] vendor,bool-property: [ 'vendor,string-array-property' ]
# Expressing 2 properties in both orders means all of the set of properties # Expressing 2 properties in both orders means all of the set of properties
# must be present or none of them. # must be present or none of them.
vendor,string-array-property: [ vendor,bool-property ] vendor,string-array-property: [ 'vendor,bool-property' ]
required: required:
- compatible - compatible
......
...@@ -19,10 +19,8 @@ properties: ...@@ -19,10 +19,8 @@ properties:
reg: reg:
items: items:
- description: the I/O address containing the GPIO controller - description: the I/O address containing the GPIO controller registers.
registers. - description: the I/O address containing the Chip Common A interrupt registers.
- description: the I/O address containing the Chip Common A interrupt
registers.
gpio-controller: true gpio-controller: true
......
...@@ -26,7 +26,8 @@ properties: ...@@ -26,7 +26,8 @@ properties:
- description: AXI/master interface clock - description: AXI/master interface clock
- description: GPU core clock - description: GPU core clock
- description: Shader clock (only required if GPU has feature PIPE_3D) - description: Shader clock (only required if GPU has feature PIPE_3D)
- description: AHB/slave interface clock (only required if GPU can gate slave interface independently) - description: AHB/slave interface clock (only required if GPU can gate
slave interface independently)
minItems: 1 minItems: 1
maxItems: 4 maxItems: 4
......
...@@ -97,13 +97,11 @@ patternProperties: ...@@ -97,13 +97,11 @@ patternProperties:
input signal is multiplied. For example, <1 3> indicates the signal is scaled input signal is multiplied. For example, <1 3> indicates the signal is scaled
down to 1/3 of its value before ADC measurement. down to 1/3 of its value before ADC measurement.
If property is not found default value depending on chip will be used. If property is not found default value depending on chip will be used.
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- items: - items:
- const: 1 - const: 1
- enum: [ 1, 3, 4, 6, 20, 8, 10 ] - enum: [ 1, 3, 4, 6, 20, 8, 10 ]
- items: - items:
- const: 10 - const: 10
- const: 81 - const: 81
......
...@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,8 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: HMC425A 6-bit Digital Step Attenuator title: HMC425A 6-bit Digital Step Attenuator
maintainers: maintainers:
- Michael Hennerich <michael.hennerich@analog.com> - Michael Hennerich <michael.hennerich@analog.com>
- Beniamin Bia <beniamin.bia@analog.com> - Beniamin Bia <beniamin.bia@analog.com>
description: | description: |
Digital Step Attenuator IIO device with gpio interface. Digital Step Attenuator IIO device with gpio interface.
......
...@@ -87,7 +87,7 @@ properties: ...@@ -87,7 +87,7 @@ properties:
description: Output range of the channel. description: Output range of the channel.
items: items:
- const: 0 - const: 0
- enum: [ 140000, 250000 ] - enum: [140000, 250000]
channel@2: channel@2:
description: Represents an external channel which are description: Represents an external channel which are
...@@ -103,7 +103,7 @@ properties: ...@@ -103,7 +103,7 @@ properties:
description: Output range of the channel. description: Output range of the channel.
items: items:
- const: 0 - const: 0
- enum: [ 55000, 150000 ] - enum: [55000, 150000]
patternProperties: patternProperties:
"^channel@([3-5])$": "^channel@([3-5])$":
...@@ -119,16 +119,16 @@ patternProperties: ...@@ -119,16 +119,16 @@ patternProperties:
description: Output range of the channel. description: Output range of the channel.
items: items:
- const: 0 - const: 0
- enum: [ 45000, 100000 ] - enum: [45000, 100000]
required: required:
- reg - reg
- channel@0 - channel@0
- channel@1 - channel@1
- channel@2 - channel@2
- channel@3 - channel@3
- channel@4 - channel@4
- channel@5 - channel@5
examples: examples:
- | - |
......
...@@ -36,7 +36,7 @@ required: ...@@ -36,7 +36,7 @@ required:
additionalProperties: false additionalProperties: false
examples: examples:
- | - |
i2c { i2c {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
......
...@@ -51,7 +51,7 @@ required: ...@@ -51,7 +51,7 @@ required:
- touchscreen-max-pressure - touchscreen-max-pressure
examples: examples:
- | - |
#include <dt-bindings/interrupt-controller/irq.h> #include <dt-bindings/interrupt-controller/irq.h>
i2c { i2c {
#address-cells = <1>; #address-cells = <1>;
......
...@@ -35,9 +35,8 @@ properties: ...@@ -35,9 +35,8 @@ properties:
maxItems: 1 maxItems: 1
irq-gpios: irq-gpios:
description: GPIO pin used for IRQ. description: GPIO pin used for IRQ. The driver uses the interrupt gpio pin
The driver uses the interrupt gpio pin as as output to reset the device.
output to reset the device.
maxItems: 1 maxItems: 1
reset-gpios: reset-gpios:
......
...@@ -33,8 +33,8 @@ properties: ...@@ -33,8 +33,8 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
touchscreen-min-pressure: touchscreen-min-pressure:
description: minimum pressure on the touchscreen to be achieved in order for the description: minimum pressure on the touchscreen to be achieved in order
touchscreen driver to report a touch event. for the touchscreen driver to report a touch event.
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
touchscreen-fuzz-x: touchscreen-fuzz-x:
...@@ -46,13 +46,13 @@ properties: ...@@ -46,13 +46,13 @@ properties:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
touchscreen-fuzz-pressure: touchscreen-fuzz-pressure:
description: pressure noise value of the absolute input device (arbitrary range description: pressure noise value of the absolute input device (arbitrary
dependent on the controller) range dependent on the controller)
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
touchscreen-average-samples: touchscreen-average-samples:
description: Number of data samples which are averaged for each read (valid values description: Number of data samples which are averaged for each read (valid
dependent on the controller) values dependent on the controller)
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
touchscreen-inverted-x: touchscreen-inverted-x:
......
...@@ -42,9 +42,8 @@ properties: ...@@ -42,9 +42,8 @@ properties:
Specifies the list of CPU interrupt vectors to which the GIC may not Specifies the list of CPU interrupt vectors to which the GIC may not
route interrupts. This property is ignored if the CPU is started in EIC route interrupts. This property is ignored if the CPU is started in EIC
mode. mode.
allOf: $ref: /schemas/types.yaml#definitions/uint32-array
- $ref: /schemas/types.yaml#definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 6 maxItems: 6
uniqueItems: true uniqueItems: true
items: items:
...@@ -57,9 +56,8 @@ properties: ...@@ -57,9 +56,8 @@ properties:
It accepts two values: the 1st is the starting interrupt and the 2nd is It accepts two values: the 1st is the starting interrupt and the 2nd is
the size of the reserved range. If not specified, the driver will the size of the reserved range. If not specified, the driver will
allocate the last (2 * number of VPEs in the system). allocate the last (2 * number of VPEs in the system).
allOf: $ref: /schemas/types.yaml#definitions/uint32-array
- $ref: /schemas/types.yaml#definitions/uint32-array items:
- items:
- minimum: 0 - minimum: 0
maximum: 254 maximum: 254
- minimum: 2 - minimum: 2
......
...@@ -79,7 +79,8 @@ properties: ...@@ -79,7 +79,8 @@ properties:
description: | description: |
kHz; switching frequency. kHz; switching frequency.
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, 4800, 9600 ] enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920,
2400, 3200, 4800, 9600 ]
qcom,ovp: qcom,ovp:
description: | description: |
......
...@@ -58,8 +58,7 @@ allOf: ...@@ -58,8 +58,7 @@ allOf:
- if: - if:
properties: properties:
compatible: compatible:
items: enum:
- enum:
- adi,adv7180 - adi,adv7180
- adi,adv7182 - adi,adv7182
- adi,adv7280 - adi,adv7280
......
...@@ -38,9 +38,8 @@ properties: ...@@ -38,9 +38,8 @@ properties:
dongwoon,aac-mode: dongwoon,aac-mode:
description: description:
Indication of AAC mode select. Indication of AAC mode select.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" enum:
- enum:
- 1 # AAC2 mode(operation time# 0.48 x Tvib) - 1 # AAC2 mode(operation time# 0.48 x Tvib)
- 2 # AAC3 mode(operation time# 0.70 x Tvib) - 2 # AAC3 mode(operation time# 0.70 x Tvib)
- 3 # AAC4 mode(operation time# 0.75 x Tvib) - 3 # AAC4 mode(operation time# 0.75 x Tvib)
...@@ -51,9 +50,8 @@ properties: ...@@ -51,9 +50,8 @@ properties:
description: description:
Number of AAC Timing count that controlled by one 6-bit period of Number of AAC Timing count that controlled by one 6-bit period of
vibration register AACT[5:0], the unit of which is 100 us. vibration register AACT[5:0], the unit of which is 100 us.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" default: 0x20
- default: 0x20
minimum: 0x00 minimum: 0x00
maximum: 0x3f maximum: 0x3f
...@@ -61,9 +59,8 @@ properties: ...@@ -61,9 +59,8 @@ properties:
description: description:
Indication of VCM internal clock dividing rate select, as one multiple Indication of VCM internal clock dividing rate select, as one multiple
factor to calculate VCM ring periodic time Tvib. factor to calculate VCM ring periodic time Tvib.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" enum:
- enum:
- 0 # Dividing Rate - 2 - 0 # Dividing Rate - 2
- 1 # Dividing Rate - 1 - 1 # Dividing Rate - 1
- 2 # Dividing Rate - 1/2 - 2 # Dividing Rate - 1/2
......
...@@ -139,3 +139,4 @@ examples: ...@@ -139,3 +139,4 @@ examples:
}; };
}; };
... ...
...@@ -65,13 +65,12 @@ properties: ...@@ -65,13 +65,12 @@ properties:
0x2d - RAW14 0x2d - RAW14
0x2e - RAW16 0x2e - RAW16
0x2f - RAW20 0x2f - RAW20
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 oneOf:
- anyOf:
- minimum: 0x1e - minimum: 0x1e
- maximum: 0x24 maximum: 0x24
- minimum: 0x28 - minimum: 0x28
- maximum: 0x2f maximum: 0x2f
xlnx,vfb: xlnx,vfb:
type: boolean type: boolean
......
...@@ -113,8 +113,8 @@ properties: ...@@ -113,8 +113,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
...@@ -135,8 +135,8 @@ properties: ...@@ -135,8 +135,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
...@@ -154,8 +154,8 @@ properties: ...@@ -154,8 +154,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
...@@ -172,8 +172,8 @@ properties: ...@@ -172,8 +172,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
...@@ -198,8 +198,8 @@ properties: ...@@ -198,8 +198,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
...@@ -220,8 +220,8 @@ properties: ...@@ -220,8 +220,8 @@ properties:
maxItems: 1 maxItems: 1
st,mask-reset: st,mask-reset:
description: mask reset for this regulator, description: mask reset for this regulator, the regulator configuration
the regulator configuration is maintained during pmic reset. is maintained during pmic reset.
$ref: /schemas/types.yaml#/definitions/flag $ref: /schemas/types.yaml#/definitions/flag
regulator-name: true regulator-name: true
......
...@@ -24,8 +24,7 @@ maintainers: ...@@ -24,8 +24,7 @@ maintainers:
properties: properties:
compatible: compatible:
anyOf: items:
- items:
- enum: - enum:
- ti,j721e-system-controller - ti,j721e-system-controller
- const: syscon - const: syscon
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment