From patchwork Wed Jul 20 12:50:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen-KH Cheng X-Patchwork-Id: 591936 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 1C339C433EF for ; Wed, 20 Jul 2022 12:50:29 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237377AbiGTMu2 (ORCPT ); Wed, 20 Jul 2022 08:50:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52202 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236525AbiGTMu0 (ORCPT ); Wed, 20 Jul 2022 08:50:26 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C3CDE1D31E; Wed, 20 Jul 2022 05:50:24 -0700 (PDT) X-UUID: a5cf6af7c272460f9a82e96f4e5306c0-20220720 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8, REQID:0f1f6a80-b9cd-45a0-a6af-362c240e9f9c, OB:0, LO B:0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,RULE:Release_Ham,ACT ION:release,TS:95 X-CID-INFO: VERSION:1.1.8, REQID:0f1f6a80-b9cd-45a0-a6af-362c240e9f9c, OB:0, LOB: 0,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,RULE:Spam_GS981B3D,ACT ION:quarantine,TS:95 X-CID-META: VersionHash:0f94e32, CLOUDID:e1b47d33-b9e4-42b8-b28a-6364427c76bb, C OID:9a9dd25485af,Recheck:0,SF:28|17|19|48,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,QS:nil,BEC:nil,COL:0 X-UUID: a5cf6af7c272460f9a82e96f4e5306c0-20220720 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 1061055893; Wed, 20 Jul 2022 20:50:19 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs11n1.mediatek.inc (172.21.101.185) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.3; Wed, 20 Jul 2022 20:50:18 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 20 Jul 2022 20:50:17 +0800 From: Allen-KH Cheng To: Wim Van Sebroeck , Guenter Roeck , Krzysztof Kozlowski , Matthias Brugger , Rob Herring , CC: , , , , , , Allen-KH Cheng Subject: [PATCH v3 1/4] dt-binding: mediatek: watchdog: Fix compatible fallbacks and example Date: Wed, 20 Jul 2022 20:50:12 +0800 Message-ID: <20220720125015.13797-2-allen-kh.cheng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220720125015.13797-1-allen-kh.cheng@mediatek.com> References: <20220720125015.13797-1-allen-kh.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The watchdog timer of mt8186. mt8195 and mt7986 have their DT data. We should not use 'mediatek,mt6589-wdt' as fallback. For mediatek,wdt example of mt8183, We remove mediatek,mt6589-wdt fallback. Fixes:a45b408a020b("dt-bindings: watchdog: Add compatible for MediaTek MT8186") Fixes:b326f2c85f3d("dt-bindings: watchdog: Add compatible for Mediatek MT8195") Fixes:41e73feb1024("dt-bindings: watchdog: Add compatible for Mediatek MT7986") Fixes:f43f97a0fc0e("dt-bindings: mediatek: mt8183: Add #reset-cells") Signed-off-by: Allen-KH Cheng --- Documentation/devicetree/bindings/watchdog/mtk-wdt.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt index 762c62e428ef..67ef991ec4cf 100644 --- a/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/mtk-wdt.txt @@ -14,12 +14,12 @@ Required properties: "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,mt7986-wdt": for MT7986 "mediatek,mt8183-wdt": for MT8183 - "mediatek,mt8186-wdt", "mediatek,mt6589-wdt": for MT8186 + "mediatek,mt8186-wdt": for MT8186 "mediatek,mt8516-wdt", "mediatek,mt6589-wdt": for MT8516 "mediatek,mt8192-wdt": for MT8192 - "mediatek,mt8195-wdt", "mediatek,mt6589-wdt": for MT8195 + "mediatek,mt8195-wdt": for MT8195 - reg : Specifies base physical address and size of the registers. @@ -32,8 +32,7 @@ Optional properties: Example: watchdog: watchdog@10007000 { - compatible = "mediatek,mt8183-wdt", - "mediatek,mt6589-wdt"; + compatible = "mediatek,mt8183-wdt"; mediatek,disable-extrst; reg = <0 0x10007000 0 0x100>; interrupts = ; From patchwork Wed Jul 20 12:50:14 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Allen-KH Cheng X-Patchwork-Id: 591935 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 B9F2DCCA480 for ; Wed, 20 Jul 2022 12:50:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239258AbiGTMu3 (ORCPT ); Wed, 20 Jul 2022 08:50:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52258 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234778AbiGTMu2 (ORCPT ); Wed, 20 Jul 2022 08:50:28 -0400 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D48C11659B; Wed, 20 Jul 2022 05:50:26 -0700 (PDT) X-UUID: c19975c367c44186b54505ae75331bf4-20220720 X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.8, REQID:8166c316-d883-46f4-b764-04b7fd7440d7, OB:10, L OB:10,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,RULE:Release_Ham,A CTION:release,TS:95 X-CID-INFO: VERSION:1.1.8, REQID:8166c316-d883-46f4-b764-04b7fd7440d7, OB:10, LOB :10,IP:0,URL:0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,RULE:Spam_GS981B3D,A CTION:quarantine,TS:95 X-CID-META: VersionHash:0f94e32, CLOUDID:0f4000d8-5d6d-4eaf-a635-828a3ee48b7c, C OID:7d399f9b0754,Recheck:0,SF:28|17|19|48,TC:nil,Content:0,EDM:-3,IP:nil,U RL:0,File:nil,QS:nil,BEC:nil,COL:0 X-UUID: c19975c367c44186b54505ae75331bf4-20220720 Received: from mtkcas11.mediatek.inc [(172.21.101.40)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-SHA384 256/256) with ESMTP id 939649107; Wed, 20 Jul 2022 20:50:21 +0800 Received: from mtkcas11.mediatek.inc (172.21.101.40) by mtkmbs10n1.mediatek.inc (172.21.101.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.792.15; Wed, 20 Jul 2022 20:50:19 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas11.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Wed, 20 Jul 2022 20:50:19 +0800 From: Allen-KH Cheng To: Wim Van Sebroeck , Guenter Roeck , Krzysztof Kozlowski , "Matthias Brugger" , Rob Herring , CC: , , , , , , Allen-KH Cheng Subject: [PATCH v3 3/4] arm64: dts: mediatek: Remove mt6589 wdt fallback string from mt8195 Date: Wed, 20 Jul 2022 20:50:14 +0800 Message-ID: <20220720125015.13797-4-allen-kh.cheng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20220720125015.13797-1-allen-kh.cheng@mediatek.com> References: <20220720125015.13797-1-allen-kh.cheng@mediatek.com> MIME-Version: 1.0 X-MTK: N Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The watchdog driver for mt8195 relies on DT data. The fallback compatible "mediatek,mt6589-wdt" won't work. Signed-off-by: Allen-KH Cheng --- 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>; };