Skip to content

Commit

Permalink
Merge tag 'devicetree-for-6.2' of git://git.kernel.org/pub/scm/linux/…
Browse files Browse the repository at this point in the history
…kernel/git/robh/linux

Pull devicetree updates from Rob Herring:
 "DT Bindings:

   - Various LED binding conversions and clean-ups. Convert the
     ir-spi-led, pwm-ir-tx, and gpio-ir-tx LED bindings to schemas.
     Consistently reference LED common.yaml or multi-led schemas and
     disallow undefined properties.

   - Convert IDT 89HPESx, pwm-clock, st,stmipid02, Xilinx PCIe hosts,
     and fsl,imx-fb bindings to schema

   - Add ata-generic, Broadcom u-boot environment, and dynamic MTD
     sub-partitions bindings.

   - Make all SPI based displays reference spi-peripheral-props.yaml

   - Fix some schema property regex's which should be fixed strings or
     were missing start/end anchors

   - Remove 'status' in examples, again...

  DT Core:

   - Fix a possible NULL dereference in overlay functions

   - Fix kexec reading 32-bit "linux,initrd-{start,end}" values (which
     never worked)

   - Add of_address_count() helper to count number of 'reg' entries

   - Support .dtso extension for DT overlay source files. Rename staging
     and unittest overlay files.

   - Update dtc to upstream v1.6.1-63-g55778a03df61"

* tag 'devicetree-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (42 commits)
  dt-bindings: leds: Add missing references to common LED schema
  dt-bindings: leds: intel,lgm: Add missing 'led-gpios' property
  of: overlay: fix null pointer dereferencing in find_dup_cset_node_entry() and find_dup_cset_prop()
  dt-bindings: lcdif: Fix constraints for imx8mp
  media: dt-bindings: atmel,isc: Drop unneeded unevaluatedProperties
  dt-bindings: Drop Jee Heng Sia
  dt-bindings: thermal: cooling-devices: Add missing cache related properties
  dt-bindings: leds: irled: ir-spi-led: convert to DT schema
  dt-bindings: leds: irled: pwm-ir-tx: convert to DT schema
  dt-bindings: leds: irled: gpio-ir-tx: convert to DT schema
  dt-bindings: leds: mt6360: rework to match multi-led
  dt-bindings: leds: lp55xx: rework to match multi-led
  dt-bindings: leds: lp55xx: switch to preferred 'gpios' suffix
  dt-bindings: leds: lp55xx: allow label
  dt-bindings: leds: use unevaluatedProperties for common.yaml
  dt-bindings: thermal: tsens: Add SM6115 compatible
  of/kexec: Fix reading 32-bit "linux,initrd-{start,end}" values
  dt-bindings: display: Convert fsl,imx-fb.txt to dt-schema
  dt-bindings: Add missing start and/or end of line regex anchors
  dt-bindings: qcom,pdc: Add missing compatibles
  ...
  • Loading branch information
torvalds committed Dec 13, 2022
2 parents 4d03390 + 580f989 commit 531d264
Show file tree
Hide file tree
Showing 98 changed files with 1,362 additions and 724 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -47,5 +47,4 @@ examples:
compatible = "nvidia,tegra234-ccplex-cluster";
reg = <0x0e000000 0x5ffff>;
nvidia,bpmp = <&bpmp>;
status = "okay";
};
54 changes: 27 additions & 27 deletions Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,33 @@ properties:
some PLLs, clocks and then brings up CPU0 for resuming the
system.

core-supply:
description:
Phandle to voltage regulator connected to the SoC Core power rail.

core-domain:
type: object
description: |
The vast majority of hardware blocks of Tegra SoC belong to a
Core power domain, which has a dedicated voltage rail that powers
the blocks.
properties:
operating-points-v2:
description:
Should contain level, voltages and opp-supported-hw property.
The supported-hw is a bitfield indicating SoC speedo or process
ID mask.

"#power-domain-cells":
const: 0

required:
- operating-points-v2
- "#power-domain-cells"

additionalProperties: false

i2c-thermtrip:
type: object
description:
Expand Down Expand Up @@ -300,33 +327,6 @@ patternProperties:

additionalProperties: false

core-domain:
type: object
description: |
The vast majority of hardware blocks of Tegra SoC belong to a
Core power domain, which has a dedicated voltage rail that powers
the blocks.
properties:
operating-points-v2:
description:
Should contain level, voltages and opp-supported-hw property.
The supported-hw is a bitfield indicating SoC speedo or process
ID mask.

"#power-domain-cells":
const: 0

required:
- operating-points-v2
- "#power-domain-cells"

additionalProperties: false

core-supply:
description:
Phandle to voltage regulator connected to the SoC Core power rail.

required:
- compatible
- reg
Expand Down
58 changes: 58 additions & 0 deletions Documentation/devicetree/bindings/ata/ata-generic.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/ata/ata-generic.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Generic Parallel ATA Controller

maintainers:
- Linus Walleij <[email protected]>

description:
Generic Parallel ATA controllers supporting PIO modes only.

properties:
compatible:
items:
- enum:
- arm,vexpress-cf
- fsl,mpc8349emitx-pata
- const: ata-generic

reg:
items:
- description: Command interface registers
- description: Control interface registers

reg-shift:
enum: [ 1, 2 ]

interrupts:
maxItems: 1

ata-generic,use16bit:
type: boolean
description: Use 16-bit accesses instead of 32-bit for data transfers

pio-mode:
description: Maximum ATA PIO transfer mode
$ref: /schemas/types.yaml#/definitions/uint32
maximum: 6
default: 0

required:
- compatible
- reg

additionalProperties: false

examples:
- |
compact-flash@1a000 {
compatible = "arm,vexpress-cf", "ata-generic";
reg = <0x1a000 0x100>,
<0x1a100 0xf00>;
reg-shift = <2>;
};
...
26 changes: 0 additions & 26 deletions Documentation/devicetree/bindings/clock/pwm-clock.txt

This file was deleted.

45 changes: 45 additions & 0 deletions Documentation/devicetree/bindings/clock/pwm-clock.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
# SPDX-License-Identifier: GPL-2.0
%YAML 1.2
---
$id: http://devicetree.org/schemas/clock/pwm-clock.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: An external clock signal driven by a PWM pin.

maintainers:
- Philipp Zabel <[email protected]>

properties:
compatible:
const: pwm-clock

'#clock-cells':
const: 0

clock-frequency:
description: Exact output frequency, in case the PWM period is not exact
but was rounded to nanoseconds.

clock-output-names:
maxItems: 1

pwms:
maxItems: 1

required:
- compatible
- '#clock-cells'
- pwms

additionalProperties: false

examples:
- |
clock {
compatible = "pwm-clock";
#clock-cells = <0>;
clock-frequency = <25000000>;
clock-output-names = "mipi_mclk";
pwms = <&pwm2 0 40>; /* 1 / 40 ns = 25 MHz */
};
...
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ properties:
type: object

patternProperties:
'cpu@[0-9a-f]+':
'^cpu@[0-9a-f]+$':
type: object

properties:
Expand Down
29 changes: 28 additions & 1 deletion Documentation/devicetree/bindings/display/fsl,lcdif.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ properties:
interrupts:
maxItems: 1

power-domains:
maxItems: 1

port:
$ref: /schemas/graph.yaml#/properties/port
description: The LCDIF output port
Expand Down Expand Up @@ -81,7 +84,31 @@ allOf:
maxItems: 3
required:
- clock-names
else:
- if:
properties:
compatible:
contains:
const: fsl,imx8mp-lcdif
then:
properties:
clocks:
minItems: 3
maxItems: 3
clock-names:
minItems: 3
maxItems: 3
required:
- clock-names
- power-domains
- if:
not:
properties:
compatible:
contains:
enum:
- fsl,imx6sx-lcdif
- fsl,imx8mp-lcdif
then:
properties:
clocks:
maxItems: 1
Expand Down
57 changes: 0 additions & 57 deletions Documentation/devicetree/bindings/display/imx/fsl,imx-fb.txt

This file was deleted.

Loading

0 comments on commit 531d264

Please sign in to comment.