From patchwork Fri Jul 29 03:24:23 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: 12931890 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 E42D2C00140 for ; Fri, 29 Jul 2022 03:25:44 +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=EtwevsNgH4+hJgEMUO8QVKjdfiYuhJOz6/0lQIj2dyA=; b=NwEpekQlR5LJEN avMqwYalYZ6ux3F5l74ex2wKQI1xV1L/uoUgQE3MYc+xnRQi84LmRAeggeZy8Qhq95pqRvZHqP9Wq fJ49Bc32zyp6cF0nzZTemJVVl7MCr5RS+/phC1fBU4lbW+nL7+0rl3zlM1SAFCBsWhdXFXBGviFQA n/GeFxXC9E5fiisNvpDklRj9+EMIW+Sua98TLfT4cn+1tRFXUpWGeTM1qMzFr8MQgdVXyDdocCB7T azT2bLt7RRMYl/7IXEXJsnJX0yidhLSvfTke2Eulr8TuNzwBQSjEvVSP/oZgBFMu19uBfPHGMDwLL FY8W6rRKtXNIP3pVA1Cg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHGcJ-000EDy-2a; Fri, 29 Jul 2022 03:24:47 +0000 Received: from mail-pl1-x633.google.com ([2607:f8b0:4864:20::633]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oHGcE-000EAt-Se for linux-arm-kernel@lists.infradead.org; Fri, 29 Jul 2022 03:24:44 +0000 Received: by mail-pl1-x633.google.com with SMTP id z19so3480812plb.1 for ; Thu, 28 Jul 2022 20:24:40 -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=q1Lq7KUo05n519UFqiy0/X3OfMebl6UDXCVyDW4GsoA=; b=I7P1wkNqAl1wnv0IiLInzobHs+RGv0nqejGxMJdl3aipPlOW4KhvtWpQJOExHASTY8 rJhHRHGKFQhjFrrIcBcgPzUkzCvOB5TWFaxBfIDbeN/pKRrQ+SEYinFFOPJsb5SVNqwC wVUf7dCk741hZUB5PYYMw91wQV5YmFqs5BjsM= 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=q1Lq7KUo05n519UFqiy0/X3OfMebl6UDXCVyDW4GsoA=; b=K0rwrndMVx+ANeKxHp5MGNrT8urc7zhxTNHWW5vZiKtVtlr92/siwJPKtAdsFUT+Fs KuM1v6/xWmlp6aCSxncp0zKw2dvTCmDQvKxeuY3vXwS3OR4EX6j79AxtOsivIhQw8BJa XZWzWUgEHXexO5nJ/stfjyUX82R/VYNkrgkHd5ByxDJAgM6CDUZHbTcPNlyTATGviUbP QrAjTdcJ6Cpo1WevTd4kmePtqVQOKsuoBgn//BffIBoxjCdzBofCHaHp+LMOVpDEghGU YJNSevc4+c4mvFZcpUJU6Jsa2tAwp8dy7qYCtr8DpfBzqLlsNmU/bfIgiNiIUOOHQkgc dO7Q== X-Gm-Message-State: ACgBeo2JN8eHpV0jG4NCGC0utyXcyctlnGPorUnwtlbBEde/vJt2y5Zb lNjwHD6DtG5Wwz05LcX6He94aw== X-Google-Smtp-Source: AA6agR6SMdNRzdPmTw+V/2OYfhKP553d0oZivr6hg6YyG766ehaFPezydPvsxQrjkWWpx+F/HasOUw== X-Received: by 2002:a17:90b:2686:b0:1f2:503c:2472 with SMTP id pl6-20020a17090b268600b001f2503c2472mr1849462pjb.187.1659065079781; Thu, 28 Jul 2022 20:24:39 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:df93:db78:d658:2b3b]) by smtp.gmail.com with ESMTPSA id n5-20020a170902e54500b0016c0593876csm2145129plf.157.2022.07.28.20.24.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jul 2022 20:24:39 -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: Hsin-Yi Wang , Evan Benn , Eizan Miyamoto , Pin-yen Lin , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v4] arm64: dts: mt8173-elm: Switch to SMC watchdog Date: Fri, 29 Jul 2022 11:24:23 +0800 Message-Id: <20220729032423.157144-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_202442_998458_F5D31EE8 X-CRM114-Status: GOOD ( 12.43 ) 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 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 | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi index e21feb85d822..421bb2945135 100644 --- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi @@ -161,6 +161,19 @@ 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 {