* [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML
@ 2022-07-14 12:50 Allen-KH Cheng
2022-07-14 12:50 ` [PATCH v2 1/4] " Allen-KH Cheng
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Allen-KH Cheng @ 2022-07-14 12:50 UTC (permalink / raw)
To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski,
Matthias Brugger, Rob Herring, nfraprado
Cc: Project_Global_Chrome_Upstream_Group, devicetree,
linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai,
Allen-KH Cheng
Based on tag: next-20220712, linux-next/master
Add some PATCHs to fix dtbs_check warnings.
changes since v1:
- fix dtbs_check warnings in dts
- use enum instead of multiple const values
- remove timeout-sec
- rewrite examples
- rename schema to mediatek,wdt.yaml
Allen-KH Cheng (4):
dt-bindings: watchdog: mediatek: Convert binding to YAML
arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt7986
arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195
arm64: dts: mediatek: Fix the watchdog node name
.../bindings/watchdog/mediatek,wdt.yaml | 64 +++++++++++++++++++
.../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ------------
arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +-
arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +-
arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +-
5 files changed, 67 insertions(+), 47 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,wdt.yaml
delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
--
2.18.0
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v2 1/4] dt-bindings: watchdog: mediatek: Convert binding to YAML 2022-07-14 12:50 [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML Allen-KH Cheng @ 2022-07-14 12:50 ` Allen-KH Cheng 2022-07-18 16:04 ` Matthias Brugger 2022-07-14 12:50 ` [PATCH v2 2/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt7986 Allen-KH Cheng ` (2 subsequent siblings) 3 siblings, 1 reply; 6+ messages in thread From: Allen-KH Cheng @ 2022-07-14 12:50 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski, Matthias Brugger, Rob Herring, nfraprado Cc: Project_Global_Chrome_Upstream_Group, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai, Allen-KH Cheng 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 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>; -}; -- 2.18.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2 1/4] dt-bindings: watchdog: mediatek: Convert binding to YAML 2022-07-14 12:50 ` [PATCH v2 1/4] " Allen-KH Cheng @ 2022-07-18 16:04 ` Matthias Brugger 0 siblings, 0 replies; 6+ messages in thread From: Matthias Brugger @ 2022-07-18 16:04 UTC (permalink / raw) To: Allen-KH Cheng, Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski, Rob Herring, nfraprado Cc: Project_Global_Chrome_Upstream_Group, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai 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>; > -}; ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2 2/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt7986 2022-07-14 12:50 [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 1/4] " Allen-KH Cheng @ 2022-07-14 12:50 ` Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 3/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195 Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 4/4] arm64: dts: mediatek: Fix the watchdog node name Allen-KH Cheng 3 siblings, 0 replies; 6+ messages in thread From: Allen-KH Cheng @ 2022-07-14 12:50 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski, Matthias Brugger, Rob Herring, nfraprado Cc: Project_Global_Chrome_Upstream_Group, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai, Allen-KH Cheng The watchdog driver for mt7986 relies on DT data. The fallback compatible "mediatek,mt6589-wdt" won't work. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> --- arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi index e3a407d03551..6ab8329c635f 100644 --- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi @@ -113,8 +113,7 @@ }; watchdog: watchdog@1001c000 { - compatible = "mediatek,mt7986-wdt", - "mediatek,mt6589-wdt"; + compatible = "mediatek,mt7986-wdt"; reg = <0 0x1001c000 0 0x1000>; interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>; #reset-cells = <1>; -- 2.18.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 3/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195 2022-07-14 12:50 [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 1/4] " Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 2/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt7986 Allen-KH Cheng @ 2022-07-14 12:50 ` Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 4/4] arm64: dts: mediatek: Fix the watchdog node name Allen-KH Cheng 3 siblings, 0 replies; 6+ messages in thread From: Allen-KH Cheng @ 2022-07-14 12:50 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski, Matthias Brugger, Rob Herring, nfraprado Cc: Project_Global_Chrome_Upstream_Group, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai, Allen-KH Cheng The watchdog driver for mt8195 relies on DT data. The fallback compatible "mediatek,mt6589-wdt" won't work. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> --- arch/arm64/boot/dts/mediatek/mt8195.dtsi | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi index 066c14989708..31bf4bb97824 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -325,8 +325,7 @@ }; watchdog: watchdog@10007000 { - compatible = "mediatek,mt8195-wdt", - "mediatek,mt6589-wdt"; + compatible = "mediatek,mt8195-wdt"; reg = <0 0x10007000 0 0x100>; }; -- 2.18.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH v2 4/4] arm64: dts: mediatek: Fix the watchdog node name 2022-07-14 12:50 [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML Allen-KH Cheng ` (2 preceding siblings ...) 2022-07-14 12:50 ` [PATCH v2 3/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195 Allen-KH Cheng @ 2022-07-14 12:50 ` Allen-KH Cheng 3 siblings, 0 replies; 6+ messages in thread From: Allen-KH Cheng @ 2022-07-14 12:50 UTC (permalink / raw) To: Wim Van Sebroeck, Guenter Roeck, Krzysztof Kozlowski, Matthias Brugger, Rob Herring, nfraprado Cc: Project_Global_Chrome_Upstream_Group, devicetree, linux-arm-kernel, linux-kernel, linux-mediatek, Chen-Yu Tsai, Allen-KH Cheng The proper name is 'watchdog', not 'toprgu'. Signed-off-by: Allen-KH Cheng <allen-kh.cheng@mediatek.com> --- arch/arm64/boot/dts/mediatek/mt8516.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8516.dtsi b/arch/arm64/boot/dts/mediatek/mt8516.dtsi index d1b67c82d761..fff59dc1b4d7 100644 --- a/arch/arm64/boot/dts/mediatek/mt8516.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8516.dtsi @@ -202,7 +202,7 @@ #clock-cells = <1>; }; - toprgu: toprgu@10007000 { + toprgu: watchdog@10007000 { compatible = "mediatek,mt8516-wdt", "mediatek,mt6589-wdt"; reg = <0 0x10007000 0 0x1000>; -- 2.18.0 ^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-07-18 16:04 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-07-14 12:50 [PATCH v2 0/4] dt-bindings: watchdog: mediatek: Convert binding to YAML Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 1/4] " Allen-KH Cheng 2022-07-18 16:04 ` Matthias Brugger 2022-07-14 12:50 ` [PATCH v2 2/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt7986 Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 3/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195 Allen-KH Cheng 2022-07-14 12:50 ` [PATCH v2 4/4] arm64: dts: mediatek: Fix the watchdog node name Allen-KH Cheng
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).