From patchwork Wed Oct 5 11:35:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12999153 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 35855C433FE for ; Wed, 5 Oct 2022 11:40:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230354AbiJELkJ (ORCPT ); Wed, 5 Oct 2022 07:40:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50826 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230339AbiJELjt (ORCPT ); Wed, 5 Oct 2022 07:39:49 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8801A785AA; Wed, 5 Oct 2022 04:36:23 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id CE1ED66022F1; Wed, 5 Oct 2022 12:35:35 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1664969736; bh=Q22qlsylohLOvHhECyt/assrAuDmWPjWk2cOuhRGCXc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Sc6dPw450MLDFyHObUnLsbqsQrO4dPvVuEqNpPlk51PTc5TDJoSjKz06ZTyqc1v92 ksat8+Bsks9UdmG0UHrQNC6BGTlYFkrUC5FCmyNm+2JIfwiVVH3OBZy2rGC8qxm0wq XO6OxPpVcc8x8RWU402+C7UlSV+4y5ozUp8MgSywBKyNa713PVivvOOUXViayN66oV X/DMSQNrTZKnzR4DnEq8tH/Ex3dmh1s/jm7sUeOMWy8vD+WTAJqnSUdzBTgctCyP+A hQk3RKKdQuA6vB6R+3uzg35DxhfmwGwfKdyYrpgso4LYmkktQwXs+TZzznn0BZTXOI k0waW+yM8ecOw== From: AngeloGioacchino Del Regno To: wim@linux-watchdog.org Cc: linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, allen-kh.cheng@mediatek.com, seiya.wang@mediatek.com, angelogioacchino.delregno@collabora.com, tinghan.shen@mediatek.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] arm64: dts: mediatek: mt8186: Fix watchdog compatible Date: Wed, 5 Oct 2022 13:35:13 +0200 Message-Id: <20221005113517.70628-2-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> References: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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 --- 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 @@ pio: pinctrl@10005000 { }; 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>; From patchwork Wed Oct 5 11:35:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12999155 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 83F43C433FE for ; Wed, 5 Oct 2022 11:40:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230222AbiJELk1 (ORCPT ); Wed, 5 Oct 2022 07:40:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230217AbiJELkD (ORCPT ); Wed, 5 Oct 2022 07:40:03 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6183C75397; Wed, 5 Oct 2022 04:37:14 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id B07E666022F7; Wed, 5 Oct 2022 12:35:36 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1664969737; bh=PxitsQwCWAwAr+2+HSMcJXNyusgMJ8PPadXjCl+pj+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NEheWfddh4LNq6ARzKNjiAA/5fLVUHYP8FRaitDeHkLNj/SkrvbjAFn5uJBJqD9rI yxz2m0W8pzBWIAhnTOxAR3eAYgPjOFABaEfTTFNp2w++Bry2p4gu5s82O6hnT7GSkj Kf6Z8EKdp8PfsuKLEeHFf/MQ/4j70/JDLKzTIHXI6CK3sys5itOL2wZ6CW1EfwRM+T FXHdmRSwpCkqIX8twgKxsRjPWs3Coq+QQ0XxR/Jesg12UTLlFX/wr33O9dsu/45Iup heuKdxarORmrdQtiUNUwIl2YRm6wWhnKAYFxKUv2ZA/J9g0i9Vd7D2S61F4mWnZgk2 FtYcUnLWEZ46A== From: AngeloGioacchino Del Regno To: wim@linux-watchdog.org Cc: linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, allen-kh.cheng@mediatek.com, seiya.wang@mediatek.com, angelogioacchino.delregno@collabora.com, tinghan.shen@mediatek.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] arm64: dts: mediatek: mt8195: Fix watchdog compatible Date: Wed, 5 Oct 2022 13:35:14 +0200 Message-Id: <20221005113517.70628-3-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> References: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org 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 --- 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 0b85b5874a4f..58ed83d97cc3 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi @@ -683,8 +683,7 @@ power-domain@MT8195_POWER_DOMAIN_AUDIO { }; 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>; From patchwork Wed Oct 5 11:35:15 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12999157 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C2D28C433F5 for ; Wed, 5 Oct 2022 11:41:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230309AbiJELlH (ORCPT ); Wed, 5 Oct 2022 07:41:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51118 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230122AbiJELkp (ORCPT ); Wed, 5 Oct 2022 07:40:45 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D554F7A50C; Wed, 5 Oct 2022 04:38:00 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 9284366022F8; Wed, 5 Oct 2022 12:35:37 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1664969738; bh=3t7BDTuD27Hzn+PWYye7KW5kxqz4FnjQqvH/Ul9Or9s=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=O9g3zdbMO4lO+2i/SRgQYg7EaM8oExhDfmVqCi05WaC39n4baw4xEPO2T9urtMlOE CIyIepD4V2WE+34PghHaO+NFOWaPlb6vZZ3R5sCFSMAbtLn1zxbfizxi4JmNg5RLuH Y1WxjhZ5p2NW3Zg3IhuEb21R8vwSnySxwdjbhmfrthzx1m4WahnDqok2crWyPIAvud qXhFQjL5GzZBruECTEIIahRCDisSQbkWn/tEIl3on0m/A0FkS9KI9Yu1kRkDEzSzOP yAhuuJ6MtHhRJoJQmfdD6x6pARRldLJdspWdQ/JmaEqg5/Pz4Ml34l6LM5gm7q+SZ+ SwXoMSmNrrOSQ== From: AngeloGioacchino Del Regno To: wim@linux-watchdog.org Cc: linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, allen-kh.cheng@mediatek.com, seiya.wang@mediatek.com, angelogioacchino.delregno@collabora.com, tinghan.shen@mediatek.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] dt-bindings: watchdog: mediatek: Convert mtk-wdt to json-schema Date: Wed, 5 Oct 2022 13:35:15 +0200 Message-Id: <20221005113517.70628-4-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> References: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Convert the MediaTek watchdog bindings to schema. Signed-off-by: AngeloGioacchino Del Regno --- .../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 + +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 + + soc { + #address-cells = <2>; + #size-cells = <2>; + + watchdog: watchdog@10007000 { + compatible = "mediatek,mt8183-wdt"; + reg = <0 0x10007000 0 0x100>; + interrupts = ; + 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 = ; - timeout-sec = <10>; - #reset-cells = <1>; -}; From patchwork Wed Oct 5 11:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12999156 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A218AC433F5 for ; Wed, 5 Oct 2022 11:40:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230229AbiJELka (ORCPT ); Wed, 5 Oct 2022 07:40:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51486 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230230AbiJELkE (ORCPT ); Wed, 5 Oct 2022 07:40:04 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7BD04DF77; Wed, 5 Oct 2022 04:37:18 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 73F2A66022F9; Wed, 5 Oct 2022 12:35:38 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1664969739; bh=/7BGNVmlvPkqeDYBGkWztyuuvDVeU67h+vPFB54rXc4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ct9+K1N+ae63ngLJ6uGP20dsPPJ0BTs6+78OZ+A9nGM6zkENoRXts2wBvrNwmnGUV MoWW2tswP4zV77YyjzaapzVEp7VydKdQl0WgOshQuZM5tI/dCKXMNdl075b37xWa0j HDH7VHU1bln2BUyi3BF9ai5iMLw9LqNwdiwM4+IihhxZppjBx1xsNBntcBTMJCINxo sVO7+MQiACkHY1xF2QRga2m3AcgBrtwSz/X04uYWO6Bg6qFvFFhxTlsNw0ts7zhrla dFIxgF0AuDt78oVdJxHH2BcKJY9f51i0XoNvQ6fqhWHB+LCaRuC3XjbuLyye9MLv4h hm3OGiBTMpajQ== From: AngeloGioacchino Del Regno To: wim@linux-watchdog.org Cc: linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, allen-kh.cheng@mediatek.com, seiya.wang@mediatek.com, angelogioacchino.delregno@collabora.com, tinghan.shen@mediatek.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] dt-bindings: watchdog: mediatek,mtk-wdt: Add compatible for MT6795 Date: Wed, 5 Oct 2022 13:35:16 +0200 Message-Id: <20221005113517.70628-5-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> References: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Add the mediatek,mt6795-wdt compatible. Signed-off-by: AngeloGioacchino Del Regno Acked-by: Rob Herring Reviewed-by: Guenter Roeck --- 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 f43b5af92d40..54dfe7941d53 100644 --- a/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml @@ -23,6 +23,7 @@ properties: - enum: - mediatek,mt2712-wdt - mediatek,mt6589-wdt + - mediatek,mt6795-wdt - mediatek,mt7986-wdt - mediatek,mt8183-wdt - mediatek,mt8186-wdt From patchwork Wed Oct 5 11:35:17 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 12999182 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D49ECC433FE for ; Wed, 5 Oct 2022 11:48:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230449AbiJELs2 (ORCPT ); Wed, 5 Oct 2022 07:48:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230423AbiJELrn (ORCPT ); Wed, 5 Oct 2022 07:47:43 -0400 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C729792E0; Wed, 5 Oct 2022 04:45:24 -0700 (PDT) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id 5F60F66022FA; Wed, 5 Oct 2022 12:35:39 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1664969740; bh=if4mHZlg0/8K/oXjlgWAfzFCWC8dK9Y0YQUt5Usd1Uo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hPKWrb0oJD87RtU0bt8UP9pWlC9HER2kPEpB6PeIOfbzVF3/FJBqHeFwta4obPYZl sa3y2B46hc6jOkI6MqwH6M4jB3kOXE/sndAdtWad33gw4guORjeBgKs7aFadiYk+vg vymXwGYNztwYL2MUV89hvtx052E15GnNBz1YqJqTateNJWyIvq9AEU/5KnHK0H6QRU cfhIHFfQcoN9d1VgMM7ezRCDARttr0XiAJMlZYFadAukcdBNgJbJn3gNwfD03GUbnz XISzanY29Nq5zhIkyOjOgsPu0fbsGo4NUNzyX9rIqWOw8F0nyBTWuJxmidHKI9oPTl iHVcQqbtSZo+g== From: AngeloGioacchino Del Regno To: wim@linux-watchdog.org Cc: linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, allen-kh.cheng@mediatek.com, seiya.wang@mediatek.com, angelogioacchino.delregno@collabora.com, tinghan.shen@mediatek.com, linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] watchdog: mtk_wdt: Add support for MT6795 Helio X10 watchdog and toprgu Date: Wed, 5 Oct 2022 13:35:17 +0200 Message-Id: <20221005113517.70628-6-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> References: <20221005113517.70628-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org Add support for the toprgu reset controller and watchdog for the MediaTek MT6795 SoC. Signed-off-by: AngeloGioacchino Del Regno Reviewed-by: Guenter Roeck --- drivers/watchdog/mtk_wdt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index e97787536792..5fa42b7d4b4d 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -10,6 +10,7 @@ */ #include +#include #include #include #include @@ -78,6 +79,10 @@ static const struct mtk_wdt_data mt2712_data = { .toprgu_sw_rst_num = MT2712_TOPRGU_SW_RST_NUM, }; +static const struct mtk_wdt_data mt6795_data = { + .toprgu_sw_rst_num = MT6795_TOPRGU_SW_RST_NUM, +}; + static const struct mtk_wdt_data mt7986_data = { .toprgu_sw_rst_num = MT7986_TOPRGU_SW_RST_NUM, }; @@ -426,6 +431,7 @@ static int mtk_wdt_resume(struct device *dev) static const struct of_device_id mtk_wdt_dt_ids[] = { { .compatible = "mediatek,mt2712-wdt", .data = &mt2712_data }, { .compatible = "mediatek,mt6589-wdt" }, + { .compatible = "mediatek,mt6795-wdt", .data = &mt6795_data }, { .compatible = "mediatek,mt7986-wdt", .data = &mt7986_data }, { .compatible = "mediatek,mt8183-wdt", .data = &mt8183_data }, { .compatible = "mediatek,mt8186-wdt", .data = &mt8186_data },