Commit a2c29ccd authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -13,7 +13,6 @@ maintainers: ...@@ -13,7 +13,6 @@ maintainers:
properties: properties:
compatible: compatible:
enum: enum:
- nvidia,tegra20-pmc
- nvidia,tegra20-pmc - nvidia,tegra20-pmc
- nvidia,tegra30-pmc - nvidia,tegra30-pmc
- nvidia,tegra114-pmc - nvidia,tegra114-pmc
......
...@@ -34,7 +34,6 @@ properties: ...@@ -34,7 +34,6 @@ properties:
oneOf: oneOf:
- items: - items:
- enum: - enum:
- ti,sysc-omap2
- ti,sysc-omap2 - ti,sysc-omap2
- ti,sysc-omap4 - ti,sysc-omap4
- ti,sysc-omap4-simple - ti,sysc-omap4-simple
......
...@@ -71,78 +71,72 @@ properties: ...@@ -71,78 +71,72 @@ properties:
hfront-porch: hfront-porch:
description: Horizontal front porch panel timing description: Horizontal front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of pixels description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of pixels description: min, typ, max number of pixels
hback-porch: hback-porch:
description: Horizontal back porch timing description: Horizontal back porch timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of pixels description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of pixels description: min, typ, max number of pixels
hsync-len: hsync-len:
description: Horizontal sync length panel timing description: Horizontal sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of pixels description: typical number of pixels
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of pixels description: min, typ, max number of pixels
vfront-porch: vfront-porch:
description: Vertical front porch panel timing description: Vertical front porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of lines description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of lines description: min, typ, max number of lines
vback-porch: vback-porch:
description: Vertical back porch panel timing description: Vertical back porch panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of lines description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of lines description: min, typ, max number of lines
vsync-len: vsync-len:
description: Vertical sync length panel timing description: Vertical sync length panel timing
$ref: /schemas/types.yaml#/definitions/uint32-array
oneOf: oneOf:
- $ref: /schemas/types.yaml#/definitions/uint32 - maxItems: 1
maxItems: 1
items: items:
description: typical number of lines description: typical number of lines
- $ref: /schemas/types.yaml#/definitions/uint32-array - minItems: 3
minItems: 3
maxItems: 3 maxItems: 3
items: items:
description: min, typ, max number of lines description: min, typ, max number of lines
......
...@@ -25,7 +25,7 @@ properties: ...@@ -25,7 +25,7 @@ properties:
$ref: /schemas/connector/usb-connector.yaml# $ref: /schemas/connector/usb-connector.yaml#
ports: ports:
$ref: /schemas/graph.yaml#/properties/port $ref: /schemas/graph.yaml#/properties/ports
description: description:
Any connector to the data bus of this controller should be modelled using Any connector to the data bus of this controller should be modelled using
the OF graph bindings specified the OF graph bindings specified
......
...@@ -20,6 +20,7 @@ properties: ...@@ -20,6 +20,7 @@ properties:
- mediatek,mt8183-mali - mediatek,mt8183-mali
- realtek,rtd1619-mali - realtek,rtd1619-mali
- renesas,r9a07g044-mali - renesas,r9a07g044-mali
- renesas,r9a07g054-mali
- rockchip,px30-mali - rockchip,px30-mali
- rockchip,rk3568-mali - rockchip,rk3568-mali
- const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable - const: arm,mali-bifrost # Mali Bifrost GPU model/revision is fully discoverable
...@@ -109,7 +110,9 @@ allOf: ...@@ -109,7 +110,9 @@ allOf:
properties: properties:
compatible: compatible:
contains: contains:
const: renesas,r9a07g044-mali enum:
- renesas,r9a07g044-mali
- renesas,r9a07g054-mali
then: then:
properties: properties:
interrupts: interrupts:
......
...@@ -58,7 +58,6 @@ patternProperties: ...@@ -58,7 +58,6 @@ patternProperties:
The value (two's complement) to be programmed in the channel specific N correction register. The value (two's complement) to be programmed in the channel specific N correction register.
For remote channels only. For remote channels only.
$ref: /schemas/types.yaml#/definitions/int32 $ref: /schemas/types.yaml#/definitions/int32
items:
minimum: -128 minimum: -128
maximum: 127 maximum: 127
......
...@@ -98,6 +98,7 @@ allOf: ...@@ -98,6 +98,7 @@ allOf:
- ti,adc121s - ti,adc121s
- ti,ads7866 - ti,ads7866
- ti,ads7868 - ti,ads7868
then:
required: required:
- vcc-supply - vcc-supply
# Devices with a vref # Devices with a vref
......
...@@ -108,8 +108,6 @@ patternProperties: ...@@ -108,8 +108,6 @@ patternProperties:
- [1-5]: order 1 to 5. - [1-5]: order 1 to 5.
For audio purpose it is recommended to use order 3 to 5. For audio purpose it is recommended to use order 3 to 5.
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
items:
minimum: 0
maximum: 5 maximum: 5
"#io-channel-cells": "#io-channel-cells":
...@@ -174,7 +172,7 @@ patternProperties: ...@@ -174,7 +172,7 @@ patternProperties:
contains: contains:
const: st,stm32-dfsdm-adc const: st,stm32-dfsdm-adc
- then: then:
properties: properties:
st,adc-channels: st,adc-channels:
minItems: 1 minItems: 1
...@@ -206,7 +204,7 @@ patternProperties: ...@@ -206,7 +204,7 @@ patternProperties:
contains: contains:
const: st,stm32-dfsdm-dmic const: st,stm32-dfsdm-dmic
- then: then:
properties: properties:
st,adc-channels: st,adc-channels:
maxItems: 1 maxItems: 1
...@@ -254,7 +252,7 @@ allOf: ...@@ -254,7 +252,7 @@ allOf:
contains: contains:
const: st,stm32h7-dfsdm const: st,stm32h7-dfsdm
- then: then:
patternProperties: patternProperties:
"^filter@[0-9]+$": "^filter@[0-9]+$":
properties: properties:
...@@ -269,7 +267,7 @@ allOf: ...@@ -269,7 +267,7 @@ allOf:
contains: contains:
const: st,stm32mp1-dfsdm const: st,stm32mp1-dfsdm
- then: then:
patternProperties: patternProperties:
"^filter@[0-9]+$": "^filter@[0-9]+$":
properties: properties:
......
...@@ -7,10 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,10 +7,8 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Marvell MMP/Orion Interrupt controller bindings title: Marvell MMP/Orion Interrupt controller bindings
maintainers: maintainers:
- Thomas Gleixner <tglx@linutronix.de> - Andrew Lunn <andrew@lunn.ch>
- Jason Cooper <jason@lakedaemon.net> - Gregory Clement <gregory.clement@bootlin.com>
- Marc Zyngier <maz@kernel.org>
- Rob Herring <robh+dt@kernel.org>
allOf: allOf:
- if: - if:
......
...@@ -65,7 +65,6 @@ properties: ...@@ -65,7 +65,6 @@ properties:
iram: iram:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
description: phandle pointing to the SRAM device node description: phandle pointing to the SRAM device node
maxItems: 1
required: required:
- compatible - compatible
......
...@@ -63,13 +63,11 @@ properties: ...@@ -63,13 +63,11 @@ properties:
mediatek,vpu: mediatek,vpu:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: description:
Describes point to vpu. Describes point to vpu.
mediatek,scp: mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: description:
Describes point to scp. Describes point to scp.
......
...@@ -55,13 +55,11 @@ properties: ...@@ -55,13 +55,11 @@ properties:
mediatek,vpu: mediatek,vpu:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: description:
Describes point to vpu. Describes point to vpu.
mediatek,scp: mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: description:
Describes point to scp. Describes point to scp.
...@@ -106,7 +104,6 @@ allOf: ...@@ -106,7 +104,6 @@ allOf:
enum: enum:
- mediatek,mt8173-vcodec-enc - mediatek,mt8173-vcodec-enc
- mediatek,mt8192-vcodec-enc - mediatek,mt8192-vcodec-enc
- mediatek,mt8173-vcodec-enc
then: then:
properties: properties:
......
...@@ -61,7 +61,6 @@ properties: ...@@ -61,7 +61,6 @@ properties:
mediatek,scp: mediatek,scp:
$ref: /schemas/types.yaml#/definitions/phandle $ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1
description: | description: |
The node of system control processor (SCP), using The node of system control processor (SCP), using
the remoteproc & rpmsg framework. the remoteproc & rpmsg framework.
......
...@@ -197,6 +197,8 @@ allOf: ...@@ -197,6 +197,8 @@ allOf:
- nvidia,tegra30-sdhci - nvidia,tegra30-sdhci
- nvidia,tegra114-sdhci - nvidia,tegra114-sdhci
- nvidia,tegra124-sdhci - nvidia,tegra124-sdhci
then:
properties:
clocks: clocks:
items: items:
- description: module clock - description: module clock
......
...@@ -53,20 +53,18 @@ properties: ...@@ -53,20 +53,18 @@ properties:
- allwinner,sun8i-r40-gmac - allwinner,sun8i-r40-gmac
- allwinner,sun8i-v3s-emac - allwinner,sun8i-v3s-emac
- allwinner,sun50i-a64-emac - allwinner,sun50i-a64-emac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- amlogic,meson6-dwmac - amlogic,meson6-dwmac
- amlogic,meson8b-dwmac - amlogic,meson8b-dwmac
- amlogic,meson8m2-dwmac - amlogic,meson8m2-dwmac
- amlogic,meson-gxbb-dwmac - amlogic,meson-gxbb-dwmac
- amlogic,meson-axg-dwmac - amlogic,meson-axg-dwmac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- ingenic,jz4775-mac - ingenic,jz4775-mac
- ingenic,x1000-mac - ingenic,x1000-mac
- ingenic,x1600-mac - ingenic,x1600-mac
- ingenic,x1830-mac - ingenic,x1830-mac
- ingenic,x2000-mac - ingenic,x2000-mac
- loongson,ls2k-dwmac
- loongson,ls7a-dwmac
- rockchip,px30-gmac - rockchip,px30-gmac
- rockchip,rk3128-gmac - rockchip,rk3128-gmac
- rockchip,rk3228-gmac - rockchip,rk3228-gmac
......
...@@ -56,6 +56,7 @@ if: ...@@ -56,6 +56,7 @@ if:
compatible: compatible:
contains: contains:
const: ti,davinci_mdio const: ti,davinci_mdio
then:
required: required:
- bus_freq - bus_freq
......
...@@ -14,7 +14,7 @@ if: ...@@ -14,7 +14,7 @@ if:
compatible: compatible:
contains: contains:
const: qcom,usb-hs-phy-apq8064 const: qcom,usb-hs-phy-apq8064
then: then:
properties: properties:
resets: resets:
maxItems: 1 maxItems: 1
...@@ -22,7 +22,7 @@ if: ...@@ -22,7 +22,7 @@ if:
reset-names: reset-names:
const: por const: por
else: else:
properties: properties:
resets: resets:
minItems: 2 minItems: 2
...@@ -92,6 +92,8 @@ additionalProperties: false ...@@ -92,6 +92,8 @@ additionalProperties: false
examples: examples:
- | - |
otg: usb-controller { otg: usb-controller {
#reset-cells = <1>;
ulpi { ulpi {
phy { phy {
compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy"; compatible = "qcom,usb-hs-phy-msm8974", "qcom,usb-hs-phy";
......
...@@ -48,13 +48,12 @@ properties: ...@@ -48,13 +48,12 @@ properties:
Name of one pin group to configure. Name of one pin group to configure.
enum: [ aif1, aif2, aif3, aif4, mif1, mif2, mif3, pdmspk1, enum: [ aif1, aif2, aif3, aif4, mif1, mif2, mif3, pdmspk1,
pdmspk2, dmic4, dmic5, dmic6, gpio1, gpio2, gpio3, 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, gpio10, gpio11, gpio12, gpio13, gpio14, gpio15,
gpio16, gpio17, gpio17, gpio18, gpio19, gpio20, gpio16, gpio17, gpio18, gpio19, gpio20, gpio21,
gpio21, gpio22, gpio23, gpio24, gpio25, gpio26, gpio22, gpio23, gpio24, gpio25, gpio26, gpio27,
gpio27, gpio27, gpio28, gpio29, gpio30, gpio31, gpio28, gpio29, gpio30, gpio31, gpio32, gpio33,
gpio32, gpio33, gpio34, gpio35, gpio36, gpio37, gpio34, gpio35, gpio36, gpio37, gpio38, gpio39 ]
gpio37, gpio38, gpio39 ]
function: function:
description: description:
......
...@@ -36,7 +36,8 @@ properties: ...@@ -36,7 +36,8 @@ properties:
cpus: cpus:
$ref: /schemas/types.yaml#/definitions/phandle-array $ref: /schemas/types.yaml#/definitions/phandle-array
items: items:
maxItems: 1 minItems: 1
maxItems: 4
description: | description: |
Array of phandles pointing to CPU cores, which should match the order of 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 CPU cores used by the WUPCR and PSTR registers in the Advanced Power
......
...@@ -16,7 +16,6 @@ allOf: ...@@ -16,7 +16,6 @@ allOf:
properties: properties:
compatible: compatible:
enum: enum:
- ti,bq24150
- ti,bq24150 - ti,bq24150
- ti,bq24150a - ti,bq24150a
- ti,bq24151 - ti,bq24151
......
...@@ -18,20 +18,20 @@ description: ...@@ -18,20 +18,20 @@ description:
allOf: allOf:
- $ref: "regulator.yaml#" - $ref: "regulator.yaml#"
- if:
if:
properties: properties:
compatible: compatible:
contains: contains:
const: regulator-fixed-clock const: regulator-fixed-clock
then:
required: required:
- clocks - clocks
else: - if:
if:
properties: properties:
compatible: compatible:
contains: contains:
const: regulator-fixed-domain const: regulator-fixed-domain
then:
required: required:
- power-domains - power-domains
- required-opps - required-opps
......
...@@ -104,8 +104,7 @@ properties: ...@@ -104,8 +104,7 @@ properties:
qcom,smem-state-names: qcom,smem-state-names:
$ref: /schemas/types.yaml#/definitions/string $ref: /schemas/types.yaml#/definitions/string
description: The names of the state bits used for SMP2P output description: The names of the state bits used for SMP2P output
items: const: stop
- const: stop
glink-edge: glink-edge:
type: object type: object
...@@ -130,7 +129,6 @@ properties: ...@@ -130,7 +129,6 @@ properties:
qcom,remote-pid: qcom,remote-pid:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
description: ID of the shared memory used by GLINK for communication with WPSS description: ID of the shared memory used by GLINK for communication with WPSS
maxItems: 1
required: required:
- interrupts - interrupts
......
...@@ -136,8 +136,7 @@ allOf: ...@@ -136,8 +136,7 @@ allOf:
compatible: compatible:
contains: contains:
const: st,stm32f4-sai const: st,stm32f4-sai
then:
- then:
properties: properties:
clocks: clocks:
items: items:
...@@ -148,8 +147,7 @@ allOf: ...@@ -148,8 +147,7 @@ allOf:
items: items:
- const: x8k - const: x8k
- const: x11k - const: x11k
else:
- else:
properties: properties:
clocks: clocks:
items: items:
......
...@@ -124,7 +124,6 @@ properties: ...@@ -124,7 +124,6 @@ properties:
description: | description: |
Override the default TX fifo size. Unit is words. Ignored if 0. Override the default TX fifo size. Unit is words. Ignored if 0.
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
default: 64 default: 64
renesas,rx-fifo-size: renesas,rx-fifo-size:
...@@ -132,7 +131,6 @@ properties: ...@@ -132,7 +131,6 @@ properties:
description: | description: |
Override the default RX fifo size. Unit is words. Ignored if 0. Override the default RX fifo size. Unit is words. Ignored if 0.
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
maxItems: 1
default: 64 default: 64
required: required:
......
...@@ -136,14 +136,14 @@ required: ...@@ -136,14 +136,14 @@ required:
- reg - reg
if: if:
not:
properties: properties:
compatible: compatible:
contains: contains:
enum: enum:
- qcom,rpm-msg-ram - qcom,rpm-msg-ram
- rockchip,rk3288-pmu-sram - rockchip,rk3288-pmu-sram
then:
else:
required: required:
- "#address-cells" - "#address-cells"
- "#size-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