Skip to content

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

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

Pull devicetree fixes from Rob Herring:

 - Drop unused 'max-link-speed' in Apple PCIe

 - More redundant 'maxItems/minItems' schema fixes

 - Support values for pinctrl 'drive-push-pull' and 'drive-open-drain'

 - Fix redundant 'unevaluatedProperties' in MT6360 LEDs binding

 - Add missing 'power-domains' property to Cadence UFSHC

* tag 'devicetree-fixes-for-5.18-3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: pci: apple,pcie: Drop max-link-speed from example
  dt-bindings: Drop redundant 'maxItems/minItems' in if/then schemas
  dt-bindings: pinctrl: Allow values for drive-push-pull and drive-open-drain
  dt-bindings: leds-mt6360: Drop redundant 'unevaluatedProperties'
  dt-bindings: ufs: cdns,ufshc: Add power-domains
parents 0f5d752b 5dc46304
Show whitespace changes
Inline Side-by-side
Showing with 18 additions and 75 deletions
Documentation/devicetree/bindings/clock/imx8m-clock.yaml
View file @ f47c960e
...@@ -55,8 +55,6 @@ allOf: ...@@ -55,8 +55,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 7
maxItems: 7
items: items:
- description: 32k osc - description: 32k osc
- description: 25m osc - description: 25m osc
...@@ -66,8 +64,6 @@ allOf: ...@@ -66,8 +64,6 @@ allOf:
- description: ext3 clock input - description: ext3 clock input
- description: ext4 clock input - description: ext4 clock input
clock-names: clock-names:
minItems: 7
maxItems: 7
items: items:
- const: ckil - const: ckil
- const: osc_25m - const: osc_25m
......
Documentation/devicetree/bindings/display/bridge/renesas,lvds.yaml
View file @ f47c960e
...@@ -95,7 +95,6 @@ then: ...@@ -95,7 +95,6 @@ then:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 4
items: items:
- description: Functional clock - description: Functional clock
- description: EXTAL input clock - description: EXTAL input clock
...@@ -104,7 +103,6 @@ then: ...@@ -104,7 +103,6 @@ then:
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 4
items: items:
- const: fck - const: fck
# The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks. # The LVDS encoder can use the EXTAL or DU_DOTCLKINx clocks.
...@@ -128,12 +126,10 @@ then: ...@@ -128,12 +126,10 @@ then:
else: else:
properties: properties:
clocks: clocks:
maxItems: 1
items: items:
- description: Functional clock - description: Functional clock
clock-names: clock-names:
maxItems: 1
items: items:
- const: fck - const: fck
......
Documentation/devicetree/bindings/display/renesas,du.yaml
View file @ f47c960e
...@@ -109,7 +109,6 @@ allOf: ...@@ -109,7 +109,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- description: Functional clock - description: Functional clock
- description: DU_DOTCLKIN0 input clock - description: DU_DOTCLKIN0 input clock
...@@ -117,7 +116,6 @@ allOf: ...@@ -117,7 +116,6 @@ allOf:
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 3
items: items:
- const: du.0 - const: du.0
- pattern: '^dclkin\.[01]$' - pattern: '^dclkin\.[01]$'
...@@ -159,7 +157,6 @@ allOf: ...@@ -159,7 +157,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -168,7 +165,6 @@ allOf: ...@@ -168,7 +165,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -216,7 +212,6 @@ allOf: ...@@ -216,7 +212,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -225,7 +220,6 @@ allOf: ...@@ -225,7 +220,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -271,7 +265,6 @@ allOf: ...@@ -271,7 +265,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -280,7 +273,6 @@ allOf: ...@@ -280,7 +273,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -327,7 +319,6 @@ allOf: ...@@ -327,7 +319,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -336,7 +327,6 @@ allOf: ...@@ -336,7 +327,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -386,7 +376,6 @@ allOf: ...@@ -386,7 +376,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -397,7 +386,6 @@ allOf: ...@@ -397,7 +386,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -448,7 +436,6 @@ allOf: ...@@ -448,7 +436,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 4 minItems: 4
maxItems: 8
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -461,7 +448,6 @@ allOf: ...@@ -461,7 +448,6 @@ allOf:
clock-names: clock-names:
minItems: 4 minItems: 4
maxItems: 8
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -525,7 +511,6 @@ allOf: ...@@ -525,7 +511,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -536,7 +521,6 @@ allOf: ...@@ -536,7 +521,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -596,7 +580,6 @@ allOf: ...@@ -596,7 +580,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -607,7 +590,6 @@ allOf: ...@@ -607,7 +590,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 6
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -666,14 +648,12 @@ allOf: ...@@ -666,14 +648,12 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: DU_DOTCLKIN0 input clock - description: DU_DOTCLKIN0 input clock
clock-names: clock-names:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- const: du.0 - const: du.0
- const: dclkin.0 - const: dclkin.0
...@@ -723,7 +703,6 @@ allOf: ...@@ -723,7 +703,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- description: Functional clock for DU0 - description: Functional clock for DU0
- description: Functional clock for DU1 - description: Functional clock for DU1
...@@ -732,7 +711,6 @@ allOf: ...@@ -732,7 +711,6 @@ allOf:
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 4
items: items:
- const: du.0 - const: du.0
- const: du.1 - const: du.1
...@@ -791,7 +769,6 @@ allOf: ...@@ -791,7 +769,6 @@ allOf:
- description: Functional clock - description: Functional clock
clock-names: clock-names:
maxItems: 1
items: items:
- const: du.0 - const: du.0
......
Documentation/devicetree/bindings/iio/adc/st,stm32-adc.yaml
View file @ f47c960e
...@@ -138,7 +138,6 @@ allOf: ...@@ -138,7 +138,6 @@ allOf:
- const: bus - const: bus
- const: adc - const: adc
minItems: 1 minItems: 1
maxItems: 2
interrupts: interrupts:
items: items:
...@@ -170,7 +169,6 @@ allOf: ...@@ -170,7 +169,6 @@ allOf:
- const: bus - const: bus
- const: adc - const: adc
minItems: 1 minItems: 1
maxItems: 2
interrupts: interrupts:
items: items:
......
Documentation/devicetree/bindings/leds/leds-mt6360.yaml
View file @ f47c960e
...@@ -43,8 +43,6 @@ patternProperties: ...@@ -43,8 +43,6 @@ patternProperties:
- 4 # LED output FLASH1 - 4 # LED output FLASH1
- 5 # LED output FLASH2 - 5 # LED output FLASH2
unevaluatedProperties: false
required: required:
- compatible - compatible
- "#address-cells" - "#address-cells"
......
Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml
View file @ f47c960e
...@@ -202,22 +202,17 @@ allOf: ...@@ -202,22 +202,17 @@ allOf:
clocks: clocks:
items: items:
- description: module clock - description: module clock
minItems: 1
maxItems: 1
else: else:
properties: properties:
clocks: clocks:
items: items:
- description: module clock - description: module clock
- description: timeout clock - description: timeout clock
minItems: 2
maxItems: 2
clock-names: clock-names:
items: items:
- const: sdhci - const: sdhci
- const: tmclk - const: tmclk
minItems: 2
maxItems: 2
required: required:
- clock-names - clock-names
......
Documentation/devicetree/bindings/mtd/gpmi-nand.yaml
View file @ f47c960e
...@@ -147,8 +147,6 @@ allOf: ...@@ -147,8 +147,6 @@ allOf:
- description: SoC gpmi io clock - description: SoC gpmi io clock
- description: SoC gpmi bch apb clock - description: SoC gpmi bch apb clock
clock-names: clock-names:
minItems: 2
maxItems: 2
items: items:
- const: gpmi_io - const: gpmi_io
- const: gpmi_bch_apb - const: gpmi_bch_apb
......
Documentation/devicetree/bindings/net/can/bosch,c_can.yaml
View file @ f47c960e
...@@ -80,8 +80,6 @@ if: ...@@ -80,8 +80,6 @@ if:
then: then:
properties: properties:
interrupts: interrupts:
minItems: 4
maxItems: 4
items: items:
- description: Error and status IRQ - description: Error and status IRQ
- description: Message object IRQ - description: Message object IRQ
...@@ -91,7 +89,6 @@ then: ...@@ -91,7 +89,6 @@ then:
else: else:
properties: properties:
interrupts: interrupts:
maxItems: 1
items: items:
- description: Error and status IRQ - description: Error and status IRQ
......
Documentation/devicetree/bindings/pci/apple,pcie.yaml
View file @ f47c960e
...@@ -142,7 +142,6 @@ examples: ...@@ -142,7 +142,6 @@ examples:
device_type = "pci"; device_type = "pci";
reg = <0x0 0x0 0x0 0x0 0x0>; reg = <0x0 0x0 0x0 0x0 0x0>;
reset-gpios = <&pinctrl_ap 152 0>; reset-gpios = <&pinctrl_ap 152 0>;
max-link-speed = <2>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
...@@ -153,7 +152,6 @@ examples: ...@@ -153,7 +152,6 @@ examples:
device_type = "pci"; device_type = "pci";
reg = <0x800 0x0 0x0 0x0 0x0>; reg = <0x800 0x0 0x0 0x0 0x0>;
reset-gpios = <&pinctrl_ap 153 0>; reset-gpios = <&pinctrl_ap 153 0>;
max-link-speed = <2>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
...@@ -164,7 +162,6 @@ examples: ...@@ -164,7 +162,6 @@ examples:
device_type = "pci"; device_type = "pci";
reg = <0x1000 0x0 0x0 0x0 0x0>; reg = <0x1000 0x0 0x0 0x0 0x0>;
reset-gpios = <&pinctrl_ap 33 0>; reset-gpios = <&pinctrl_ap 33 0>;
max-link-speed = <1>;
#address-cells = <3>; #address-cells = <3>;
#size-cells = <2>; #size-cells = <2>;
......
Documentation/devicetree/bindings/phy/brcm,sata-phy.yaml
View file @ f47c960e
...@@ -102,19 +102,17 @@ if: ...@@ -102,19 +102,17 @@ if:
then: then:
properties: properties:
reg: reg:
maxItems: 2 minItems: 2
reg-names: reg-names:
items: minItems: 2
- const: "phy"
- const: "phy-ctrl"
else: else:
properties: properties:
reg: reg:
maxItems: 1 maxItems: 1
reg-names: reg-names:
maxItems: 1 maxItems: 1
items:
- const: "phy"
required: required:
- compatible - compatible
......
Documentation/devicetree/bindings/pinctrl/pincfg-node.yaml
View file @ f47c960e
...@@ -52,11 +52,19 @@ properties: ...@@ -52,11 +52,19 @@ properties:
hardware supporting it the pull strength in Ohm. hardware supporting it the pull strength in Ohm.
drive-push-pull: drive-push-pull:
type: boolean oneOf:
- type: boolean
- $ref: /schemas/types.yaml#/definitions/uint32
enum: [ 0, 1 ]
deprecated: true
description: drive actively high and low description: drive actively high and low
drive-open-drain: drive-open-drain:
type: boolean oneOf:
- type: boolean
- $ref: /schemas/types.yaml#/definitions/uint32
const: 1 # No known cases of 0
deprecated: true
description: drive with open drain description: drive with open drain
drive-open-source: drive-open-source:
......
Documentation/devicetree/bindings/rtc/allwinner,sun6i-a31-rtc.yaml
View file @ f47c960e
...@@ -71,7 +71,6 @@ allOf: ...@@ -71,7 +71,6 @@ allOf:
then: then:
properties: properties:
clock-output-names: clock-output-names:
minItems: 1
maxItems: 1 maxItems: 1
- if: - if:
...@@ -102,7 +101,6 @@ allOf: ...@@ -102,7 +101,6 @@ allOf:
properties: properties:
clock-output-names: clock-output-names:
minItems: 3 minItems: 3
maxItems: 3
- if: - if:
properties: properties:
...@@ -113,16 +111,12 @@ allOf: ...@@ -113,16 +111,12 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 3
maxItems: 3
items: items:
- description: Bus clock for register access - description: Bus clock for register access
- description: 24 MHz oscillator - description: 24 MHz oscillator
- description: 32 kHz clock from the CCU - description: 32 kHz clock from the CCU
clock-names: clock-names:
minItems: 3
maxItems: 3
items: items:
- const: bus - const: bus
- const: hosc - const: hosc
...@@ -142,7 +136,6 @@ allOf: ...@@ -142,7 +136,6 @@ allOf:
properties: properties:
clocks: clocks:
minItems: 3 minItems: 3
maxItems: 4
items: items:
- description: Bus clock for register access - description: Bus clock for register access
- description: 24 MHz oscillator - description: 24 MHz oscillator
...@@ -151,7 +144,6 @@ allOf: ...@@ -151,7 +144,6 @@ allOf:
clock-names: clock-names:
minItems: 3 minItems: 3
maxItems: 4
items: items:
- const: bus - const: bus
- const: hosc - const: hosc
...@@ -174,14 +166,12 @@ allOf: ...@@ -174,14 +166,12 @@ allOf:
then: then:
properties: properties:
interrupts: interrupts:
minItems: 1
maxItems: 1 maxItems: 1
else: else:
properties: properties:
interrupts: interrupts:
minItems: 2 minItems: 2
maxItems: 2
required: required:
- "#clock-cells" - "#clock-cells"
......
Documentation/devicetree/bindings/serial/samsung_uart.yaml
View file @ f47c960e
...@@ -100,7 +100,6 @@ allOf: ...@@ -100,7 +100,6 @@ allOf:
maxItems: 3 maxItems: 3
clock-names: clock-names:
minItems: 2 minItems: 2
maxItems: 3
items: items:
- const: uart - const: uart
- pattern: '^clk_uart_baud[0-1]$' - pattern: '^clk_uart_baud[0-1]$'
...@@ -118,11 +117,8 @@ allOf: ...@@ -118,11 +117,8 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 2
maxItems: 2 maxItems: 2
clock-names: clock-names:
minItems: 2
maxItems: 2
items: items:
- const: uart - const: uart
- const: clk_uart_baud0 - const: clk_uart_baud0
......
Documentation/devicetree/bindings/sound/allwinner,sun4i-a10-i2s.yaml
View file @ f47c960e
...@@ -89,7 +89,6 @@ allOf: ...@@ -89,7 +89,6 @@ allOf:
properties: properties:
dmas: dmas:
minItems: 1 minItems: 1
maxItems: 2
items: items:
- description: RX DMA Channel - description: RX DMA Channel
- description: TX DMA Channel - description: TX DMA Channel
......
Documentation/devicetree/bindings/sound/ti,j721e-cpb-audio.yaml
View file @ f47c960e
...@@ -80,7 +80,6 @@ allOf: ...@@ -80,7 +80,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
minItems: 6
items: items:
- description: AUXCLK clock for McASP used by CPB audio - description: AUXCLK clock for McASP used by CPB audio
- description: Parent for CPB_McASP auxclk (for 48KHz) - description: Parent for CPB_McASP auxclk (for 48KHz)
...@@ -107,7 +106,6 @@ allOf: ...@@ -107,7 +106,6 @@ allOf:
then: then:
properties: properties:
clocks: clocks:
maxItems: 4
items: items:
- description: AUXCLK clock for McASP used by CPB audio - description: AUXCLK clock for McASP used by CPB audio
- description: Parent for CPB_McASP auxclk (for 48KHz) - description: Parent for CPB_McASP auxclk (for 48KHz)
......
Documentation/devicetree/bindings/thermal/rcar-gen3-thermal.yaml
View file @ f47c960e
...@@ -67,7 +67,6 @@ then: ...@@ -67,7 +67,6 @@ then:
properties: properties:
reg: reg:
minItems: 2 minItems: 2
maxItems: 3
items: items:
- description: TSC1 registers - description: TSC1 registers
- description: TSC2 registers - description: TSC2 registers
......
Documentation/devicetree/bindings/ufs/cdns,ufshc.yaml
View file @ f47c960e
...@@ -43,6 +43,9 @@ properties: ...@@ -43,6 +43,9 @@ properties:
- const: phy_clk - const: phy_clk
- const: ref_clk - const: ref_clk
power-domains:
maxItems: 1
reg: reg:
maxItems: 1 maxItems: 1
......
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