Received: by 2002:a05:6358:a55:b0:ec:fcf4:3ecf with SMTP id 21csp3060246rwb; Mon, 16 Jan 2023 03:13:48 -0800 (PST) X-Google-Smtp-Source: AMrXdXuVNfe3gliHyuG/7nPXkqplCPNdm1slOUJL4xj+6jVT3r3QS72jE1CngfwF2Jtf7oPZzj48 X-Received: by 2002:a05:6a20:1ab0:b0:b6:9683:238f with SMTP id ci48-20020a056a201ab000b000b69683238fmr12415108pzb.61.1673867627807; Mon, 16 Jan 2023 03:13:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673867627; cv=none; d=google.com; s=arc-20160816; b=XaauLRwP2kESVZY/TV9x3lRSKq7/UgNGNfkkNm5wjtOetXsJnT9x0Sgp3HWtvVPSnb eXHtniMklN3fxUMYJrPbUn55xYb1dP1bsIm2AHd3uuPdvsuAIYaRZZ77sZHrMzGLQilW 6ZxF9h4mARb5DSaIhlH9znizDIg87t9/34UlX7Gzgl554fpgTp9diRdcXwxzqPGJioiU hgvV/1cSCjAr4C6hGUqeVXoMiBKtwtQXZYrHUQMtbgjUhKkYOLhq4cdVriTKFbgIgoGc fpdyvaiK89D3GUpZ6F/zg+W5Nyuh4ulz5nlq6Vlg3J/yIDOMhUQUQbsznRakdU7K3gNS 8Yxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=4G8Y0ViVJzXb6BsOeFBPQvk3DHX0QfUnX0ejt3ACyfU=; b=Cd+LAIuHu3EHbdUwl0DCSrwDaI8TUMEaT6nSDDczWKcmo+wsg35/MUq+M6SIlSKAmN kUfDSw9XJwdMC6Z4hV2vkOXKYyiwM6ZApicTQiioVyABu3WhOLbKd3tO+zldhjBJUwPF TeDfoKiMggsvjoQj5tf+WcGRfo4/Qdl/OPRwZtHriKkxITDyTf6s5uxoBKr9b0QtuCVO PXHFBpGByoAGqNuIu8NvnA4DNC+AEKIRAYmRqUgt0V4U5TVQkXDL/sgh2hMHrrTjZsdP uPJALfsSt8k3dlhWO1ZTqyNMIdqD+HlES0b7Gck3gX9KWiJyJSBI+fnMuzG9Z/m8WsxZ LvZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=kzEtSVn8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w11-20020a63490b000000b0049148558226si30718432pga.681.2023.01.16.03.13.41; Mon, 16 Jan 2023 03:13:47 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@mediatek.com header.s=dk header.b=kzEtSVn8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230427AbjAPKyD (ORCPT + 51 others); Mon, 16 Jan 2023 05:54:03 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59774 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230387AbjAPKxV (ORCPT ); Mon, 16 Jan 2023 05:53:21 -0500 Received: from mailgw02.mediatek.com (unknown [210.61.82.184]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 86BD5196B2; Mon, 16 Jan 2023 02:53:15 -0800 (PST) X-UUID: f74acf9c958b11ed945fc101203acc17-20230116 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mediatek.com; s=dk; h=Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:CC:To:From; bh=4G8Y0ViVJzXb6BsOeFBPQvk3DHX0QfUnX0ejt3ACyfU=; b=kzEtSVn8Hu+INqkYtPtHDQ84mcUFru8ZQY4cxOv92Vqa6UWd0+OxRSpEFlYeHAbw0ZIeNiU8seI8zAokpPIEBbz1lSpH7zX6ct3IrOUZ7I+x9PqFEoFC4Y59a7FuUsYtUcSpFC0DpujVOqpVS5qRmYBo0xNX5FnFCmlIcgmC+pM=; X-CID-P-RULE: Release_Ham X-CID-O-INFO: VERSION:1.1.18,REQID:07ba01da-45e7-47bd-b518-c0bbed90f295,IP:0,U RL:0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Release_Ham,ACTION :release,TS:95 X-CID-INFO: VERSION:1.1.18,REQID:07ba01da-45e7-47bd-b518-c0bbed90f295,IP:0,URL :0,TC:0,Content:0,EDM:0,RT:0,SF:95,FILE:0,BULK:0,RULE:Spam_GS981B3D,ACTION :quarantine,TS:95 X-CID-META: VersionHash:3ca2d6b,CLOUDID:75a2c854-dd49-462e-a4be-2143a3ddc739,B ulkID:2301161853114L1JMK7F,BulkQuantity:0,Recheck:0,SF:38|28|17|19|48,TC:n il,Content:0,EDM:-3,IP:nil,URL:0,File:nil,Bulk:nil,QS:nil,BEC:nil,COL:0,OS I:0,OSA:0 X-CID-BVR: 0,NGT X-UUID: f74acf9c958b11ed945fc101203acc17-20230116 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 886985106; Mon, 16 Jan 2023 18:53:10 +0800 Received: from mtkmbs13n1.mediatek.inc (172.21.101.193) by mtkmbs11n2.mediatek.inc (172.21.101.187) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.792.15; Mon, 16 Jan 2023 18:53:08 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkmbs13n1.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.2.792.15 via Frontend Transport; Mon, 16 Jan 2023 18:53:08 +0800 From: Allen-KH Cheng To: Wim Van Sebroeck , Guenter Roeck , Krzysztof Kozlowski , Matthias Brugger , Rob Herring , CC: , , , , , Allen-KH Cheng Subject: [PATCH v2 2/2] watchdog: mtk_wdt: Add reset_by_toprgu support Date: Mon, 16 Jan 2023 18:53:05 +0800 Message-ID: <20230116105305.31818-3-allen-kh.cheng@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20230116105305.31818-1-allen-kh.cheng@mediatek.com> References: <20230116105305.31818-1-allen-kh.cheng@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, T_SPF_TEMPERROR,UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In some cases, the MediaTek watchdog requires the toprgu to reset timer after system resets. Provide a reset_by_toprgu parameter for configuration. Signed-off-by: Allen-KH Cheng --- drivers/watchdog/mtk_wdt.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/watchdog/mtk_wdt.c b/drivers/watchdog/mtk_wdt.c index 3e6212591e69..a9c437598e7e 100644 --- a/drivers/watchdog/mtk_wdt.c +++ b/drivers/watchdog/mtk_wdt.c @@ -50,6 +50,7 @@ #define WDT_MODE_IRQ_EN (1 << 3) #define WDT_MODE_AUTO_START (1 << 4) #define WDT_MODE_DUAL_EN (1 << 6) +#define WDT_MODE_CNT_SEL (1 << 8) #define WDT_MODE_KEY 0x22000000 #define WDT_SWRST 0x14 @@ -70,6 +71,7 @@ struct mtk_wdt_dev { spinlock_t lock; /* protects WDT_SWSYSRST reg */ struct reset_controller_dev rcdev; bool disable_wdt_extrst; + bool reset_by_toprgu; }; struct mtk_wdt_data { @@ -279,6 +281,8 @@ static int mtk_wdt_start(struct watchdog_device *wdt_dev) reg &= ~(WDT_MODE_IRQ_EN | WDT_MODE_DUAL_EN); if (mtk_wdt->disable_wdt_extrst) reg &= ~WDT_MODE_EXRST_EN; + if (mtk_wdt->reset_by_toprgu) + reg |= WDT_MODE_CNT_SEL; reg |= (WDT_MODE_EN | WDT_MODE_KEY); iowrite32(reg, wdt_base + WDT_MODE); @@ -408,6 +412,9 @@ static int mtk_wdt_probe(struct platform_device *pdev) mtk_wdt->disable_wdt_extrst = of_property_read_bool(dev->of_node, "mediatek,disable-extrst"); + mtk_wdt->reset_by_toprgu = + of_property_read_bool(dev->of_node, "mediatek,reset-by-toprgu"); + return 0; } -- 2.18.0