Skip to contentSkip to conversation

dt-bindings: watchdog: Convert Samsung SoC watchdog bindings to json-schema

PATCH Superseded Krzysztof Kozlowski 2 participants 8 messages Sep 20, 2019 – Oct 2, 2019

Subsystems (3)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 dt-bindings: watchdog: Convert Samsung SoC watchdog bindings to json-schema

Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format using json-schema.

---

Changes since v1:
1. Indent example with four spaces (more readable),
2. Remove unneeded timeout-sec description and include generic bindings.

---
 .../bindings/watchdog/samsung-wdt.txt         | 35 ----------
 .../bindings/watchdog/samsung-wdt.yaml        | 65 +++++++++++++++++++
 2 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
Documentation/devicetree/bindings/watchdog/samsung-wdt.txt deleted +0 -35
deleted file mode 100644
index 46dcb48e75b4..000000000000
@@ -1,35 +0,0 @@
-* Samsung's Watchdog Timer Controller
-
-The Samsung's Watchdog controller is used for resuming system operation
-after a preset amount of time during which the WDT reset event has not
-occurred.
-
-Required properties:
-- compatible : should be one among the following
-	- "samsung,s3c2410-wdt" for S3C2410
-	- "samsung,s3c6410-wdt" for S3C6410, S5PV210 and Exynos4
-	- "samsung,exynos5250-wdt" for Exynos5250
-	- "samsung,exynos5420-wdt" for Exynos5420
-	- "samsung,exynos7-wdt" for Exynos7
-
-- reg : base physical address of the controller and length of memory mapped
-	region.
-- interrupts : interrupt number to the cpu.
-- samsung,syscon-phandle : reference to syscon node (This property required only
-	in case of compatible being "samsung,exynos5250-wdt" or "samsung,exynos5420-wdt".
-	In case of Exynos5250 and 5420 this property points to syscon node holding the PMU
-	base address)
-
-Optional properties:
-- timeout-sec : contains the watchdog timeout in seconds.
-
-Example:
-
-watchdog@101d0000 {
-	compatible = "samsung,exynos5250-wdt";
-	reg = <0x101D0000 0x100>;
-	interrupts = <0 42 0>;
-	clocks = <&clock 336>;
-	clock-names = "watchdog";
-	samsung,syscon-phandle = <&pmu_syscon>;
-};
Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml new file +65 -0

65 lines not on this page · raw message

Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 2/3 dt-bindings: watchdog: Add missing clocks requirement in Samsung SoC watchdog

The Samsung SoC watchdog driver always required providing a clock (either through platform data or from DT). However when bindings were added in commit 9487a9cc7140 ("watchdog: s3c2410: Add support for device tree based probe"), they missed the requirement of clock.

---

Changes since v1:
1. Indent example with four spaces (more readable),
2. Add also missing required entries for clocks.

---
 .../devicetree/bindings/watchdog/samsung-wdt.yaml        | 9 +++++++++
 1 file changed, 9 insertions(+)
Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml +9 -0
index 5a3a3cec8e20..2fa40d8864b2 100644
@@ -26,6 +26,13 @@ properties:
   reg:
     maxItems: 1
 
+  clocks:
+    maxItems: 1
+
+  clock-names:
+    items:
+      - const: watchdog
+
   interrupts:
     maxItems: 1
 
@@ -37,6 +44,8 @@ properties:
 
 required:
   - compatible
+  - clocks
+  - clock-names
   - interrupts
   - reg
 
Signature · 1 line
2.17.1
#2 lore raw

PATCH v2 3/3 dt-bindings: watchdog: meson-gxbb-wdt: Include generic watchdog bindings

In reply to Krzysztof Kozlowski

Include generic watchdog DT schema bindings in Amlogic GXBB Watchdog bindings.

---
 .../devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml   | 3 +++
 1 file changed, 3 insertions(+)
Documentation/devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml +3 -0
index d7352f709b37..4ddae6feef3b 100644
@@ -10,6 +10,9 @@ title: Meson GXBB SoCs Watchdog timer
 maintainers:
   - Neil Armstrong <[email protected]>
 
+allOf:
+  - $ref: watchdog.yaml#
+
 properties:
   compatible:
     enum:
Signature · 1 line
2.17.1
maintainer Acked-by on v2 3/3
#3 lore raw

Re: [PATCH v2 3/3] dt-bindings: watchdog: meson-gxbb-wdt: Include generic watchdog bindings

Quoted 8 lines · Krzysztof Kozlowski

Include generic watchdog DT schema bindings in Amlogic GXBB Watchdog bindings.

---
 .../devicetree/bindings/watchdog/amlogic,meson-gxbb-wdt.yaml   | 3 +++
 1 file changed, 3 insertions(+)
maintainer Reviewed-by on v2 1/3
#5 lore raw
In reply to Krzysztof Kozlowski
Quoted 10 lines · Krzysztof Kozlowski

Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format using json-schema.

---

Changes since v1:
1. Indent example with four spaces (more readable),
2. Remove unneeded timeout-sec description and include generic bindings.

Quoted 6 lines
---
 .../bindings/watchdog/samsung-wdt.txt         | 35 ----------
 .../bindings/watchdog/samsung-wdt.yaml        | 65 +++++++++++++++++++
 2 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
#6 lore raw
Quoted 18 lines · Rob Herring
Quoted 10 lines · Krzysztof Kozlowski

Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format using json-schema.

---

Changes since v1:
1. Indent example with four spaces (more readable),
2. Remove unneeded timeout-sec description and include generic bindings.

Quoted 6 lines
---
 .../bindings/watchdog/samsung-wdt.txt         | 35 ----------
 .../bindings/watchdog/samsung-wdt.yaml        | 65 +++++++++++++++++++
 2 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
Quoted 1 line

Hi Rob,

The generic watchdog YAML/DT schema is already in v5.4-rc1 so this can go either trough you, or through watchdog tree.

Best regards,
Krzysztof

maintainer
#7 lore raw
Quoted 20 lines · Krzysztof Kozlowski
Quoted 18 lines · Rob Herring
Quoted 16 lines · Krzysztof Kozlowski

Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format using json-schema.

---

Changes since v1:
1. Indent example with four spaces (more readable),
2. Remove unneeded timeout-sec description and include generic bindings.

---
 .../bindings/watchdog/samsung-wdt.txt         | 35 ----------
 .../bindings/watchdog/samsung-wdt.yaml        | 65 +++++++++++++++++++
 2 files changed, 65 insertions(+), 35 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt
 create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml
Quoted 6 lines
Quoted 1 line

Hi Rob,

The generic watchdog YAML/DT schema is already in v5.4-rc1 so this can go either trough you, or through watchdog tree.

Okay, I've applied the series.

Rob