| Message ID | 20190907144541.16949-1-krzk@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [1/2] dt-bindings: watchdog: Convert Samsung SoC watchdog bindings to json-schema | expand |
On Sat, Sep 07, 2019 at 04:45:40PM +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> > --- > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > 2 files changed, 69 insertions(+), 35 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > new file mode 100644 > index 000000000000..39f1ca3bc4db > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > @@ -0,0 +1,69 @@ > +# 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). > + > + timeout-sec: > + $ref: /schemas/types.yaml#/definitions/uint32 > + description: > + Watchdog timeout in seconds. We need a common schema for this and the node name. Also note that anything with a unit suffix already has a type definition, so we don't really need to define it again. > + > +required: > + - compatible > + - interrupts > + - reg > + > +allOf: > + - 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>; > + }; > -- > 2.17.1 >
On Fri, 13 Sep 2019 at 16:36, Rob Herring <robh@kernel.org> wrote: > > On Sat, Sep 07, 2019 at 04:45:40PM +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> > > --- > > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > > 2 files changed, 69 insertions(+), 35 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > new file mode 100644 > > index 000000000000..39f1ca3bc4db > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > @@ -0,0 +1,69 @@ > > +# 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). > > + > > + timeout-sec: > > + $ref: /schemas/types.yaml#/definitions/uint32 > > + description: > > + Watchdog timeout in seconds. > > We need a common schema for this and the node name. Common schema in dt-schema or in Linux kernel bindings? If the latter, I can add it. > Also note that anything with a unit suffix already has a type > definition, so we don't really need to define it again. Right. Best regards, Krzysztof
On Wed, Sep 18, 2019 at 6:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > On Fri, 13 Sep 2019 at 16:36, Rob Herring <robh@kernel.org> wrote: > > > > On Sat, Sep 07, 2019 at 04:45:40PM +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> > > > --- > > > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > > > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > > > 2 files changed, 69 insertions(+), 35 deletions(-) > > > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > > > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > new file mode 100644 > > > index 000000000000..39f1ca3bc4db > > > --- /dev/null > > > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > @@ -0,0 +1,69 @@ > > > +# 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). > > > + > > > + timeout-sec: > > > + $ref: /schemas/types.yaml#/definitions/uint32 > > > + description: > > > + Watchdog timeout in seconds. > > > > We need a common schema for this and the node name. > > Common schema in dt-schema or in Linux kernel bindings? If the latter, > I can add it. In the kernel is fine. Rob
On Fri, Sep 20, 2019 at 10:46 AM Rob Herring <robh@kernel.org> wrote: > > On Wed, Sep 18, 2019 at 6:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > On Fri, 13 Sep 2019 at 16:36, Rob Herring <robh@kernel.org> wrote: > > > > > > On Sat, Sep 07, 2019 at 04:45:40PM +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> > > > > --- > > > > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > > > > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > > > > 2 files changed, 69 insertions(+), 35 deletions(-) > > > > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > > > > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > > > > > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > new file mode 100644 > > > > index 000000000000..39f1ca3bc4db > > > > --- /dev/null > > > > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > @@ -0,0 +1,69 @@ > > > > +# 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). > > > > + > > > > + timeout-sec: > > > > + $ref: /schemas/types.yaml#/definitions/uint32 > > > > + description: > > > > + Watchdog timeout in seconds. > > > > > > We need a common schema for this and the node name. > > > > Common schema in dt-schema or in Linux kernel bindings? If the latter, > > I can add it. > > In the kernel is fine. Actually, Maxime has already done one. Rob
On Fri, Sep 20, 2019 at 10:46:27AM -0500, Rob Herring wrote: > On Wed, Sep 18, 2019 at 6:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > On Fri, 13 Sep 2019 at 16:36, Rob Herring <robh@kernel.org> wrote: > > > > > > On Sat, Sep 07, 2019 at 04:45:40PM +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> > > > > --- > > > > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > > > > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > > > > 2 files changed, 69 insertions(+), 35 deletions(-) > > > > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > > > > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > > > > > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > new file mode 100644 > > > > index 000000000000..39f1ca3bc4db > > > > --- /dev/null > > > > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > @@ -0,0 +1,69 @@ > > > > +# 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). > > > > + > > > > + timeout-sec: > > > > + $ref: /schemas/types.yaml#/definitions/uint32 > > > > + description: > > > > + Watchdog timeout in seconds. > > > > > > We need a common schema for this and the node name. > > > > Common schema in dt-schema or in Linux kernel bindings? If the latter, > > I can add it. > > In the kernel is fine. I'll add it in next version then. Best regards, Krzysztof
On Fri, Sep 20, 2019 at 10:52:56AM -0500, Rob Herring wrote: > On Fri, Sep 20, 2019 at 10:46 AM Rob Herring <robh@kernel.org> wrote: > > > > On Wed, Sep 18, 2019 at 6:26 AM Krzysztof Kozlowski <krzk@kernel.org> wrote: > > > > > > On Fri, 13 Sep 2019 at 16:36, Rob Herring <robh@kernel.org> wrote: > > > > > > > > On Sat, Sep 07, 2019 at 04:45:40PM +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> > > > > > --- > > > > > .../bindings/watchdog/samsung-wdt.txt | 35 ---------- > > > > > .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ > > > > > 2 files changed, 69 insertions(+), 35 deletions(-) > > > > > delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt > > > > > create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > > > > > > > > > diff --git a/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > new file mode 100644 > > > > > index 000000000000..39f1ca3bc4db > > > > > --- /dev/null > > > > > +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml > > > > > @@ -0,0 +1,69 @@ > > > > > +# 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). > > > > > + > > > > > + timeout-sec: > > > > > + $ref: /schemas/types.yaml#/definitions/uint32 > > > > > + description: > > > > > + Watchdog timeout in seconds. > > > > > > > > We need a common schema for this and the node name. > > > > > > Common schema in dt-schema or in Linux kernel bindings? If the latter, > > > I can add it. > > > > In the kernel is fine. > > Actually, Maxime has already done one. I see. I'll use them then. Best regards, Krzysztof
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..39f1ca3bc4db --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml @@ -0,0 +1,69 @@ +# 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). + + timeout-sec: + $ref: /schemas/types.yaml#/definitions/uint32 + description: + Watchdog timeout in seconds. + +required: + - compatible + - interrupts + - reg + +allOf: + - 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> --- .../bindings/watchdog/samsung-wdt.txt | 35 ---------- .../bindings/watchdog/samsung-wdt.yaml | 69 +++++++++++++++++++ 2 files changed, 69 insertions(+), 35 deletions(-) delete mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.txt create mode 100644 Documentation/devicetree/bindings/watchdog/samsung-wdt.yaml