Skip to content

L
linux
Commit a2c29ccd authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

Pull devicetree fixes from Rob Herring:

 - Fix scalar property schemas with array constraints

 - Fix 'enum' lists with duplicate entries

 - Fix incomplete if/then/else schemas

 - Add Renesas RZ/V2L SoC support to Mali Bifrost binding

 - Maintainers update for Marvell irqchip

* tag 'devicetree-fixes-for-5.18-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: display: panel-timing: Define a single type for properties
  dt-bindings: Fix array constraints on scalar properties
  dt-bindings: gpu: mali-bifrost: Document RZ/V2L SoC
  dt-bindings: net: snps: remove duplicate name
  dt-bindings: Fix 'enum' lists with duplicate entries
  dt-bindings: irqchip: mrvl,intc: refresh maintainers
  dt-bindings: Fix incomplete if/then/else schemas
  dt-bindings: power: renesas,apmu: Fix cpus property limits
  dt-bindings: extcon: maxim,max77843: fix ports type
parents de6e9336 652980b1
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 165 deletions
Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
View file @ a2c29ccd
......@@ -13,7 +13,6 @@ maintainers:
properties:
compatible:
enum:
- nvidia,tegra20-pmc
- nvidia,tegra20-pmc
- nvidia,tegra30-pmc
- nvidia,tegra114-pmc
......
Documentation/devicetree/bindings/bus/ti-sysc.yaml
View file @ a2c29ccd
......@@ -34,7 +34,6 @@ properties:
oneOf:
- items:
- enum:
- ti,sysc-omap2
- ti,sysc-omap2
- ti,sysc-omap4
- ti,sysc-omap4-simple
......
Documentation/devicetree/bindings/display/panel/panel-timing.yaml
View file @ a2c29ccd
......@@ -71,78 +71,72 @@ properties:
hfront-porch:
description: Horizontal front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels
hback-porch:
description: Horizontal back porch timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels
hsync-len:
description: Horizontal sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of pixels
vfront-porch:
description: Vertical front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines
vback-porch:
description: Vertical back porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines
vsync-len:
description: Vertical sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
- maxItems: 1
items:
description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 3
- minItems: 3
maxItems: 3
items:
description: min, typ, max number of lines
......
Documentation/devicetree/bindings/extcon/maxim,max77843.yaml
View file @ a2c29ccd
......@@ -25,7 +25,7 @@ properties:
$ref: /schemas/connector/usb-connector.yaml#
ports:
$ref: /schemas/graph.yaml#/properties/port
$ref: /schemas/graph.yaml#/properties/ports
description:
Any connector to the data bus of this controller should be modelled using
the OF graph bindings specified
......
Documentation/devicetree/bindings/gpu/arm,mali-bifrost.yaml
View file @ a2c29ccd
......@@ -20,6 +20,7 @@ properties:
- mediatek,mt8183-mali
- realtek,rtd1619-mali
- renesas,r9a07g044-mali
- renesas,r9a07g054-mali
- rockchip,px30-mali
- rockchip,rk3568-mali
- const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
......@@ -109,7 +110,9 @@ allOf:
properties:
compatible:
contains:
const: renesas,r9a07g044-mali
enum:
- renesas,r9a07g044-mali
- renesas,r9a07g054-mali
then:
properties:
interrupts:
......
Documentation/devicetree/bindings/hwmon/ti,tmp464.yaml
View file @ a2c29ccd
......@@ -58,9 +58,8 @@ patternProperties:
The value (two's complement) to be programmed in the channel specific N correction register.
For remote channels only.
$ref: /schemas/types.yaml#/definitions/int32
items:
minimum: -128
maximum: 127
minimum: -128
maximum: 127
required:
- reg
......
Documentation/devicetree/bindings/iio/adc/adi,ad7476.yaml
View file @ a2c29ccd
......@@ -98,6 +98,7 @@ allOf:
- ti,adc121s
- ti,ads7866
- ti,ads7868
then:
required:
- vcc-supply
# Devices with a vref
......
Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.yaml
View file @ a2c29ccd
......@@ -108,9 +108,7 @@ patternProperties:
- [1-5]: order 1 to 5.
For audio purpose it is recommended to use order 3 to 5.
$ref: /schemas/types.yaml#/definitions/uint32
items:
minimum: 0
maximum: 5
maximum: 5
"#io-channel-cells":
const: 1
......@@ -174,7 +172,7 @@ patternProperties:
contains:
const: st,stm32-dfsdm-adc
- then:
then:
properties:
st,adc-channels:
minItems: 1
......@@ -206,7 +204,7 @@ patternProperties:
contains:
const: st,stm32-dfsdm-dmic
- then:
then:
properties:
st,adc-channels:
maxItems: 1
......@@ -254,7 +252,7 @@ allOf:
contains:
const: st,stm32h7-dfsdm
- then:
then:
patternProperties:
"^filter@[0-9]+$":
properties:
......@@ -269,7 +267,7 @@ allOf:
contains:
const: st,stm32mp1-dfsdm
- then:
then:
patternProperties:
"^filter@[0-9]+$":
properties:
......
Documentation/devicetree/bindings/iio/dac/adi,ad5360.yaml
View file @ a2c29ccd
......@@ -59,9 +59,9 @@ allOf:
contains:
enum:
- adi,ad5371
then:
required:
- vref2-supply
then:
required:
- vref2-supply
examples:
- |
......
Documentation/devicetree/bindings/interconnect/qcom,rpm.yaml
View file @ a2c29ccd
......@@ -93,48 +93,48 @@ allOf:
- qcom,sdm660-gnoc
- qcom,sdm660-snoc
then:
properties:
clock-names:
items:
- const: bus
- const: bus_a
clocks:
items:
- description: Bus Clock
- description: Bus A Clock
# Child node's properties
patternProperties:
'^interconnect-[a-z0-9]+$':
type: object
description:
snoc-mm is a child of snoc, sharing snoc's register address space.
properties:
compatible:
enum:
- qcom,msm8939-snoc-mm
'#interconnect-cells':
const: 1
clock-names:
items:
- const: bus
- const: bus_a
clocks:
items:
- description: Bus Clock
- description: Bus A Clock
required:
- compatible
- '#interconnect-cells'
- clock-names
- clocks
then:
properties:
clock-names:
items:
- const: bus
- const: bus_a
clocks:
items:
- description: Bus Clock
- description: Bus A Clock
# Child node's properties
patternProperties:
'^interconnect-[a-z0-9]+$':
type: object
description:
snoc-mm is a child of snoc, sharing snoc's register address space.
properties:
compatible:
enum:
- qcom,msm8939-snoc-mm
'#interconnect-cells':
const: 1
clock-names:
items:
- const: bus
- const: bus_a
clocks:
items:
- description: Bus Clock
- description: Bus A Clock
required:
- compatible
- '#interconnect-cells'
- clock-names
- clocks
- if:
properties:
......
Documentation/devicetree/bindings/interrupt-controller/mrvl,intc.yaml
View file @ a2c29ccd
......@@ -7,10 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Marvell MMP/Orion Interrupt controller bindings
maintainers:
- Thomas Gleixner <tglx@linutronix.de>
- Jason Cooper <jason@lakedaemon.net>
- Marc Zyngier <maz@kernel.org>
- Rob Herring <robh+dt@kernel.org>
- Andrew Lunn <andrew@lunn.ch>
- Gregory Clement <gregory.clement@bootlin.com>
allOf:
- if:
......
Documentation/devicetree/bindings/media/coda.yaml
View file @ a2c29ccd
......@@ -65,7 +65,6 @@ properties:
iram:
$ref: /schemas/types.yaml#/definitions/phandle
description: phandle pointing to the SRAM device node
maxItems: 1
required:
- compatible
......
Documentation/devicetree/bindings/media/mediatek,vcodec-decoder.yaml
View file @ a2c29ccd
......@@ -63,13 +63,11 @@ properties:
mediatek,vpu:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description:
Describes point to vpu.
mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description:
Describes point to scp.
......
Documentation/devicetree/bindings/media/mediatek,vcodec-encoder.yaml
View file @ a2c29ccd
......@@ -55,13 +55,11 @@ properties:
mediatek,vpu:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description:
Describes point to vpu.
mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description:
Describes point to scp.
......@@ -106,7 +104,6 @@ allOf:
enum:
- mediatek,mt8173-vcodec-enc
- mediatek,mt8192-vcodec-enc
- mediatek,mt8173-vcodec-enc
then:
properties:
......
Documentation/devicetree/bindings/media/mediatek,vcodec-subdev-decoder.yaml
View file @ a2c29ccd
......@@ -61,7 +61,6 @@ properties:
mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: |
The node of system control processor (SCP), using
the remoteproc & rpmsg framework.
......
Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml
View file @ a2c29ccd
......@@ -197,6 +197,8 @@ allOf:
- nvidia,tegra30-sdhci
- nvidia,tegra114-sdhci
- nvidia,tegra124-sdhci
then:
properties:
clocks:
items:
- description: module clock
......
Documentation/devicetree/bindings/net/snps,dwmac.yaml
View file @ a2c29ccd
......@@ -53,20 +53,18 @@ properties:
- allwinner,sun8i-r40-gmac
- allwinner,sun8i-v3s-emac
- allwinner,sun50i-a64-emac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- amlogic,meson6-dwmac
- amlogic,meson8b-dwmac
- amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- ingenic,jz4775-mac
- ingenic,x1000-mac
- ingenic,x1600-mac
- ingenic,x1830-mac
- ingenic,x2000-mac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- rockchip,px30-gmac
- rockchip,rk3128-gmac
- rockchip,rk3228-gmac
......
Documentation/devicetree/bindings/net/ti,davinci-mdio.yaml
View file @ a2c29ccd
......@@ -56,6 +56,7 @@ if:
compatible:
contains:
const: ti,davinci_mdio
then:
required:
- bus_freq
......
Documentation/devicetree/bindings/phy/nvidia,tegra20-usb-phy.yaml
View file @ a2c29ccd
......@@ -275,17 +275,17 @@ allOf:
- nvidia,hssquelch-level
- nvidia,hsdiscon-level
else:
properties:
clocks:
maxItems: 4
else:
properties:
clocks:
maxItems: 4
clock-names:
items:
- const: reg
- const: pll_u
- const: timer
- const: utmi-pads
clock-names:
items:
- const: reg
- const: pll_u
- const: timer
- const: utmi-pads
- if:
properties:
......
Documentation/devicetree/bindings/phy/qcom,usb-hs-phy.yaml
View file @ a2c29ccd
......@@ -14,24 +14,24 @@ if:
compatible:
contains:
const: qcom,usb-hs-phy-apq8064
then:
properties:
resets:
maxItems: 1
then:
properties:
resets:
maxItems: 1
reset-names:
const: por
reset-names:
const: por
else:
properties:
resets:
minItems: 2
maxItems: 2
else:
properties:
resets:
minItems: 2
maxItems: 2
reset-names:
items:
- const: phy
- const: por
reset-names:
items:
- const: phy
- const: por
properties:
compatible:
......@@ -92,6 +92,8 @@ additionalProperties: false
examples:
- |
otg: usb-controller {
#reset-cells = <1>;
ulpi {
phy {
compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy";
......
Documentation/devicetree/bindings/pinctrl/cirrus,madera.yaml
View file @ a2c29ccd
......@@ -48,13 +48,12 @@ properties:
Name of one pin group to configure.
enum: [ aif1, aif2, aif3, aif4, mif1, mif2, mif3, pdmspk1,
pdmspk2, dmic4, dmic5, dmic6, gpio1, gpio2, gpio3,
gpio4, gpio5, gpio6, gpio7, gpio7, gpio8, gpio9,
gpio4, gpio5, gpio6, gpio7, gpio8, gpio9,
gpio10, gpio11, gpio12, gpio13, gpio14, gpio15,
gpio16, gpio17, gpio17, gpio18, gpio19, gpio20,
gpio21, gpio22, gpio23, gpio24, gpio25, gpio26,
gpio27, gpio27, gpio28, gpio29, gpio30, gpio31,
gpio32, gpio33, gpio34, gpio35, gpio36, gpio37,
gpio37, gpio38, gpio39 ]
gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
gpio22, gpio23, gpio24, gpio25, gpio26, gpio27,
gpio28, gpio29, gpio30, gpio31, gpio32, gpio33,
gpio34, gpio35, gpio36, gpio37, gpio38, gpio39 ]
function:
description:
......
Documentation/devicetree/bindings/power/renesas,apmu.yaml
View file @ a2c29ccd
......@@ -36,7 +36,8 @@ properties:
cpus:
$ref: /schemas/types.yaml#/definitions/phandle-array
items:
maxItems: 1
minItems: 1
maxItems: 4
description: |
Array of phandles pointing to CPU cores, which should match the order of
CPU cores used by the WUPCR and PSTR registers in the Advanced Power
......
Documentation/devicetree/bindings/power/supply/bq2415x.yaml
View file @ a2c29ccd
......@@ -16,7 +16,6 @@ allOf:
properties:
compatible:
enum:
- ti,bq24150
- ti,bq24150
- ti,bq24150a
- ti,bq24151
......
Documentation/devicetree/bindings/regulator/fixed-regulator.yaml
View file @ a2c29ccd
......@@ -18,23 +18,23 @@ description:
allOf:
- $ref: "regulator.yaml#"
if:
properties:
compatible:
contains:
const: regulator-fixed-clock
required:
- clocks
else:
if:
properties:
compatible:
contains:
const: regulator-fixed-domain
required:
- power-domains
- required-opps
- if:
properties:
compatible:
contains:
const: regulator-fixed-clock
then:
required:
- clocks
- if:
properties:
compatible:
contains:
const: regulator-fixed-domain
then:
required:
- power-domains
- required-opps
properties:
compatible:
......
Documentation/devicetree/bindings/remoteproc/qcom,sc7280-wpss-pil.yaml
View file @ a2c29ccd
......@@ -104,8 +104,7 @@ properties:
qcom,smem-state-names:
$ref: /schemas/types.yaml#/definitions/string
description: The names of the state bits used for SMP2P output
items:
- const: stop
const: stop
glink-edge:
type: object
......@@ -130,7 +129,6 @@ properties:
qcom,remote-pid:
$ref: /schemas/types.yaml#/definitions/uint32
description: ID of the shared memory used by GLINK for communication with WPSS
maxItems: 1
required:
- interrupts
......
Documentation/devicetree/bindings/sound/st,stm32-sai.yaml
View file @ a2c29ccd
......@@ -136,8 +136,7 @@ allOf:
compatible:
contains:
const: st,stm32f4-sai
- then:
then:
properties:
clocks:
items:
......@@ -148,8 +147,7 @@ allOf:
items:
- const: x8k
- const: x11k
- else:
else:
properties:
clocks:
items:
......
Documentation/devicetree/bindings/spi/renesas,sh-msiof.yaml
View file @ a2c29ccd
......@@ -124,7 +124,6 @@ properties:
description: |
Override the default TX fifo size. Unit is words. Ignored if 0.
$ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
default: 64
renesas,rx-fifo-size:
......@@ -132,7 +131,6 @@ properties:
description: |
Override the default RX fifo size. Unit is words. Ignored if 0.
$ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
default: 64
required:
......
Documentation/devicetree/bindings/sram/sram.yaml
View file @ a2c29ccd
......@@ -136,14 +136,14 @@ required:
- reg
if:
properties:
compatible:
contains:
enum:
- qcom,rpm-msg-ram
- rockchip,rk3288-pmu-sram
else:
not:
properties:
compatible:
contains:
enum:
- qcom,rpm-msg-ram
- rockchip,rk3288-pmu-sram
then:
required:
- "#address-cells"
- "#size-cells"
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7