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

Merge tag 'devicetree-for-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux 

Pull more devicetree updates from Rob Herring:

 - Whitespace clean-ups in binding examples

 - Restrict node name suffixes to "-[0-9]+" for cases of multiple
   instances which don't have unit-addresses

 - Convert brcm,kona-wdt and cdns,wdt-r1p2 watchdog bindings to DT
   schema

* tag 'devicetree-for-6.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
  dt-bindings: soc: qcom: stats: Update maintainer email
  dt-bindings: cleanup DTS example whitespaces
  dt-bindings: timestamp: restrict node name suffixes
  dt-bindings: slimbus: restrict node name suffixes
  dt-bindings: watchdog: restrict node name suffixes
  dt-bindings: watchdog: brcm,kona-wdt: convert txt file to yaml
  dt-bindings: watchdog: cdns,wdt-r1p2: Convert cadence watchdog to yaml
parents fe1de551 31e9f406

Documentation/devicetree/bindings/slimbus/slimbus.yaml

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ description: 


properties:

  $nodename:

    pattern: "^slim(@.*|-[0-9a-f])*$"

    pattern: "^slim(@.*|-([0-9]|[1-9][0-9]+))?$"



  "#address-cells":

    const: 2

Documentation/devicetree/bindings/soc/qcom/qcom-stats.yaml

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# 
title: Qualcomm Technologies, Inc. (QTI) Stats



maintainers:

  - Maulik Shah <mkshah@codeaurora.org>

  - Maulik Shah <quic_mkshah@quicinc.com>



description:

  Always On Processor/Resource Power Manager maintains statistics of the SoC

Documentation/devicetree/bindings/timestamp/hardware-timestamps-common.yaml

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ description: 


properties:

  $nodename:

    pattern: "^timestamp(@.*|-[0-9a-f])?$"

    pattern: "^timestamp(@.*|-([0-9]|[1-9][0-9]+))?$"



  "#timestamp-cells":

    description:

Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.txt

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
Broadcom Kona Family Watchdog Timer

-----------------------------------



This watchdog timer is used in the following Broadcom SoCs:

  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155



Required properties:

  - compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

  - reg: memory address & range



Example:

	watchdog@35002f40 {

		compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

		reg = <0x35002f40 0x6c>;

	};

Documentation/devicetree/bindings/watchdog/brcm,kona-wdt.yaml

0 → 100644
+41 −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/watchdog/brcm,kona-wdt.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Broadcom Kona Family Watchdog Timer



description: |

  This watchdog timer is used in the following Broadcom SoCs:

  BCM11130, BCM11140, BCM11351, BCM28145, BCM28155



maintainers:

  - Florian Fainelli <f.fainelli@gmail.com>

  - Ray Jui <rjui@broadcom.com>

  - Scott Branden <sbranden@broadcom.com>



allOf:

  - $ref: watchdog.yaml#



properties:

  compatible:

    items:

      - const: brcm,bcm11351-wdt

      - const: brcm,kona-wdt



  reg:

    maxItems: 1



required:

  - compatible

  - reg



unevaluatedProperties: false



examples:

  - |

    watchdog@35002f40 {

        compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";

        reg = <0x35002f40 0x6c>;

    };