| Message ID | 20190920162124.7036-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 79df4a9b547ffa7de73d8fc29a7b2c2e372cccb7 |
| Headers | show |
| Series | [v2,1/3] dt-bindings: watchdog: Convert Samsung SoC watchdog bindings to json-schema | expand |
On Fri, 20 Sep 2019 at 18:21, Krzysztof Kozlowski <krzk@kernel.org> wrote: > > Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format > using json-schema. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > Changes since v1: > 1. Indent example with four spaces (more readable), > 2. Remove unneeded timeout-sec description and include generic bindings. My bad, this is actually v3. Best regards, Krzysztof
On Fri, Sep 20, 2019 at 06:21:22PM +0200, Krzysztof Kozlowski wrote: > Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format > using json-schema. > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > --- > > 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 Reviewed-by: Rob Herring <robh@kernel.org>
On Tue, Oct 01, 2019 at 05:21:09PM -0500, Rob Herring wrote: > On Fri, Sep 20, 2019 at 06:21:22PM +0200, Krzysztof Kozlowski wrote: > > Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format > > using json-schema. > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > --- > > > > 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 > > Reviewed-by: Rob Herring <robh@kernel.org> 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
On Wed, Oct 2, 2019 at 2:48 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On Tue, Oct 01, 2019 at 05:21:09PM -0500, Rob Herring wrote: > > On Fri, Sep 20, 2019 at 06:21:22PM +0200, Krzysztof Kozlowski wrote: > > > Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format > > > using json-schema. > > > > > > Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> > > > > > > --- > > > > > > 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 > > > > Reviewed-by: Rob Herring <robh@kernel.org> > > 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
diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt b/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt deleted file mode 100644 index 46dcb48e75b4..000000000000 --- a/Documentation/devicetree/bindings/watchdog/samsung-wdt.txt +++ /dev/null @@ -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>; -}; diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml new file mode 100644 index 000000000000..5a3a3cec8e20 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml @@ -0,0 +1,65 @@ +# SPDX-License-Identifier: GPL-2.0 +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/samsung-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Samsung SoC Watchdog Timer Controller + +maintainers: + - Krzysztof Kozlowski <krzk@kernel.org> + +description: |+ + 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. + +properties: + compatible: + enum: + - 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: + maxItems: 1 + + interrupts: + maxItems: 1 + + samsung,syscon-phandle: + $ref: /schemas/types.yaml#/definitions/phandle + description: + Phandle to the PMU system controller node (in case of Exynos5250 + and Exynos5420). + +required: + - compatible + - interrupts + - reg + +allOf: + - $ref: watchdog.yaml# + - if: + properties: + compatible: + contains: + enum: + - samsung,exynos5250-wdt + - samsung,exynos5420-wdt + then: + required: + - samsung,syscon-phandle + +examples: + - | + watchdog@101d0000 { + compatible = "samsung,exynos5250-wdt"; + reg = <0x101D0000 0x100>; + interrupts = <0 42 0>; + clocks = <&clock 336>; + clock-names = "watchdog"; + samsung,syscon-phandle = <&pmu_syscon>; + };
Convert Samsung S3C/S5P/Exynos watchdog bindings to DT schema format using json-schema. Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- 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