Commit a01fe7ec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull devicetree fixes from Rob Herring:

 - Fixes for unevaluatedProperties warnings.

   These were missed to due to a bug in dtschema which is now fixed. The
   changes involve either adding missing properties or removing spurious
   properties from examples.

 - Update several Qualcomm binding maintainer email addresses

 - Fix typo in imx8mp-media-blk-ctrl example

 - Fix fixed string pattern in qcom,smd

 - Correct the order of 'reg' entries in Xilinx PCI binding

* tag 'devicetree-fixes-for-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: mtd: spi-nand: Add spi-peripheral-props.yaml reference
  dt-bindings: memory-controllers: ingenic: Split out child node properties
  dt-bindings: net/dsa: Add spi-peripheral-props.yaml references
  dt-bindings: PCI: apple: Add missing 'power-domains' property
  dt-bindings: Update Sibi Sankar's email address
  dt-bindings: clock: Update my email address
  dt-bindings: PCI: xilinx-cpm: Fix reg property order
  dt-bindings: net: Fix unevaluatedProperties warnings in examples
  dt-bindings: PCI: socionext,uniphier-pcie: Add missing child interrupt controller
  dt-bindings: usb: snps,dwc3: Add missing 'dma-coherent' property
  dt-bindings: soc: imx8mp-media-blk-ctrl: Fix DT example
  dt-bindings: soc: qcom,smd: do not use pattern for simple rpm-requests string
parents 9af13088 987cf300
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Multimedia Clock & Reset Controller Binding

maintainers:
  - Jeffrey Hugo <jhugo@codeaurora.org>
  - Jeffrey Hugo <quic_jhugo@quicinc.com>
  - Taniya Das <tdas@codeaurora.org>

description: |
+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Operating State Manager (OSM) L3 Interconnect Provider

maintainers:
  - Sibi Sankar <sibis@codeaurora.org>
  - Sibi Sankar <quic_sibis@quicinc.com>

description:
  L3 cache bandwidth requirements on Qualcomm SoCs is serviced by the OSM.
+46 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
%YAML 1.2
---
$id: http://devicetree.org/schemas/memory-controllers/ingenic,nemc-peripherals.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Ingenic SoCs NAND / External Memory Controller (NEMC) devicetree bindings

maintainers:
  - Paul Cercueil <paul@crapouillou.net>

properties:
  reg:
    minItems: 1
    maxItems: 255

  ingenic,nemc-bus-width:
    $ref: /schemas/types.yaml#/definitions/uint32
    enum: [8, 16]
    description: Specifies the bus width in bits.

  ingenic,nemc-tAS:
    $ref: /schemas/types.yaml#/definitions/uint32
    description: Address setup time in nanoseconds.

  ingenic,nemc-tAH:
    $ref: /schemas/types.yaml#/definitions/uint32
    description: Address hold time in nanoseconds.

  ingenic,nemc-tBP:
    $ref: /schemas/types.yaml#/definitions/uint32
    description: Burst pitch time in nanoseconds.

  ingenic,nemc-tAW:
    $ref: /schemas/types.yaml#/definitions/uint32
    description: Address wait time in nanoseconds.

  ingenic,nemc-tSTRV:
    $ref: /schemas/types.yaml#/definitions/uint32
    description: Static memory recovery time in nanoseconds.

required:
  - reg

additionalProperties: true
...
+0 −32
Original line number Diff line number Diff line
@@ -39,38 +39,6 @@ properties:
patternProperties:
  ".*@[0-9]+$":
    type: object
    properties:
      reg:
        minItems: 1
        maxItems: 255

      ingenic,nemc-bus-width:
        $ref: /schemas/types.yaml#/definitions/uint32
        enum: [8, 16]
        description: Specifies the bus width in bits.

      ingenic,nemc-tAS:
        $ref: /schemas/types.yaml#/definitions/uint32
        description: Address setup time in nanoseconds.

      ingenic,nemc-tAH:
        $ref: /schemas/types.yaml#/definitions/uint32
        description: Address hold time in nanoseconds.

      ingenic,nemc-tBP:
        $ref: /schemas/types.yaml#/definitions/uint32
        description: Burst pitch time in nanoseconds.

      ingenic,nemc-tAW:
        $ref: /schemas/types.yaml#/definitions/uint32
        description: Address wait time in nanoseconds.

      ingenic,nemc-tSTRV:
        $ref: /schemas/types.yaml#/definitions/uint32
        description: Static memory recovery time in nanoseconds.

    required:
      - reg

required:
  - compatible
+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ maintainers:

allOf:
  - $ref: nand-controller.yaml#
  - $ref: /schemas/memory-controllers/ingenic,nemc-peripherals.yaml#

properties:
  compatible:
Loading