Devicetree updates for v6.5, part 2:
- 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 -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEktVUI4SxYhzZyEuo+vtdtY28YcMFAmSlqhkACgkQ+vtdtY28 YcMIKQ/+J31iU4ILtNYDYIpwPHplcAKPnY/tNkAClCmIaL9+9MSTJssSu4eETVZ9 vOt11TCPJ0UVxQnDGqTNYWzGe9Z76RqxAeceV2gkLb8zWSRRG1PV2wnjJ1bdOzKd NU0bgL9ow8QtCjEQp+Bf+IjgyJr2dzTuke/5EzaO87khkjSvFW/EZoH31mTzaqSU EO8pmHJScwj+Hf0MJuYBWxUcedsRaG824MIHPeQDn9OfHecv/Sq3Diccd9JJGLWB RREXynLo5BAARzbZ0Jvkkpn/UUnmUMWJpAJClx5YbDCDRnPce5uEpslxuxuyVSzT EgRe+z4+smlNlPryQRY/F9SiYP1BymeiQDXAVto+xSkzKU820Kag2cw2DlowtKoR GhyNnKFfqfg0zwfAynhuKDfec+1a367EAad9Vta0c1oZVqarqjD/tu6C0VC4dLPb NE2spUEkWw1G1is3867Yb0RAhi50E/Oq3smYIbWuQP9UDeiZGJemFCQx9ZpdUTY4 lvu0DTQOrySXRkkeh1kjqHhYerbGn1fgwZTfsOJfWDwL3qgnm9DFx53vemsfnSjT l6xj5sB56LaxPEitkMzOp6mKFK5hXQMZ6HYD/YedmiZCFKl4KuPjdBqUVo6swlfQ PLRI0UpoMEFvJ44LL2oGGye9ZZgrCnkrEPJUg4clxLPqne8jJeg= =cRW/ -----END PGP SIGNATURE----- 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
This commit is contained in:
Linus Torvalds
Коммит
b986158164
|
|
@ -15,7 +15,7 @@ description:
|
|||
|
||||
properties:
|
||||
$nodename:
|
||||
pattern: "^slim(@.*|-[0-9a-f])*$"
|
||||
pattern: "^slim(@.*|-([0-9]|[1-9][0-9]+))?$"
|
||||
|
||||
"#address-cells":
|
||||
const: 2
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ description:
|
|||
|
||||
properties:
|
||||
$nodename:
|
||||
pattern: "^timestamp(@.*|-[0-9a-f])?$"
|
||||
pattern: "^timestamp(@.*|-([0-9]|[1-9][0-9]+))?$"
|
||||
|
||||
"#timestamp-cells":
|
||||
description:
|
||||
|
|
|
|||
|
|
@ -1,15 +0,0 @@
|
|||
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>;
|
||||
};
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
# 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>;
|
||||
};
|
||||
|
|
@ -1,23 +0,0 @@
|
|||
Zynq Watchdog Device Tree Bindings
|
||||
-------------------------------------------
|
||||
|
||||
Required properties:
|
||||
- compatible : Should be "cdns,wdt-r1p2".
|
||||
- clocks : This is pclk (APB clock).
|
||||
- interrupts : This is wd_irq - watchdog timeout interrupt.
|
||||
|
||||
Optional properties
|
||||
- reset-on-timeout : If this property exists, then a reset is done
|
||||
when watchdog times out.
|
||||
- timeout-sec : Watchdog timeout value (in seconds).
|
||||
|
||||
Example:
|
||||
watchdog@f8005000 {
|
||||
compatible = "cdns,wdt-r1p2";
|
||||
clocks = <&clkc 45>;
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <0 9 1>;
|
||||
reg = <0xf8005000 0x1000>;
|
||||
reset-on-timeout;
|
||||
timeout-sec = <10>;
|
||||
};
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
|
||||
%YAML 1.2
|
||||
---
|
||||
$id: http://devicetree.org/schemas/watchdog/cdns,wdt-r1p2.yaml#
|
||||
$schema: http://devicetree.org/meta-schemas/core.yaml#
|
||||
|
||||
title: Cadence watchdog timer controller
|
||||
|
||||
maintainers:
|
||||
- Neeli Srinivas <srinivas.neeli@amd.com>
|
||||
|
||||
description:
|
||||
The cadence watchdog timer is used to detect and recover from
|
||||
system malfunctions. This watchdog contains 24 bit counter and
|
||||
a programmable reset period. The timeout period varies from 1 ms
|
||||
to 30 seconds while using a 100Mhz clock.
|
||||
|
||||
allOf:
|
||||
- $ref: watchdog.yaml#
|
||||
|
||||
properties:
|
||||
compatible:
|
||||
enum:
|
||||
- cdns,wdt-r1p2
|
||||
|
||||
reg:
|
||||
maxItems: 1
|
||||
|
||||
clocks:
|
||||
maxItems: 1
|
||||
|
||||
interrupts:
|
||||
maxItems: 1
|
||||
|
||||
reset-on-timeout:
|
||||
type: boolean
|
||||
description: |
|
||||
If this property exists, then a reset is done when watchdog
|
||||
times out.
|
||||
|
||||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- clocks
|
||||
- interrupts
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
||||
examples:
|
||||
- |
|
||||
#include <dt-bindings/interrupt-controller/arm-gic.h>
|
||||
|
||||
watchdog@f8005000 {
|
||||
compatible = "cdns,wdt-r1p2";
|
||||
reg = <0xf8005000 0x1000>;
|
||||
clocks = <&clkc 45>;
|
||||
interrupt-parent = <&intc>;
|
||||
interrupts = <GIC_SPI 9 IRQ_TYPE_EDGE_RISING>;
|
||||
reset-on-timeout;
|
||||
timeout-sec = <10>;
|
||||
};
|
||||
...
|
||||
|
|
@ -17,11 +17,11 @@ description: |
|
|||
select:
|
||||
properties:
|
||||
$nodename:
|
||||
pattern: "^watchdog(@.*|-[0-9a-f])?$"
|
||||
pattern: "^watchdog(@.*|-([0-9]|[1-9][0-9]+))?$"
|
||||
|
||||
properties:
|
||||
$nodename:
|
||||
pattern: "^(timer|watchdog)(@.*|-[0-9a-f])?$"
|
||||
pattern: "^(timer|watchdog)(@.*|-([0-9]|[1-9][0-9]+))?$"
|
||||
|
||||
timeout-sec:
|
||||
description:
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче