From patchwork Fri Jul 29 05:32:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pin-yen Lin X-Patchwork-Id: 12931936 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DE4C4C00144 for ; Fri, 29 Jul 2022 05:34:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:Cc :To:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=/EFFb2b9m7XJK84gY1xn/+oz2LE3oiQ8T9axvsLz+og=; b=0XxQ/hbapGIF5l BmNXIAdreqwyOPosK8ah/G9eCtJlMZqpW+C5HfaoTcXlUfiVPBE1+akevKuWXoxkkAlPDYwZwne/z MLor76/brvo6taUslFZaywMWnympaTzaaBWTb+GYbv4ZbTNtZMPCcekpH9IcMMTAqRA44ytYV8B8K P9jGf7gOSsfWRWel+qrsNM+9AshxASizTnw7lDYnvPVLx7bbF3zBHusSgSFlgetuc5qaergLQL9qn HkXa0dPf4pEK2duHu6zq1pwKq4kDfN49TLIDrG1rvSm4/Qh45PFJ5J1PDLPovOFCMYhzacFrNTJ9T gUMV7S/qxsow7uKDeGxQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHIcV-001a4c-SJ; Fri, 29 Jul 2022 05:33:07 +0000 Received: from mail-pf1-x435.google.com ([2607:f8b0:4864:20::435]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHIcS-001a3H-7R for linux-arm-kernel@lists.infradead.org; Fri, 29 Jul 2022 05:33:06 +0000 Received: by mail-pf1-x435.google.com with SMTP id o12so3728052pfp.5 for ; Thu, 28 Jul 2022 22:33:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KElw61eLlKwxj7+Xj4c/fe2WkAnEdD75KF1vS/H3hCw=; b=V+dUhOUkEkwox3z7VTXI8K0jleX0N2fBr7eNQe0krpSetMQsJCmnCW/k5i7xFzo8oS zoRM1HsdBLAarjNWuxbe/Jn+jmiXSJvdA2kAL/dR0E8tcNlhKbNQ/fUe74i0u2KxNE4D WmR8QnCF493w/FK8xBFY2wNtqeN5fl9wB9dxk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=KElw61eLlKwxj7+Xj4c/fe2WkAnEdD75KF1vS/H3hCw=; b=z1s+k9Ns+ELWNQwnTwvGVS+qr2JFaiQUsOiS83GX+Tjhs+/HB9YAlUDPL0PIAGAw5o FLq0hBS4fEeAqIlFn8axNMyP1WuW+oyfnKLlwRU6IBREudNuY+K6ksZ/onQI3BkXou1t XDATxrPAFWQwQSmIkfjMHh0wud3QyZHof+Whx3BoQzxO3A7I3IVeuJ4bai7KrIDgkSwd 82VFiw5kFDWIojYMVPHamxSx59gvG8sIILzps7cTKREUyiBp7jC0rSVJ8LqrTQApLQgX 0s0csRosc9vd8F8oUXJD6WwjCHKpEjhDLMNqN2q7+zc6wNJiZS7N0mQbaYZIBPnY9e4m wndw== X-Gm-Message-State: AJIora/LidWVEAPDtYGyZSVa+WPSGwgr9IUiOScbFPwSWgYtPGMnSFUP v0O1qzilOkeY5BqqyNHM0uqhBg== X-Google-Smtp-Source: AGRyM1thc/3FPJPxHBIe27C3oCbWb/CZ7bNvT/uFSgYftyyhmkTsNKx/WtR4DEu6RRDtx0dKyPB6TQ== X-Received: by 2002:a63:2102:0:b0:41a:8139:2cb3 with SMTP id h2-20020a632102000000b0041a81392cb3mr1701228pgh.314.1659072780573; Thu, 28 Jul 2022 22:33:00 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:df93:db78:d658:2b3b]) by smtp.gmail.com with ESMTPSA id h27-20020a63211b000000b0040d48cf046csm1820690pgh.55.2022.07.28.22.32.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 22:32:59 -0700 (PDT) From: Pin-yen Lin To: Matthias Brugger , linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Cc: Evan Benn , Hsin-Yi Wang , Eizan Miyamoto , Pin-yen Lin , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v5] arm64: dts: mt8173-elm: Switch to SMC watchdog Date: Fri, 29 Jul 2022 13:32:54 +0800 Message-Id: <20220729053254.220585-1-treapking@chromium.org> X-Mailer: git-send-email 2.37.1.455.g008518b4e5-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220728_223304_271775_2E0C6794 X-CRM114-Status: GOOD ( 12.18 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Switch to SMC watchdog because we need direct control of HW watchdog registers from kernel. The corresponding firmware was uploaded in https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/3405. Signed-off-by: Pin-yen Lin Reviewed-by: AngeloGioacchino Del Regno --- Changes in v5: - Remove redundant new line. Changes in v4: - Rename the watchdog node (smc_watchdog -> watchdog) - Correct the patch summary (mt8173-oak -> mt8173-elm) Changes in v3: - Remove /delete-node/ and create a new node for SMC watchdog. Changes in v2: - Move the modifications to mt8173-elm.dtsi and add some comments. arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index e21feb85d822..abe3140cfcc6 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -161,6 +161,18 @@ hdmi_connector_in: endpoint { }; }; }; + + watchdog { + compatible = "arm,smc-wdt"; + }; +}; + +/* + * Disable the original MMIO watch dog and switch to the SMC watchdog, which + * operates on the same MMIO. + */ +&watchdog { + status = "disabled"; }; &mfg_async {