| Message ID | 20221005113517.70628-4-angelogioacchino.delregno@collabora.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MediaTek watchdog: MT6795 support and YAML conversion | expand |
On Wed, Oct 05, 2022 at 01:35:15PM +0200, AngeloGioacchino Del Regno wrote: > Convert the MediaTek watchdog bindings to schema. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > --- > .../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 +++++++++++++++++++ > .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- > 2 files changed, 80 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..f43b5af92d40 > --- /dev/null > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml > @@ -0,0 +1,80 @@ > +# 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: > + - items: > + - enum: > + - mediatek,mt2712-wdt > + - mediatek,mt6589-wdt > + - mediatek,mt7986-wdt > + - mediatek,mt8183-wdt > + - mediatek,mt8186-wdt > + - mediatek,mt8192-wdt > + - mediatek,mt8195-wdt The original binding only had 4 without a fallback. It's fine to add or change, but note the changes in the commit msg. Are all of these really each unique and not the same? > + - 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 > + > + timeout-sec: true Drop this and use 'unevaluatedProperties'. > + > + '#reset-cells': > + const: 1 > + > +required: > + - compatible > + - reg > + > +additionalProperties: 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>; > + }; > + };
Il 05/10/22 15:38, Rob Herring ha scritto: > On Wed, Oct 05, 2022 at 01:35:15PM +0200, AngeloGioacchino Del Regno wrote: >> Convert the MediaTek watchdog bindings to schema. >> >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> >> --- >> .../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 +++++++++++++++++++ >> .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- >> 2 files changed, 80 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..f43b5af92d40 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml >> @@ -0,0 +1,80 @@ >> +# 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: >> + - items: >> + - enum: >> + - mediatek,mt2712-wdt >> + - mediatek,mt6589-wdt >> + - mediatek,mt7986-wdt >> + - mediatek,mt8183-wdt >> + - mediatek,mt8186-wdt >> + - mediatek,mt8192-wdt >> + - mediatek,mt8195-wdt > > The original binding only had 4 without a fallback. It's fine to add or > change, but note the changes in the commit msg. Are all of these really > each unique and not the same? > Ok I will note the changes in the commit for v2. And... yes, they're really each unique and not the same, as these are exposing a reset controller of their own (as well with different platform data in the driver). > >> + - 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 >> + >> + timeout-sec: true > > Drop this and use 'unevaluatedProperties'. > Noted. Will do for v2. Thanks! Angelo
On 05/10/2022 13:35, AngeloGioacchino Del Regno wrote: > Convert the MediaTek watchdog bindings to schema. > > Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> There is already work in progress: https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ Best regards, Krzysztof
Hi Krzysztof, Thanks for the reminder. There is also a series [1] for mediatek watchdog. I would have to wait until [2] merged before sending a series for "Convert mtk-wdt" in order to prevent a conflict, but [2] has not yet been merged. [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=661669 [2] https://lore.kernel.org/all/20220920105622.25666-2-Runyang.Chen@mediatek.com/ Best regards, Allen On Wed, 2022-10-05 at 18:33 +0200, Krzysztof Kozlowski wrote: > On 05/10/2022 13:35, AngeloGioacchino Del Regno wrote: > > Convert the MediaTek watchdog bindings to schema. > > > > Signed-off-by: AngeloGioacchino Del Regno < > > angelogioacchino.delregno@collabora.com> > > There is already work in progress: > > https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ > > Best regards, > Krzysztof >
Il 05/10/22 18:33, Krzysztof Kozlowski ha scritto: > On 05/10/2022 13:35, AngeloGioacchino Del Regno wrote: >> Convert the MediaTek watchdog bindings to schema. >> >> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> > > There is already work in progress: > > https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ > > Best regards, > Krzysztof > I'm sorry, I forgot about that. Allen, how do we proceed? Do you want to send a new version of yours, or should I go on with a v2 for this one? Regards, Angelo
Hi Angelo, I can send a new version with this series. Thanks for help convert schema. Best regards, Allen On Thu, 2022-10-06 at 10:36 +0200, AngeloGioacchino Del Regno wrote: > Il 05/10/22 18:33, Krzysztof Kozlowski ha scritto: > > On 05/10/2022 13:35, AngeloGioacchino Del Regno wrote: > > > Convert the MediaTek watchdog bindings to schema. > > > > > > Signed-off-by: AngeloGioacchino Del Regno < > > > angelogioacchino.delregno@collabora.com> > > > > There is already work in progress: > > > > https://lore.kernel.org/all/20220422121017.23920-3-allen-kh.cheng@mediatek.com/ > > > > Best regards, > > Krzysztof > > > > I'm sorry, I forgot about that. > > Allen, how do we proceed? Do you want to send a new version of yours, > or should > I go on with a v2 for this one? > > Regards, > Angelo
Il 06/10/22 10:43, Allen-KH Cheng (程冠勳) ha scritto: > Hi Angelo, > > I can send a new version with this series. > > Thanks for help convert schema. > That's perfect! I will wait for your new version then. Thank you! Angelo
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..f43b5af92d40 --- /dev/null +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml @@ -0,0 +1,80 @@ +# 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: + - items: + - 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 + + timeout-sec: true + + '#reset-cells': + const: 1 + +required: + - compatible + - reg + +additionalProperties: 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>; -};
Convert the MediaTek watchdog bindings to schema. Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> --- .../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 +++++++++++++++++++ .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ---------- 2 files changed, 80 insertions(+), 42 deletions(-) create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt