| Message ID | 20221108033209.22751-6-allen-kh.cheng@mediatek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | MediaTek watchdog: Convert mtk-wdt.txt to dt-schema | expand |
On 08/11/2022 04:32, Allen-KH Cheng wrote: > From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > Convert the MediaTek watchdog bindings to schema. > > The original binding only had 4 without a fallback but there is a reset > controller on the "mediatek,mt7986-wdt", "mediatek,mt8186-wdt", > "mediatek,mt8188-wdt" and "mediatek,mt8195-wdt" Since there is no reset > controller for the mt6589, we remove "mediatek,mt6589-wdt" as a > fallback. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > Co-developed-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > Reviewed-by: Rob Herring <robh@kernel.org> > Reviewed-by: Guenter Roeck <linux@roeck-us.net> > Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> As I'm put as the maintainer: Acked-by: Matthias Brugger <matthias.bgg@gmail.com> Shall I take that through my tree or shall it go through the watchdog tree? Regards, Matthias > --- > .../bindings/watchdog/mediatek,mtk-wdt.yaml | 78 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 43 ---------- > 2 files changed, 78 insertions(+), 43 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > > diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > new file mode 100644 > index 000000000000..b3d2273f323b > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > @@ -0,0 +1,78 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/watchdog/mediatek,mtk-wdt.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: MediaTek SoCs Watchdog timer > + > +maintainers: > + - Matthias Brugger <matthias.bgg@gmail.com> > + > +description: > + The watchdog supports a pre-timeout interrupt that fires > + timeout-sec/2 before the expiry. > + > +allOf: > + - $ref: watchdog.yaml# > + > +properties: > + compatible: > + oneOf: > + - enum: > + - mediatek,mt2712-wdt > + - mediatek,mt6589-wdt > + - mediatek,mt7986-wdt > + - mediatek,mt8183-wdt > + - mediatek,mt8186-wdt > + - mediatek,mt8188-wdt > + - mediatek,mt8192-wdt > + - mediatek,mt8195-wdt > + - items: > + - enum: > + - mediatek,mt2701-wdt > + - mediatek,mt6582-wdt > + - mediatek,mt6797-wdt > + - mediatek,mt7622-wdt > + - mediatek,mt7623-wdt > + - mediatek,mt7629-wdt > + - mediatek,mt8516-wdt > + - const: mediatek,mt6589-wdt > + > + reg: > + maxItems: 1 > + > + interrupts: > + items: > + - description: Watchdog pre-timeout (bark) interrupt > + > + mediatek,disable-extrst: > + description: Disable sending output reset signal > + type: boolean > + > + '#reset-cells': > + const: 1 > + > +required: > + - compatible > + - reg > + > +unevaluatedProperties: false > + > +examples: > + - | > + #include <dt-bindings/interrupt-controller/arm-gic.h> > + > + soc { > + #address-cells = <2>; > + #size-cells = <2>; > + > + watchdog@10007000 { > + compatible = "mediatek,mt8183-wdt"; > + reg = <0 0x10007000 0 0x100>; > + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>; > + mediatek,disable-extrst; > + timeout-sec = <10>; > + #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 b900c85d4560..000000000000 > --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > +++ /dev/null > @@ -1,43 +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,mt8188-wdt", "mediatek,mt6589-wdt": for MT8188 > - "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>; > -};
On 08/11/2022 11:50, Matthias Brugger wrote: > > > On 08/11/2022 04:32, Allen-KH Cheng wrote: >> From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> >> Convert the MediaTek watchdog bindings to schema. >> >> The original binding only had 4 without a fallback but there is a reset >> controller on the "mediatek,mt7986-wdt", "mediatek,mt8186-wdt", >> "mediatek,mt8188-wdt" and "mediatek,mt8195-wdt" Since there is no reset >> controller for the mt6589, we remove "mediatek,mt6589-wdt" as a >> fallback. >> >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> Co-developed-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> >> Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> >> Reviewed-by: Rob Herring <robh@kernel.org> >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> >> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> > > As I'm put as the maintainer: > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > > Shall I take that through my tree or shall it go through the watchdog tree? > In general, bindings should go via subsystem trees (so watchdog), just like drivers. However this got Guenter's review tag, so usually it means also an ack... Dunno... :) Best regards, Krzysztof
On Wed, Nov 09, 2022 at 10:04:09AM +0100, Krzysztof Kozlowski wrote: > On 08/11/2022 11:50, Matthias Brugger wrote: > > > > > > On 08/11/2022 04:32, Allen-KH Cheng wrote: > >> From: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > >> > >> Convert the MediaTek watchdog bindings to schema. > >> > >> The original binding only had 4 without a fallback but there is a reset > >> controller on the "mediatek,mt7986-wdt", "mediatek,mt8186-wdt", > >> "mediatek,mt8188-wdt" and "mediatek,mt8195-wdt" Since there is no reset > >> controller for the mt6589, we remove "mediatek,mt6589-wdt" as a > >> fallback. > >> > >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > >> Co-developed-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > >> Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> > >> Reviewed-by: Rob Herring <robh@kernel.org> > >> Reviewed-by: Guenter Roeck <linux@roeck-us.net> > >> Reviewed-by: Nícolas F. R. A. Prado <nfraprado@collabora.com> > > > > As I'm put as the maintainer: > > Acked-by: Matthias Brugger <matthias.bgg@gmail.com> > > > > Shall I take that through my tree or shall it go through the watchdog tree? > > > > In general, bindings should go via subsystem trees (so watchdog), just > like drivers. However this got Guenter's review tag, so usually it means > also an ack... Dunno... :) For watchdog patches, if I send a Reviewed-by: tag, I expect Wim to pick up the patch through the watchdog tree. If I expect some other tree to pick it up, I use Acked-by: and usually add a note saying that I assume that the patch will be picked up by someone else. I usually also add watchdog patches to my own watchdog-next tree as reference for Wim. I already have several mediatek devicetree patches queued there. Handling some of the patches through watchdog and others through some other tree would create a mess. Please don't do that. Guenter
diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml new file mode 100644 index 000000000000..b3d2273f323b --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml @@ -0,0 +1,78 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/watchdog/mediatek,mtk-wdt.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: MediaTek SoCs Watchdog timer + +maintainers: + - Matthias Brugger <matthias.bgg@gmail.com> + +description: + The watchdog supports a pre-timeout interrupt that fires + timeout-sec/2 before the expiry. + +allOf: + - $ref: watchdog.yaml# + +properties: + compatible: + oneOf: + - enum: + - mediatek,mt2712-wdt + - mediatek,mt6589-wdt + - mediatek,mt7986-wdt + - mediatek,mt8183-wdt + - mediatek,mt8186-wdt + - mediatek,mt8188-wdt + - mediatek,mt8192-wdt + - mediatek,mt8195-wdt + - items: + - enum: + - mediatek,mt2701-wdt + - mediatek,mt6582-wdt + - mediatek,mt6797-wdt + - mediatek,mt7622-wdt + - mediatek,mt7623-wdt + - mediatek,mt7629-wdt + - mediatek,mt8516-wdt + - const: mediatek,mt6589-wdt + + reg: + maxItems: 1 + + interrupts: + items: + - description: Watchdog pre-timeout (bark) interrupt + + mediatek,disable-extrst: + description: Disable sending output reset signal + type: boolean + + '#reset-cells': + const: 1 + +required: + - compatible + - reg + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/arm-gic.h> + + soc { + #address-cells = <2>; + #size-cells = <2>; + + watchdog@10007000 { + compatible = "mediatek,mt8183-wdt"; + reg = <0 0x10007000 0 0x100>; + interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_LOW>; + mediatek,disable-extrst; + timeout-sec = <10>; + #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 b900c85d4560..000000000000 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ /dev/null @@ -1,43 +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,mt8188-wdt", "mediatek,mt6589-wdt": for MT8188 - "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>; -};