mirror of
https://github.com/torvalds/linux.git
synced 2024-11-14 08:02:07 +00:00
Merge branch 'dt/linus' into dt/next
Pick up new meta-schema warning fixes.
This commit is contained in:
Rob Herring
commit
2bd50abce1
@ -13,7 +13,6 @@ maintainers:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- nvidia,tegra20-pmc
|
||||
- nvidia,tegra20-pmc
|
||||
- nvidia,tegra30-pmc
|
||||
- nvidia,tegra114-pmc
|
||||
|
||||
@ -34,7 +34,6 @@ properties:
|
||||
oneOf:
|
||||
- items:
|
||||
- enum:
|
||||
- ti,sysc-omap2
|
||||
- ti,sysc-omap2
|
||||
- ti,sysc-omap4
|
||||
- ti,sysc-omap4-simple
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -98,6 +98,7 @@ allOf:
|
||||
- ti,adc121s
|
||||
- ti,ads7866
|
||||
- ti,ads7868
|
||||
then:
|
||||
required:
|
||||
- vcc-supply
|
||||
# Devices with a vref
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -59,9 +59,9 @@ allOf:
|
||||
contains:
|
||||
enum:
|
||||
- adi,ad5371
|
||||
then:
|
||||
required:
|
||||
- vref2-supply
|
||||
then:
|
||||
required:
|
||||
- vref2-supply
|
||||
|
||||
examples:
|
||||
- |
|
||||
|
||||
@ -93,48 +93,48 @@ allOf:
|
||||
- qcom,sdm660-gnoc
|
||||
- qcom,sdm660-snoc
|
||||
|
||||
then:
|
||||
properties:
|
||||
clock-names:
|
||||
items:
|
||||
- const: bus
|
||||
- const: bus_a
|
||||
then:
|
||||
properties:
|
||||
clock-names:
|
||||
items:
|
||||
- const: bus
|
||||
- const: bus_a
|
||||
|
||||
clocks:
|
||||
items:
|
||||
- description: Bus Clock
|
||||
- description: Bus A Clock
|
||||
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.
|
||||
# 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
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- qcom,msm8939-snoc-mm
|
||||
|
||||
'#interconnect-cells':
|
||||
const: 1
|
||||
'#interconnect-cells':
|
||||
const: 1
|
||||
|
||||
clock-names:
|
||||
items:
|
||||
- const: bus
|
||||
- const: bus_a
|
||||
clock-names:
|
||||
items:
|
||||
- const: bus
|
||||
- const: bus_a
|
||||
|
||||
clocks:
|
||||
items:
|
||||
- description: Bus Clock
|
||||
- description: Bus A Clock
|
||||
clocks:
|
||||
items:
|
||||
- description: Bus Clock
|
||||
- description: Bus A Clock
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- '#interconnect-cells'
|
||||
- clock-names
|
||||
- clocks
|
||||
required:
|
||||
- compatible
|
||||
- '#interconnect-cells'
|
||||
- clock-names
|
||||
- clocks
|
||||
|
||||
- if:
|
||||
properties:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -65,7 +65,6 @@ properties:
|
||||
iram:
|
||||
$ref: /schemas/types.yaml#/definitions/phandle
|
||||
description: phandle pointing to the SRAM device node
|
||||
maxItems: 1
|
||||
|
||||
required:
|
||||
- compatible
|
||||
|
||||
@ -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.
|
||||
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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.
|
||||
|
||||
@ -197,6 +197,8 @@ allOf:
|
||||
- nvidia,tegra30-sdhci
|
||||
- nvidia,tegra114-sdhci
|
||||
- nvidia,tegra124-sdhci
|
||||
then:
|
||||
properties:
|
||||
clocks:
|
||||
items:
|
||||
- description: module clock
|
||||
|
||||
@ -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
|
||||
|
||||
@ -56,6 +56,7 @@ if:
|
||||
compatible:
|
||||
contains:
|
||||
const: ti,davinci_mdio
|
||||
then:
|
||||
required:
|
||||
- bus_freq
|
||||
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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";
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -16,7 +16,6 @@ allOf:
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- ti,bq24150
|
||||
- ti,bq24150
|
||||
- ti,bq24150a
|
||||
- ti,bq24151
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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:
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user