Based on git/groeck/linux-staging.git, watchdog-next.
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 MT7986, MT8186, MT8188 and MT8195,
- Fix the watchdog name of mt8516
- Add mt6795 and MT8173 watchdog compatible
Changes since v2:
- Drop Add-support-for-MT6795-Helio-X10-watchdog from series (merged)
- Rebase to watchdog-next (for mt8188)
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/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
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 (4):
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
.../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 +++++++++++++++++++
.../devicetree/bindings/watchdog/mtk-wdt.txt | 43 ----------
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 +-
6 files changed, 84 insertions(+), 50 deletions(-)
create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt
--
2.18.0
MT7986's watchdog embeds a reset controller and needs only the
mediatek,mt7986-wdt compatible string as the MT6589 one is there
for watchdogs that don't have any reset controller capability.
Fixes: 50137c150f5f ("arm64: dts: mediatek: add basic mt7986 support")
Signed-off-by: Allen-KH Cheng <[email protected]>
---
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 72e0d9722e07..6a94cd618772 100644
--- a/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt7986a.dtsi
@@ -119,8 +119,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
From: AngeloGioacchino Del Regno <[email protected]>
MT8195's watchdog embeds a reset controller and needs only the
mediatek,mt8195-wdt compatible string as the MT6589 one is there
for watchdogs that don't have any reset controller capability.
Fixes: 37f2582883be ("arm64: dts: Add mediatek SoC mt8195 and evaluation board")
Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Co-developed-by: Allen-KH Cheng <[email protected]>
Signed-off-by: Allen-KH Cheng <[email protected]>
---
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 905d1a90b406..0b254d245b47 100644
--- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
@@ -683,8 +683,7 @@
};
watchdog: watchdog@10007000 {
- compatible = "mediatek,mt8195-wdt",
- "mediatek,mt6589-wdt";
+ compatible = "mediatek,mt8195-wdt";
mediatek,disable-extrst;
reg = <0 0x10007000 0 0x100>;
#reset-cells = <1>;
--
2.18.0
Add the mediatek,mt8173-wdt compatible using mediatek,mt6589-wdt as
fallback.
Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
Acked-by: Rob Herring <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
---
Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
index 36606524d869..b3605608410c 100644
--- a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
@@ -37,6 +37,7 @@ properties:
- mediatek,mt7622-wdt
- mediatek,mt7623-wdt
- mediatek,mt7629-wdt
+ - mediatek,mt8173-wdt
- mediatek,mt8516-wdt
- const: mediatek,mt6589-wdt
--
2.18.0
From: AngeloGioacchino Del Regno <[email protected]>
MT8186's watchdog embeds a reset controller and needs only the
mediatek,mt8186-wdt compatible string as the MT6589 one is there
for watchdogs that don't have any reset controller capability.
Fixes: 2e78620b1350 ("arm64: dts: Add MediaTek MT8186 dts and evaluation board and Makefile")
Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Co-developed-by: Allen-KH Cheng <[email protected]>
Signed-off-by: Allen-KH Cheng <[email protected]>
---
arch/arm64/boot/dts/mediatek/mt8186.dtsi | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/arch/arm64/boot/dts/mediatek/mt8186.dtsi b/arch/arm64/boot/dts/mediatek/mt8186.dtsi
index 64693c17af9e..e4366144cca5 100644
--- a/arch/arm64/boot/dts/mediatek/mt8186.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8186.dtsi
@@ -330,8 +330,7 @@
};
watchdog: watchdog@10007000 {
- compatible = "mediatek,mt8186-wdt",
- "mediatek,mt6589-wdt";
+ compatible = "mediatek,mt8186-wdt";
mediatek,disable-extrst;
reg = <0 0x10007000 0 0x1000>;
#reset-cells = <1>;
--
2.18.0
From: AngeloGioacchino Del Regno <[email protected]>
Add the mediatek,mt6795-wdt compatible.
Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
Co-developed-by: Allen-KH Cheng <[email protected]>
Signed-off-by: Allen-KH Cheng <[email protected]>
Acked-by: Rob Herring <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
---
Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
index b0d71fa28ac3..36606524d869 100644
--- a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
+++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
@@ -22,6 +22,7 @@ properties:
- enum:
- mediatek,mt2712-wdt
- mediatek,mt6589-wdt
+ - mediatek,mt6795-wdt
- mediatek,mt7986-wdt
- mediatek,mt8183-wdt
- mediatek,mt8186-wdt
--
2.18.0
From: AngeloGioacchino Del Regno <[email protected]>
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 <[email protected]>
Co-developed-by: Allen-KH Cheng <[email protected]>
Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
Reviewed-by: Guenter Roeck <[email protected]>
---
.../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..b0d71fa28ac3
--- /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 <[email protected]>
+
+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: 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>;
-};
--
2.18.0
Il 01/11/22 10:01, Allen-KH Cheng ha scritto:
> MT7986's watchdog embeds a reset controller and needs only the
> mediatek,mt7986-wdt compatible string as the MT6589 one is there
> for watchdogs that don't have any reset controller capability.
>
> Fixes: 50137c150f5f ("arm64: dts: mediatek: add basic mt7986 support")
> Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
On Tue, Nov 01, 2022 at 05:01:10PM +0800, Allen-KH Cheng wrote:
> From: AngeloGioacchino Del Regno <[email protected]>
>
> MT8186's watchdog embeds a reset controller and needs only the
> mediatek,mt8186-wdt compatible string as the MT6589 one is there
> for watchdogs that don't have any reset controller capability.
>
> Fixes: 2e78620b1350 ("arm64: dts: Add MediaTek MT8186 dts and evaluation board and Makefile")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
> Co-developed-by: Allen-KH Cheng <[email protected]>
> Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
On Tue, Nov 01, 2022 at 05:01:12PM +0800, Allen-KH Cheng wrote:
> MT7986's watchdog embeds a reset controller and needs only the
> mediatek,mt7986-wdt compatible string as the MT6589 one is there
> for watchdogs that don't have any reset controller capability.
>
> Fixes: 50137c150f5f ("arm64: dts: mediatek: add basic mt7986 support")
> Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
On Tue, Nov 01, 2022 at 05:01:11PM +0800, Allen-KH Cheng wrote:
> From: AngeloGioacchino Del Regno <[email protected]>
>
> MT8195's watchdog embeds a reset controller and needs only the
> mediatek,mt8195-wdt compatible string as the MT6589 one is there
> for watchdogs that don't have any reset controller capability.
>
> Fixes: 37f2582883be ("arm64: dts: Add mediatek SoC mt8195 and evaluation board")
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
> Co-developed-by: Allen-KH Cheng <[email protected]>
> Signed-off-by: Allen-KH Cheng <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
On Tue, Nov 01, 2022 at 05:01:15PM +0800, Allen-KH Cheng wrote:
> From: AngeloGioacchino Del Regno <[email protected]>
>
> Add the mediatek,mt6795-wdt compatible.
>
> Signed-off-by: AngeloGioacchino Del Regno <[email protected]>
> Co-developed-by: Allen-KH Cheng <[email protected]>
> Signed-off-by: Allen-KH Cheng <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> Reviewed-by: Guenter Roeck <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
Thanks,
N?colas
On Tue, Nov 01, 2022 at 05:01:16PM +0800, Allen-KH Cheng wrote:
> Add the mediatek,mt8173-wdt compatible using mediatek,mt6589-wdt as
> fallback.
>
> Signed-off-by: Allen-KH Cheng <[email protected]>
> Reviewed-by: AngeloGioacchino Del Regno <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> Reviewed-by: Guenter Roeck <[email protected]>
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
Thanks,
N?colas
On Tue, Nov 01, 2022 at 05:01:14PM +0800, Allen-KH Cheng wrote:
[..]
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml
[..]
> +examples:
> + - |
> + #include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> + soc {
> + #address-cells = <2>;
> + #size-cells = <2>;
> +
> + watchdog: watchdog@10007000 {
You could drop this label since it's not used in the example.
Reviewed-by: N?colas F. R. A. Prado <[email protected]>
Thanks,
N?colas
> + 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>;
> + };
> + };
[..]
On Wed, 2022-11-02 at 16:26 -0400, Nícolas F. R. A. Prado wrote:
> On Tue, Nov 01, 2022 at 05:01:14PM +0800, Allen-KH Cheng wrote:
> [..]
> > --- /dev/null
> > +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-
> > wdt.yaml
>
> [..]
> > +examples:
> > + - |
> > + #include <dt-bindings/interrupt-controller/arm-gic.h>
> > +
> > + soc {
> > + #address-cells = <2>;
> > + #size-cells = <2>;
> > +
> > + watchdog: watchdog@10007000 {
>
> You could drop this label since it's not used in the example.
>
> Reviewed-by: Nícolas F. R. A. Prado <[email protected]>
>
> Thanks,
> Nícolas
>
Will do.
Thanks,
Allen
> > + 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>;
> > + };
> > + };
>
> [..]