Commit b9861581 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -287,7 +287,7 @@ examples: ...@@ -287,7 +287,7 @@ examples:
arm,trig-in-sigs = <0 1>; arm,trig-in-sigs = <0 1>;
arm,trig-in-types = <PE_DBGTRIGGER arm,trig-in-types = <PE_DBGTRIGGER
PE_PMUIRQ>; PE_PMUIRQ>;
arm,trig-out-sigs=<0 1 2 >; arm,trig-out-sigs = <0 1 2 >;
arm,trig-out-types = <PE_EDBGREQ arm,trig-out-types = <PE_EDBGREQ
PE_DBGRESTART PE_DBGRESTART
PE_CTIIRQ>; PE_CTIIRQ>;
...@@ -309,24 +309,24 @@ examples: ...@@ -309,24 +309,24 @@ examples:
trig-conns@0 { trig-conns@0 {
reg = <0>; reg = <0>;
arm,trig-in-sigs=<0>; arm,trig-in-sigs = <0>;
arm,trig-in-types=<GEN_INTREQ>; arm,trig-in-types = <GEN_INTREQ>;
arm,trig-out-sigs=<0>; arm,trig-out-sigs = <0>;
arm,trig-out-types=<GEN_HALTREQ>; arm,trig-out-types = <GEN_HALTREQ>;
arm,trig-conn-name = "sys_profiler"; arm,trig-conn-name = "sys_profiler";
}; };
trig-conns@1 { trig-conns@1 {
reg = <1>; reg = <1>;
arm,trig-out-sigs=<2 3>; arm,trig-out-sigs = <2 3>;
arm,trig-out-types=<GEN_HALTREQ GEN_RESTARTREQ>; arm,trig-out-types = <GEN_HALTREQ GEN_RESTARTREQ>;
arm,trig-conn-name = "watchdog"; arm,trig-conn-name = "watchdog";
}; };
trig-conns@2 { trig-conns@2 {
reg = <2>; reg = <2>;
arm,trig-in-sigs=<1 6>; arm,trig-in-sigs = <1 6>;
arm,trig-in-types=<GEN_HALTREQ GEN_RESTARTREQ>; arm,trig-in-types = <GEN_HALTREQ GEN_RESTARTREQ>;
arm,trig-conn-name = "g_counter"; arm,trig-conn-name = "g_counter";
}; };
}; };
......
...@@ -96,8 +96,8 @@ examples: ...@@ -96,8 +96,8 @@ examples:
compatible = "ti,k2g-sci"; compatible = "ti,k2g-sci";
ti,system-reboot-controller; ti,system-reboot-controller;
mbox-names = "rx", "tx"; mbox-names = "rx", "tx";
mboxes= <&msgmgr 5 2>, mboxes = <&msgmgr 5 2>,
<&msgmgr 0 0>; <&msgmgr 0 0>;
reg-names = "debug_messages"; reg-names = "debug_messages";
reg = <0x02921800 0x800>; reg = <0x02921800 0x800>;
}; };
...@@ -107,8 +107,8 @@ examples: ...@@ -107,8 +107,8 @@ examples:
compatible = "ti,k2g-sci"; compatible = "ti,k2g-sci";
ti,host-id = <12>; ti,host-id = <12>;
mbox-names = "rx", "tx"; mbox-names = "rx", "tx";
mboxes= <&secure_proxy_main 11>, mboxes = <&secure_proxy_main 11>,
<&secure_proxy_main 13>; <&secure_proxy_main 13>;
reg-names = "debug_messages"; reg-names = "debug_messages";
reg = <0x44083000 0x1000>; reg = <0x44083000 0x1000>;
......
...@@ -243,7 +243,7 @@ examples: ...@@ -243,7 +243,7 @@ examples:
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
gmu: gmu@506a000 { gmu: gmu@506a000 {
compatible="qcom,adreno-gmu-630.2", "qcom,adreno-gmu"; compatible = "qcom,adreno-gmu-630.2", "qcom,adreno-gmu";
reg = <0x506a000 0x30000>, reg = <0x506a000 0x30000>,
<0xb280000 0x10000>, <0xb280000 0x10000>,
......
...@@ -74,7 +74,7 @@ examples: ...@@ -74,7 +74,7 @@ examples:
vdd3-supply = <&vcclcd_reg>; vdd3-supply = <&vcclcd_reg>;
vci-supply = <&vlcd_reg>; vci-supply = <&vlcd_reg>;
reset-gpios = <&gpy4 5 0>; reset-gpios = <&gpy4 5 0>;
power-on-delay= <50>; power-on-delay = <50>;
reset-delay = <100>; reset-delay = <100>;
init-delay = <100>; init-delay = <100>;
panel-width-mm = <58>; panel-width-mm = <58>;
......
...@@ -121,11 +121,11 @@ examples: ...@@ -121,11 +121,11 @@ examples:
#size-cells = <0>; #size-cells = <0>;
vopb_out_edp: endpoint@0 { vopb_out_edp: endpoint@0 {
reg = <0>; reg = <0>;
remote-endpoint=<&edp_in_vopb>; remote-endpoint = <&edp_in_vopb>;
}; };
vopb_out_hdmi: endpoint@1 { vopb_out_hdmi: endpoint@1 {
reg = <1>; reg = <1>;
remote-endpoint=<&hdmi_in_vopb>; remote-endpoint = <&hdmi_in_vopb>;
}; };
}; };
}; };
...@@ -35,7 +35,7 @@ unevaluatedProperties: false ...@@ -35,7 +35,7 @@ unevaluatedProperties: false
examples: examples:
- | - |
spi { spi {
#address-cells= <1>; #address-cells = <1>;
#size-cells = <0>; #size-cells = <0>;
adc@0 { adc@0 {
......
...@@ -137,7 +137,7 @@ examples: ...@@ -137,7 +137,7 @@ examples:
cru_parallel_in: endpoint@0 { cru_parallel_in: endpoint@0 {
reg = <0>; reg = <0>;
remote-endpoint= <&ov5642>; remote-endpoint = <&ov5642>;
hsync-active = <1>; hsync-active = <1>;
vsync-active = <1>; vsync-active = <1>;
}; };
...@@ -150,7 +150,7 @@ examples: ...@@ -150,7 +150,7 @@ examples:
cru_csi_in: endpoint@0 { cru_csi_in: endpoint@0 {
reg = <0>; reg = <0>;
remote-endpoint= <&csi_cru_in>; remote-endpoint = <&csi_cru_in>;
}; };
}; };
}; };
......
...@@ -303,11 +303,11 @@ examples: ...@@ -303,11 +303,11 @@ examples:
vin0csi20: endpoint@0 { vin0csi20: endpoint@0 {
reg = <0>; reg = <0>;
remote-endpoint= <&csi20vin0>; remote-endpoint = <&csi20vin0>;
}; };
vin0csi40: endpoint@2 { vin0csi40: endpoint@2 {
reg = <2>; reg = <2>;
remote-endpoint= <&csi40vin0>; remote-endpoint = <&csi40vin0>;
}; };
}; };
}; };
......
...@@ -164,7 +164,7 @@ examples: ...@@ -164,7 +164,7 @@ examples:
reg = <0 0xf80000>; reg = <0 0xf80000>;
}; };
firmware@f80000 { firmware@f80000 {
label ="firmware"; label = "firmware";
reg = <0xf80000 0x80000>; reg = <0xf80000 0x80000>;
read-only; read-only;
}; };
......
...@@ -156,7 +156,7 @@ examples: ...@@ -156,7 +156,7 @@ examples:
reg = <0x1101c000 0x1300>; reg = <0x1101c000 0x1300>;
interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 237 IRQ_TYPE_LEVEL_LOW>;
interrupt-names = "macirq"; interrupt-names = "macirq";
phy-mode ="rgmii-rxid"; phy-mode = "rgmii-rxid";
mac-address = [00 55 7b b5 7d f7]; mac-address = [00 55 7b b5 7d f7];
clock-names = "axi", clock-names = "axi",
"apb", "apb",
......
...@@ -42,8 +42,8 @@ examples: ...@@ -42,8 +42,8 @@ examples:
- | - |
#include <dt-bindings/interrupt-controller/arm-gic.h> #include <dt-bindings/interrupt-controller/arm-gic.h>
pmu { pmu {
#address-cells=<2>; #address-cells = <2>;
#size-cells=<2>; #size-cells = <2>;
pmu@ff638000 { pmu@ff638000 {
compatible = "amlogic,g12a-ddr-pmu"; compatible = "amlogic,g12a-ddr-pmu";
......
...@@ -87,7 +87,7 @@ examples: ...@@ -87,7 +87,7 @@ examples:
clocks = <&clk26m>; clocks = <&clk26m>;
clock-output-names = "mipi_tx0_pll"; clock-output-names = "mipi_tx0_pll";
drive-strength-microamp = <4000>; drive-strength-microamp = <4000>;
nvmem-cells= <&mipi_tx_calibration>; nvmem-cells = <&mipi_tx_calibration>;
nvmem-cell-names = "calibration-data"; nvmem-cell-names = "calibration-data";
#clock-cells = <0>; #clock-cells = <0>;
#phy-cells = <0>; #phy-cells = <0>;
......
...@@ -75,7 +75,7 @@ additionalProperties: false ...@@ -75,7 +75,7 @@ additionalProperties: false
examples: examples:
- | - |
remoteproc@1c { remoteproc@1c {
compatible= "amlogic,meson8-ao-arc", "amlogic,meson-mx-ao-arc"; compatible = "amlogic,meson8-ao-arc", "amlogic,meson-mx-ao-arc";
reg = <0x1c 0x8>, <0x38 0x8>; reg = <0x1c 0x8>, <0x38 0x8>;
reg-names = "remap", "cpu"; reg-names = "remap", "cpu";
resets = <&media_cpu_reset>; resets = <&media_cpu_reset>;
......
...@@ -15,7 +15,7 @@ description: ...@@ -15,7 +15,7 @@ description:
properties: properties:
$nodename: $nodename:
pattern: "^slim(@.*|-[0-9a-f])*$" pattern: "^slim(@.*|-([0-9]|[1-9][0-9]+))?$"
"#address-cells": "#address-cells":
const: 2 const: 2
......
...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# ...@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
title: Qualcomm Technologies, Inc. (QTI) Stats title: Qualcomm Technologies, Inc. (QTI) Stats
maintainers: maintainers:
- Maulik Shah <mkshah@codeaurora.org> - Maulik Shah <quic_mkshah@quicinc.com>
description: description:
Always On Processor/Resource Power Manager maintains statistics of the SoC Always On Processor/Resource Power Manager maintains statistics of the SoC
......
...@@ -17,7 +17,7 @@ description: ...@@ -17,7 +17,7 @@ description:
properties: properties:
$nodename: $nodename:
pattern: "^timestamp(@.*|-[0-9a-f])?$" pattern: "^timestamp(@.*|-([0-9]|[1-9][0-9]+))?$"
"#timestamp-cells": "#timestamp-cells":
description: description:
......
...@@ -304,7 +304,7 @@ examples: ...@@ -304,7 +304,7 @@ examples:
# Dual role switch with type-c # Dual role switch with type-c
- | - |
usb@11201000 { usb@11201000 {
compatible ="mediatek,mt8183-mtu3", "mediatek,mtu3"; compatible = "mediatek,mt8183-mtu3", "mediatek,mtu3";
reg = <0x11201000 0x2e00>, <0x11203e00 0x0100>; reg = <0x11201000 0x2e00>, <0x11203e00 0x0100>;
reg-names = "mac", "ippc"; reg-names = "mac", "ippc";
interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>; interrupts = <GIC_SPI 72 IRQ_TYPE_LEVEL_LOW>;
......
...@@ -92,7 +92,7 @@ examples: ...@@ -92,7 +92,7 @@ examples:
usb@31100000 { usb@31100000 {
compatible = "snps,dwc3"; compatible = "snps,dwc3";
reg =<0x00 0x31100000 0x00 0x50000>; reg = <0x00 0x31100000 0x00 0x50000>;
interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */ interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
<GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */ <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
interrupt-names = "host", "peripheral"; interrupt-names = "host", "peripheral";
......
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>;
};
# 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>;
};
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>;
};
# 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: | ...@@ -17,11 +17,11 @@ description: |
select: select:
properties: properties:
$nodename: $nodename:
pattern: "^watchdog(@.*|-[0-9a-f])?$" pattern: "^watchdog(@.*|-([0-9]|[1-9][0-9]+))?$"
properties: properties:
$nodename: $nodename:
pattern: "^(timer|watchdog)(@.*|-[0-9a-f])?$" pattern: "^(timer|watchdog)(@.*|-([0-9]|[1-9][0-9]+))?$"
timeout-sec: timeout-sec:
description: description:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment