From patchwork Wed Jul 27 09:40:34 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: 12930279 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 444BCC04A68 for ; Wed, 27 Jul 2022 09:42:00 +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=JddVCZzbn9obCv4pP/pzH1AiX6LuUEevANbb/9VWaWA=; b=kS9soxajwVIXuH yMnB5NrEv37ADrcG3YJ77XMiHuW+mQgTsm4o+0T0wutljN00fqAP7Nc2aROlChIIVNWprU5GjeDco 3fWoQwB+K0RdJq4GKVHNjHuseg7yLC/R+jrUkmUeBCo+mubrwTHELWxAdsFnvcmr0AX69Azcvrnwy LMldg4DNY3ggxEMmxtHqrvRX7w4pyGRkRzGH0u7AStDGIWAWGQ1lWtXpblhvgZ6qxy8pv8JZeeW4G xbSoXiRAo2ifIGIbk+55pHP+Wo5gTczSb3ulpePee/E39pn/dm7r30W6l6xUcHvPWgiqpZLgYTx2q pOrsdPO9AZLkXkzpEMfg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGdX7-00BtmG-C1; Wed, 27 Jul 2022 09:40:49 +0000 Received: from mail-pg1-x530.google.com ([2607:f8b0:4864:20::530]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oGdX2-00Btgz-LQ for linux-arm-kernel@lists.infradead.org; Wed, 27 Jul 2022 09:40:46 +0000 Received: by mail-pg1-x530.google.com with SMTP id 6so15433032pgb.13 for ; Wed, 27 Jul 2022 02:40:41 -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=p3g9EzZvah+Gtbwyip2cq8Rx7bbD/kksWxXGuqDH5TY=; b=OLy9K64vZZHKw0I+myiumXXJ327EZ4fO3D1r2oechF169QBzjqFtMoDj48XCEzguWr Jf+Vw4UDazDGZvOY6ulcOQMnzjr3gM7TZ65azJMCxSOLoX0azoax7Mq01l2x97ykNL6a yCfBTrocZQzWSIkV5wODMg/0o8THtuU51HUO4= 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=p3g9EzZvah+Gtbwyip2cq8Rx7bbD/kksWxXGuqDH5TY=; b=20E+rhOaASPAcfnW+aJjxnPE1RuhmPXrJlX0fFgnOMgvMmbOHBnJzwLFz35edM3V6p NNZk9fs+51NApJbBfohaxtCvxM+GQGWJAS+x5ODDDHq50Edm46Rj8s3FGbAy2SbUxhlG 1K11pn8Q8Oot86jybE+Juyl3aBqXFt7DdMAlb3oJjUvl2G7Jb5dw5yV5ONPi0U6tL2rV 8kVHzi4vGN8XyBO76Kkz4jbr5O3rlLG3o0hoeQgPY6okEkf9WQE/O4P271IKQnOkjroK aoD10oIQz2OiF9jYeAOnZ8lXUAstMXhksdyQFCJHe81UViwyEgE6nD1IR797O0yub3lF yBNw== X-Gm-Message-State: AJIora99rd8gt3wqLrvoJ4TT+icXDLIqnbQCPy4fqxsurTn3T59PVDXe Z9vdlIj/Mk5EDBDEtGs3GBSfZg== X-Google-Smtp-Source: AGRyM1vGMx/eXGTZ84c6OPRVIy6bKdnF7BHfGiWW4X9zD6FGDwvusPvwvbJ1cKMBXJc6IoBM5UTbWw== X-Received: by 2002:a63:6b83:0:b0:41a:8419:c20b with SMTP id g125-20020a636b83000000b0041a8419c20bmr17730751pgc.522.1658914841179; Wed, 27 Jul 2022 02:40:41 -0700 (PDT) Received: from treapking.tpe.corp.google.com ([2401:fa00:1:10:8dc7:aefe:3b5a:da1e]) by smtp.gmail.com with ESMTPSA id e9-20020a170902784900b001678dcb4c5asm11775613pln.100.2022.07.27.02.40.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Jul 2022 02:40:40 -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: Eizan Miyamoto , Hsin-Yi Wang , Evan Benn , Pin-yen Lin , Krzysztof Kozlowski , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v2] arm64: dts: mt8173-oak: Switch to SMC watchdog Date: Wed, 27 Jul 2022 17:40:34 +0800 Message-Id: <20220727094034.1372745-1-treapking@chromium.org> X-Mailer: git-send-email 2.37.1.359.gd136c6c3e2-goog MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220727_024044_775293_941DEFB0 X-CRM114-Status: GOOD ( 12.00 ) 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 --- 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..b2269770abc3 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 { }; }; }; + + soc { + /* + * Disable the original MMIO watch dog and switch to the SMC watchdog, + * which operates on the same MMIO. + */ + /delete-node/ watchdog@10007000; + + watchdog { + compatible = "arm,smc-wdt"; + }; + }; }; &mfg_async {