| Message ID | 20220714125044.20403-2-allen-kh.cheng@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | dt-bindings: watchdog: mediatek: Convert binding to YAML | expand |
On 14/07/2022 14:50, Allen-KH Cheng wrote: > Convert Mediatek watchdog devicetree binding to YAML. > You are also fixing the fallback compatible here. > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > --- > .../bindings/watchdog/mediatek,wdt.yaml | 64 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ------------ > 2 files changed, 64 insertions(+), 42 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > new file mode 100644 > index 000000000000..cb90d89b9f5d > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > @@ -0,0 +1,64 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/watchdog/mediatek,wdt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: MediatTek SoCs Watchdog timer > + > +maintainers: > + - Runyang Chen <runyang.chen@mediatek.com> > + > +allOf: > + - $ref: "watchdog.yaml#" > + > +properties: > + compatible: > + oneOf: > + - enum: > + - mediatek,mt2712-wdt > + - mediatek,mt6589-wdt > + - mediatek,mt7986-wdt > + - mediatek,mt8183-wdt > + - mediatek,mt8186-wdt > + - mediatek,mt8192-wdt > + - mediatek,mt8195-wdt > + - items: > + - enum: > + - mediatek,mt2701-wdt missing mt6582-wdt, mediatek,mt7623-wdt and more. I'd advise split this up in two patches. One fixing the fallback compatible and the second one converting to yaml (or the other way round). In any case make sure you have all compatibles in the end. Regards, Matthias > + - mediatek,mt6797-wdt > + - mediatek,mt7622-wdt > + - mediatek,mt8516-wdt > + - mediatek,mt8173-wdt > + - const: mediatek,mt6589-wdt > + > + reg: > + maxItems: 1 > + > + interrupts: > + maxItems: 1 > + > + '#reset-cells': > + const: 1 > + > + mediatek,disable-extrst: > + type: boolean > + description: disable send output reset signal > + > +required: > + - compatible > + - reg > + > +unevaluatedProperties: false > + > +examples: > + - | > + > + watchdog@10007000 { > + compatible = "mediatek,mt8186-wdt"; > + reg = <0x10007000 0x100>; > + mediatek,disable-extrst; > + #reset-cells = <1>; > + }; > + > +... > diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > deleted file mode 100644 > index 762c62e428ef..000000000000 > --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > +++ /dev/null > @@ -1,42 +0,0 @@ > -Mediatek SoCs Watchdog timer > - > -The watchdog supports a pre-timeout interrupt that fires timeout-sec/2 > -before the expiry. > - > -Required properties: > - > -- compatible should contain: > - "mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701 > - "mediatek,mt2712-wdt": for MT2712 > - "mediatek,mt6582-wdt", "mediatek,mt6589-wdt": for MT6582 > - "mediatek,mt6589-wdt": for MT6589 > - "mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797 > - "mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622 > - "mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623 > - "mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629 > - "mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986 > - "mediatek,mt8183-wdt": for MT8183 > - "mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186 > - "mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516 > - "mediatek,mt8192-wdt": for MT8192 > - "mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195 > - > -- reg : Specifies base physical address and size of the registers. > - > -Optional properties: > -- mediatek,disable-extrst: disable send output reset signal > -- interrupts: Watchdog pre-timeout (bark) interrupt. > -- timeout-sec: contains the watchdog timeout in seconds. > -- #reset-cells: Should be 1. > - > -Example: > - > -watchdog: watchdog@10007000 { > - compatible = "mediatek,mt8183-wdt", > - "mediatek,mt6589-wdt"; > - mediatek,disable-extrst; > - reg = <0 0x10007000 0 0x100>; > - interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>; > - timeout-sec = <10>; > - #reset-cells = <1>; > -};
Hi Matthias, On Mon, 2022-07-18 at 18:04 +0200, Matthias Brugger wrote: > > On 14/07/2022 14:50, Allen-KH Cheng wrote: > > Convert Mediatek watchdog devicetree binding to YAML. > > > > You are also fixing the fallback compatible here. > Oh, I will add those into commit message. > > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > > --- > > .../bindings/watchdog/mediatek,wdt.yaml | 64 > > +++++++++++++++++++ > > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ------------ > > 2 files changed, 64 insertions(+), 42 deletions(-) > > create mode 100644 > > Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > > delete mode 100644 > > Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > > > diff --git > > a/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > > b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > > new file mode 100644 > > index 000000000000..cb90d89b9f5d > > --- /dev/null > > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml > > @@ -0,0 +1,64 @@ > > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > > +%YAML 1.2 > > +--- > > +$id: > > https://urldefense.com/v3/__http://devicetree.org/schemas/watchdog/mediatek,wdt.yaml*__;Iw!!CTRNKA9wMg0ARbw!xzpsTCQSKgCvQ7nE87H8t8uuf4nXwQouO370rg8gVf0cGfdoH1ZunLCrJI9ZM1wKzgFH_A$ > > > > +$schema: > > https://urldefense.com/v3/__http://devicetree.org/meta-schemas/core.yaml*__;Iw!!CTRNKA9wMg0ARbw!xzpsTCQSKgCvQ7nE87H8t8uuf4nXwQouO370rg8gVf0cGfdoH1ZunLCrJI9ZM1y_onVgvA$ > > > > + > > +title: MediatTek SoCs Watchdog timer > > + > > +maintainers: > > + - Runyang Chen <runyang.chen@mediatek.com> > > + > > +allOf: > > + - $ref: "watchdog.yaml#" > > + > > +properties: > > + compatible: > > + oneOf: > > + - enum: > > + - mediatek,mt2712-wdt > > + - mediatek,mt6589-wdt > > + - mediatek,mt7986-wdt > > + - mediatek,mt8183-wdt > > + - mediatek,mt8186-wdt > > + - mediatek,mt8192-wdt > > + - mediatek,mt8195-wdt > > + - items: > > + - enum: > > + - mediatek,mt2701-wdt > > missing mt6582-wdt, mediatek,mt7623-wdt and more. > I'd advise split this up in two patches. One fixing the fallback > compatible and > the second one converting to yaml (or the other way round). In any > case make > sure you have all compatibles in the end. > > Regards, > Matthias > My carelessness, I ran dtbs_check but didn't see those compatible warnings. I will check all compatible again from bindings and split differnet PATCHs. Thanks for the reminder Best Regards, Allen > > + - mediatek,mt6797-wdt > > + - mediatek,mt7622-wdt > > + - mediatek,mt8516-wdt > > + - mediatek,mt8173-wdt > > + - const: mediatek,mt6589-wdt > > + > > + reg: > > + maxItems: 1 > > + > > + interrupts: > > + maxItems: 1 > > + > > + '#reset-cells': > > + const: 1 > > + > > + mediatek,disable-extrst: > > + type: boolean > > + description: disable send output reset signal > > + > > +required: > > + - compatible > > + - reg > > + > > +unevaluatedProperties: false > > + > > +examples: > > + - | > > + > > + watchdog@10007000 { > > + compatible = "mediatek,mt8186-wdt"; > > + reg = <0x10007000 0x100>; > > + mediatek,disable-extrst; > > + #reset-cells = <1>; > > + }; > > + > > +... > > diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > deleted file mode 100644 > > index 762c62e428ef..000000000000 > > --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > +++ /dev/null > > @@ -1,42 +0,0 @@ > > -Mediatek SoCs Watchdog timer > > - > > -The watchdog supports a pre-timeout interrupt that fires timeout- > > sec/2 > > -before the expiry. > > - > > -Required properties: > > - > > -- compatible should contain: > > - "mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701 > > - "mediatek,mt2712-wdt": for MT2712 > > - "mediatek,mt6582-wdt", "mediatek,mt6589-wdt": for MT6582 > > - "mediatek,mt6589-wdt": for MT6589 > > - "mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797 > > - "mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622 > > - "mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623 > > - "mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629 > > - "mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986 > > - "mediatek,mt8183-wdt": for MT8183 > > - "mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186 > > - "mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516 > > - "mediatek,mt8192-wdt": for MT8192 > > - "mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195 > > - > > -- reg : Specifies base physical address and size of the registers. > > - > > -Optional properties: > > -- mediatek,disable-extrst: disable send output reset signal > > -- interrupts: Watchdog pre-timeout (bark) interrupt. > > -- timeout-sec: contains the watchdog timeout in seconds. > > -- #reset-cells: Should be 1. > > - > > -Example: > > - > > -watchdog: watchdog@10007000 { > > - compatible = "mediatek,mt8183-wdt", > > - "mediatek,mt6589-wdt"; > > - mediatek,disable-extrst; > > - reg = <0 0x10007000 0 0x100>; > > - interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>; > > - timeout-sec = <10>; > > - #reset-cells = <1>; > > -};
diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml new file mode 100644 index 000000000000..cb90d89b9f5d --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml @@ -0,0 +1,64 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/mediatek,wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediatTek SoCs Watchdog timer + +maintainers: + - Runyang Chen <runyang.chen@mediatek.com> + +allOf: + - $ref: "watchdog.yaml#" + +properties: + compatible: + oneOf: + - enum: + - mediatek,mt2712-wdt + - mediatek,mt6589-wdt + - mediatek,mt7986-wdt + - mediatek,mt8183-wdt + - mediatek,mt8186-wdt + - mediatek,mt8192-wdt + - mediatek,mt8195-wdt + - items: + - enum: + - mediatek,mt2701-wdt + - mediatek,mt6797-wdt + - mediatek,mt7622-wdt + - mediatek,mt8516-wdt + - mediatek,mt8173-wdt + - const: mediatek,mt6589-wdt + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + '#reset-cells': + const: 1 + + mediatek,disable-extrst: + type: boolean + description: disable send output reset signal + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + + watchdog@10007000 { + compatible = "mediatek,mt8186-wdt"; + reg = <0x10007000 0x100>; + mediatek,disable-extrst; + #reset-cells = <1>; + }; + +... diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt deleted file mode 100644 index 762c62e428ef..000000000000 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ /dev/null @@ -1,42 +0,0 @@ -Mediatek SoCs Watchdog timer - -The watchdog supports a pre-timeout interrupt that fires timeout-sec/2 -before the expiry. - -Required properties: - -- compatible should contain: - "mediatek,mt2701-wdt", "mediatek,mt6589-wdt": for MT2701 - "mediatek,mt2712-wdt": for MT2712 - "mediatek,mt6582-wdt", "mediatek,mt6589-wdt": for MT6582 - "mediatek,mt6589-wdt": for MT6589 - "mediatek,mt6797-wdt", "mediatek,mt6589-wdt": for MT6797 - "mediatek,mt7622-wdt", "mediatek,mt6589-wdt": for MT7622 - "mediatek,mt7623-wdt", "mediatek,mt6589-wdt": for MT7623 - "mediatek,mt7629-wdt", "mediatek,mt6589-wdt": for MT7629 - "mediatek,mt7986-wdt", "mediatek,mt6589-wdt": for MT7986 - "mediatek,mt8183-wdt": for MT8183 - "mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186 - "mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516 - "mediatek,mt8192-wdt": for MT8192 - "mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195 - -- reg : Specifies base physical address and size of the registers. - -Optional properties: -- mediatek,disable-extrst: disable send output reset signal -- interrupts: Watchdog pre-timeout (bark) interrupt. -- timeout-sec: contains the watchdog timeout in seconds. -- #reset-cells: Should be 1. - -Example: - -watchdog: watchdog@10007000 { - compatible = "mediatek,mt8183-wdt", - "mediatek,mt6589-wdt"; - mediatek,disable-extrst; - reg = <0 0x10007000 0 0x100>; - interrupts = <GIC_SPI 139 IRQ_TYPE_NONE>; - timeout-sec = <10>; - #reset-cells = <1>; -};
Convert Mediatek watchdog devicetree binding to YAML. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> --- .../bindings/watchdog/mediatek,wdt.yaml | 64 +++++++++++++++++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ------------ 2 files changed, 64 insertions(+), 42 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt