Skip to content

Commit

Permalink
Merge tag 'devicetree-for-6.3' 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 core:

   - Add node lifecycle unit tests

   - Add of_property_present() helper aligned with fwnode API

   - Print more information on reserved regions on boot

   - Update dtc to upstream v1.6.1-66-gabbd523bae6e

   - Use strscpy() to instead of strncpy() in DT core

   - Add option for schema validation on %.dtb targets

  Bindings:

   - Add/fix support for listing multiple patterns in DT_SCHEMA_FILES

   - Rework external memory controller/bus bindings to properly support
     controller specific child node properties

   - Convert loongson,ls1x-intc, fcs,fusb302, sil,sii8620, Rockchip
     RK3399 PCIe, Synquacer I2C, and Synquacer EXIU bindings to DT
     schema format

   - Add RiscV SBI PMU event mapping binding

   - Add missing contraints on Arm SCMI child node allowed properties

   - Add a bunch of missing Socionext UniPhier glue block bindings and
     example fixes

   - Various fixes for duplicate or conflicting type definitions on DT
     properties"

* tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux: (66 commits)
  dt-bindings: regulator: Add mps,mpq7932 power-management IC
  of: dynamic: Fix spelling mistake "kojbect" -> "kobject"
  dt-bindings: drop Sagar Kadam from SiFive binding maintainership
  dt-bindings: sram: qcom,imem: document sm8450
  dt-bindings: interrupt-controller: convert loongson,ls1x-intc.txt to json-schema
  dt-bindings: arm: Add Cortex-A715 and X3
  of: dynamic: add lifecycle docbook info to node creation functions
  of: add consistency check to of_node_release()
  of: do not use "%pOF" printk format on node with refcount of zero
  of: unittest: add node lifecycle tests
  of: update kconfig unittest help
  of: add processing of EXPECT_NOT to of_unittest_expect
  of: prepare to add processing of EXPECT_NOT to of_unittest_expect
  of: Use preferred of_property_read_* functions
  of: Use of_property_present() helper
  of: Add of_property_present() helper
  of: reserved_mem: Use proper binary prefix
  dt-bindings: Fix multi pattern support in DT_SCHEMA_FILES
  of: reserved-mem: print out reserved-mem details during boot
  dt-bindings: serial: restrict possible child node names
  ...
  • Loading branch information
torvalds committed Feb 24, 2023
2 parents a93e884 + 1ba7dfb commit 8395d93
Show file tree
Hide file tree
Showing 102 changed files with 2,336 additions and 825 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ $(obj)/%.example.dts: $(src)/%.yaml check_dtschema_version FORCE
find_all_cmd = find $(srctree)/$(src) \( -name '*.yaml' ! \
-name 'processed-schema*' \)

find_cmd = $(find_all_cmd) | grep -F "$(DT_SCHEMA_FILES)"
find_cmd = $(find_all_cmd) | grep -F -e "$(subst :," -e ",$(DT_SCHEMA_FILES))"
CHK_DT_DOCS := $(shell $(find_cmd))

quiet_cmd_yamllint = LINT $(src)
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/arm/cpus.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ properties:
- arm,cortex-a78ae
- arm,cortex-a510
- arm,cortex-a710
- arm,cortex-a715
- arm,cortex-m0
- arm,cortex-m0+
- arm,cortex-m1
Expand All @@ -151,6 +152,7 @@ properties:
- arm,cortex-r7
- arm,cortex-x1
- arm,cortex-x2
- arm,cortex-x3
- arm,neoverse-e1
- arm,neoverse-n1
- arm,neoverse-n2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ required:

allOf:
- $ref: pata-common.yaml#
- $ref: /schemas/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml#

unevaluatedProperties: false

Expand Down
59 changes: 55 additions & 4 deletions Documentation/devicetree/bindings/clock/qcom,videocc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ properties:
- qcom,sm8250-videocc

clocks:
items:
- description: Board XO source
minItems: 1
maxItems: 3

clock-names:
items:
- const: bi_tcxo
minItems: 1
maxItems: 3

'#clock-cells':
const: 1
Expand Down Expand Up @@ -68,6 +68,57 @@ required:
- '#reset-cells'
- '#power-domain-cells'

allOf:
- if:
properties:
compatible:
enum:
- qcom,sc7180-videocc
- qcom,sdm845-videocc
- qcom,sm8150-videocc
then:
properties:
clocks:
items:
- description: Board XO source
clock-names:
items:
- const: bi_tcxo

- if:
properties:
compatible:
enum:
- qcom,sc7280-videocc
then:
properties:
clocks:
items:
- description: Board XO source
- description: Board active XO source
clock-names:
items:
- const: bi_tcxo
- const: bi_tcxo_ao

- if:
properties:
compatible:
enum:
- qcom,sm8250-videocc
then:
properties:
clocks:
items:
- description: AHB
- description: Board XO source
- description: Board active XO source
clock-names:
items:
- const: iface
- const: bi_tcxo
- const: bi_tcxo_ao

additionalProperties: false

examples:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: SiFive FU540 Power Reset Clock Interrupt Controller (PRCI)

maintainers:
- Sagar Kadam <[email protected]>
- Paul Walmsley <[email protected]>

description:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,40 +61,7 @@ required:

examples:
- |
sysctrl@61840000 {
compatible = "socionext,uniphier-sysctrl", "simple-mfd", "syscon";
reg = <0x61840000 0x4000>;
clock {
compatible = "socionext,uniphier-ld11-clock";
#clock-cells = <1>;
};
// other nodes ...
};
- |
mioctrl@59810000 {
compatible = "socionext,uniphier-mioctrl", "simple-mfd", "syscon";
reg = <0x59810000 0x800>;
clock {
compatible = "socionext,uniphier-ld11-mio-clock";
#clock-cells = <1>;
};
// other nodes ...
};
- |
perictrl@59820000 {
compatible = "socionext,uniphier-perictrl", "simple-mfd", "syscon";
reg = <0x59820000 0x200>;
clock {
compatible = "socionext,uniphier-ld11-peri-clock";
#clock-cells = <1>;
};
// other nodes ...
clock-controller {
compatible = "socionext,uniphier-ld11-clock";
#clock-cells = <1>;
};
108 changes: 108 additions & 0 deletions Documentation/devicetree/bindings/display/bridge/sil,sii8620.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/display/bridge/sil,sii8620.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Silicon Image SiI8620 HDMI/MHL bridge

maintainers:
- Krzysztof Kozlowski <[email protected]>

properties:
compatible:
const: sil,sii8620

reg:
maxItems: 1

clocks:
maxItems: 1

clock-names:
items:
- const: xtal

cvcc10-supply:
description: Digital Core Supply Voltage (1.0V)

interrupts:
maxItems: 1

iovcc18-supply:
description: I/O Supply Voltage (1.8V)

reset-gpios:
maxItems: 1

ports:
$ref: /schemas/graph.yaml#/properties/ports
unevaluatedProperties: false

properties:
port@0:
$ref: /schemas/graph.yaml#/properties/port
description:
Video port for HDMI (encoder) input

port@1:
$ref: /schemas/graph.yaml#/properties/port
description:
MHL to connector port

required:
- port@0
- port@1

required:
- compatible
- reg
- clocks
- cvcc10-supply
- interrupts
- iovcc18-supply
- reset-gpios
- ports

additionalProperties: false

examples:
- |
#include <dt-bindings/gpio/gpio.h>
#include <dt-bindings/interrupt-controller/irq.h>
i2c {
#address-cells = <1>;
#size-cells = <0>;
bridge@39 {
reg = <0x39>;
compatible = "sil,sii8620";
cvcc10-supply = <&ldo36_reg>;
iovcc18-supply = <&ldo34_reg>;
interrupt-parent = <&gpf0>;
interrupts = <2 IRQ_TYPE_LEVEL_HIGH>;
reset-gpios = <&gpv7 0 GPIO_ACTIVE_LOW>;
clocks = <&pmu_system_controller 0>;
clock-names = "xtal";
ports {
#address-cells = <1>;
#size-cells = <0>;
port@0 {
reg = <0>;
mhl_to_hdmi: endpoint {
remote-endpoint = <&hdmi_to_mhl>;
};
};
port@1 {
reg = <1>;
mhl_to_musb_con: endpoint {
remote-endpoint = <&musb_con_to_mhl>;
};
};
};
};
};
33 changes: 0 additions & 33 deletions Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,7 @@ properties:
items:
- const: dp

operating-points-v2:
maxItems: 1
operating-points-v2: true

opp-table: true

Expand Down
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/display/msm/gpu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ properties:
help bring the GPU out of secure mode.
properties:
memory-region:
$ref: /schemas/types.yaml#/definitions/phandle
maxItems: 1

firmware-name:
description: |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ properties:
iommus:
maxItems: 1

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ properties:
items:
- const: dsi

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
maxItems: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,7 @@ properties:
interconnect-names:
maxItems: 4

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,7 @@ properties:
interconnect-names:
maxItems: 4

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,7 @@ properties:
minItems: 4
maxItems: 10

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
minItems: 1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ properties:
items:
- const: hdmi

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
items:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ properties:
items:
- const: dma-mem # read

operating-points-v2:
$ref: "/schemas/types.yaml#/definitions/phandle"
operating-points-v2: true

power-domains:
items:
Expand Down
Loading

0 comments on commit 8395d93

Please sign in to comment.