Commit 8395d932 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'devicetree-for-6.3' of git://git.kernel.org/pub/scm/linux/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
  ...
parents a93e884e 1ba7dfb9

Documentation/devicetree/bindings/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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)

Documentation/devicetree/bindings/arm/cpus.yaml

+2 −0
Original line number Diff line number Diff line
@@ -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
@@ -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

Documentation/devicetree/bindings/ata/intel,ixp4xx-compact-flash.yaml

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ required: 


allOf:

  - $ref: pata-common.yaml#

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



unevaluatedProperties: false

Documentation/devicetree/bindings/clock/qcom,videocc.yaml

+55 −4
Original line number Diff line number Diff line
@@ -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
@@ -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:

Documentation/devicetree/bindings/clock/sifive/fu540-prci.yaml

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: SiFive FU540 Power Reset Clock Interrupt Controller (PRCI)



maintainers:

  - Sagar Kadam <sagar.kadam@sifive.com>

  - Paul Walmsley  <paul.walmsley@sifive.com>



description: