| Message ID | 20221007093437.12228-1-allen-kh.cheng@mediatek.com |
|---|---|
| Headers | show |
| Series | MediaTek watchdog: Convert mtk-wdt.txt to dt-schema | expand |
On Fri, 07 Oct 2022 17:34:34 +0800, 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" 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> > --- > .../bindings/watchdog/mediatek,mtk-wdt.yaml | 77 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- > 2 files changed, 77 insertions(+), 42 deletions(-) > create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt > Reviewed-by: Rob Herring <robh@kernel.org>
On 10/7/22 02:34, 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" 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: Guenter Roeck <linux@roeck-us.net> > --- > .../bindings/watchdog/mediatek,mtk-wdt.yaml | 77 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- > 2 files changed, 77 insertions(+), 42 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..6805fbeace11 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > @@ -0,0 +1,77 @@ > +# 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,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: 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 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>; > -};
Based on tag: next-20221007 linux-next/master, We use [1] and [2] as references to send a new series. This series converts mtk-wdt.txt to dt-schema and contains - Fix watchdog compatibles for MT8186, MT7986 and MT8195, - Fix the watchdog name of mt8516 - Add mt6795 and MT8173 watchdog compatible - Add support for toprgu reset on the MediaTek Helio X10 MT6795 SoC. Changes since v1: - Drop "items" for a single enum Changes since [1]: - Update the commit message with some details - Drop "timeout-sec: true" and use unevaluatedProperties [1] https://lore.kernel.org/all/20221005113517.70628-1-angelogioacchino.delregno@collabora.com/ [2] https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ Allen-KH Cheng (3): arm64: dts: mediatek: mt7986: Fix watchdog compatible arm64: dts: mediatek: mt8516: Fix the watchdog node name dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT8173 AngeloGioacchino Del Regno (5): arm64: dts: mediatek: mt8186: Fix watchdog compatible arm64: dts: mediatek: mt8195: Fix watchdog compatible dt-bindings: watchdog: mediatek: Convert mtk-wdt to json-schema dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT6795 watchdog: mtk_wdt: Add support for MT6795 Helio X10 watchdog and toprgu .../bindings/watchdog/mediatek,mtk-wdt.yaml | 79 +++++++++++++++++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +- arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +- drivers/watchdog/mtk_wdt.c | 6 ++ 7 files changed, 89 insertions(+), 49 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt