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/[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 (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
--
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 6805fbeace11..855cebc87fb0 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]>
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