From patchwork Wed Mar 27 08:53:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PeterYin X-Patchwork-Id: 13605977 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 62F02C54E67 for ; Wed, 27 Mar 2024 08:54:04 +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:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Tl0OwssgOWBl8hCIxl4KV08LzvlhP3dIj2BYvCFp/Sw=; b=CypkXI0t9ER63i /gNOHZ7q9VjI991GwF6e9SFkVhYFLxztEWeOqoT+BG1MDOJv2SWZP+VGRvY6E/evwwvrDMXi9mdbD TF9rSWr1RPF95VxSWw5dHm8P1m8IK3m87DTgeaeB4ie0eIn0QxUZcofBSbmOd0YgCkG1ychrZFuBj yCl9dgWW1IC5eb9ogwAGVFPABMfAvJQgt0pGFusVIPbS5Pr+3f/glrGdNxG/WGwZ+epUY1AU9xD+u af9m4JvBMxJ827t71wiLATkgGS6brJv5QUgV76hhWRjaQqhgPeUDohexNWI+UzpfRF8OYtTMTIQAw 9h4UBhXUzyA/5jWTIO2Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2c-000000087EH-2DFd; Wed, 27 Mar 2024 08:53:50 +0000 Received: from mail-pf1-x430.google.com ([2607:f8b0:4864:20::430]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2T-000000087An-1vLk for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 08:53:43 +0000 Received: by mail-pf1-x430.google.com with SMTP id d2e1a72fcca58-6e703e0e5deso4712723b3a.3 for ; Wed, 27 Mar 2024 01:53:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711529620; x=1712134420; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=axYCeiGWmH5zGIGoROlm87X0Iv4FCoHgVdnjtyDTc9Q=; b=Rw6TRIapV+nCBpItsgvsimMiboZsM2NQXpK1oBd73TFUyPP8QvvhoEFAmLCuKF9Q2V suN9PaTM2Tos4zVYZ6GT9Jl3RiVxpUzWsdxdJ9nJt1LgLawmdoPhtSAmrz1jB2mrxugH AA1jb2lXOHQ9OiEGLFeUvjlwaKxLnlqShATUrd6qlGEcC7VvAc/8DcKbH+qMGl3HIi+J NjK+EYQM1pzHLmEXYjSIjhRSLH/I8ofvpJDJHLW+ww5aop/sae8PU9ecORY+XKcEAzlX kIdkiiF+JFOvdZj86zrwXyyj0a/4ZGU/FCSKKivXrvPV9Xq1cVX9Z52hje5rE4NJ9Eho un1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711529620; x=1712134420; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=axYCeiGWmH5zGIGoROlm87X0Iv4FCoHgVdnjtyDTc9Q=; b=GkoPt0/gb/NkQAyIsINhct4x6ZPJdn6No7bQY5TjpCNx7bXEnhpksTH1sZzTh6KoSS Vv8tISWssRpSDK/uIhj+5uInEPrsAtoFC4ScvkLzI6ug583BMY+256nmIg0d+fGG/J4V eeMGBd8fk0imEfGdw0ZAb1Ds01JdQVBnMAAcT4xjmd34Ic05X9g5eIGmR1KJ+hcdCDig JfsogtjzrqtuZOtQV4A+4mDF1auXbEXrvkHQaJjZk6HMfDcaPc6dEcUSOFvdB3JDgQau GF0eMvxJ+gWVz1fIPcpeoL9oHo/ryCGco6X0fR9qNMrVl0WgofymCnCEDq5XdDkqGdOS uAkA== X-Forwarded-Encrypted: i=1; AJvYcCXaHIl7uI9i6OQ/tyI4wc0c6cjhPLWEBIaTZmtYIvd0q6agDxQ2Iy2KCWFuYH0MC2tUKQz0gqUQ7S7m6PG1uyMsiFS5skXiD2sT0kW+lHCLHgDINMg= X-Gm-Message-State: AOJu0YxrbZe2cRqAWh2HU7J197zfICB7orw31XCLGkbcZ95r4NmoIgj+ w2oCfAWcihuhVMf0cNC6TWL92vijOY+rpnmlpV7An6auFE0D0TIv X-Google-Smtp-Source: AGHT+IGb/Tw3XGNhOyfvK3yRw4V3NFMG20lg3pc2PVS38GELaklkOPObegfstg6VozJB2qusMOgTAw== X-Received: by 2002:a05:6a20:c888:b0:1a1:87c7:2d03 with SMTP id hb8-20020a056a20c88800b001a187c72d03mr2484994pzb.33.1711529620366; Wed, 27 Mar 2024 01:53:40 -0700 (PDT) Received: from peter-bmc.dhcpserver.bu9bmc.local (2001-b400-e383-3566-013c-5a87-9abc-381e.emome-ip6.hinet.net. [2001:b400:e383:3566:13c:5a87:9abc:381e]) by smtp.gmail.com with ESMTPSA id h12-20020a170902eecc00b001e0501d3058sm8356848plb.63.2024.03.27.01.53.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 01:53:40 -0700 (PDT) From: Peter Yin To: patrick@stwcx.xyz, Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 1/4] ARM: dts: aspeed: Add the AST2500 WDT with SCU register Date: Wed, 27 Mar 2024 16:53:27 +0800 Message-Id: <20240327085330.3281697-2-peteryin.openbmc@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> References: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_015341_576398_F85751EC X-CRM114-Status: GOOD ( 10.90 ) 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 The AST2500 WDT references the System Control Unit register for its operation. Signed-off-by: Peter Yin --- arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi index 04f98d1dbb97..5fd12c057c31 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed/aspeed-g5.dtsi @@ -410,12 +410,14 @@ wdt1: watchdog@1e785000 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785000 0x20>; clocks = <&syscon ASPEED_CLK_APB>; + aspeed,scu = <&syscon>; }; wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; clocks = <&syscon ASPEED_CLK_APB>; + aspeed,scu = <&syscon>; }; wdt3: watchdog@1e785040 { @@ -423,6 +425,7 @@ wdt3: watchdog@1e785040 { reg = <0x1e785040 0x20>; clocks = <&syscon ASPEED_CLK_APB>; status = "disabled"; + aspeed,scu = <&syscon>; }; pwm_tacho: pwm-tacho-controller@1e786000 { From patchwork Wed Mar 27 08:53:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PeterYin X-Patchwork-Id: 13605978 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 AFDA2CD1280 for ; Wed, 27 Mar 2024 08:54:07 +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:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=aq12h1e5241OTverTc/CsqiDkKtfqtLSqG3+1wSfoRM=; b=quSWimBxlCTPYl QZKqR5B1Vflu6tY5FRAsmR1VDIox8aB6nSUc+ojZ++eO9FRPl3B3H8YwVZH96vcfN26WBfL3nMwX4 celchX40g1jOXNBAlSl2/Oqhqe6Yj3ChYdebSjJ2ezj6fWtBrvwKnwzcZaVNIooEG36iNTXrnsvk/ AcKvN58rfMTqFkSNfC03q5jKmWVjNiv/ewdqnrOxoPjbLXIjOW5FsIQxnfu9fByVsuKPg6+/Cqe/9 ovV4109yj97OHnURTIwfU7NHBZ3rzbf7ASfmKT44DNGw/5YaNjyKPvAp9izHUtDNcxwl9vIWxiIgW 0nUb8q8O50+pj1iOD03w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2e-000000087FU-29XD; Wed, 27 Mar 2024 08:53:53 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2X-000000087C9-3zwG for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 08:53:47 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e0d6356ce9so21811635ad.3 for ; Wed, 27 Mar 2024 01:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711529625; x=1712134425; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=dNSpu6YM8BptgR2qjrv8QihJHcI+7VsMuE3/EFlGmdw=; b=LkxSUPR9eBA+aaWjmDaDpOruOPNbIteNOBZqeC/YttS51e0nxdxcYQXUz3HRK+UO0B e9wkMRbdU0H5sxxoi49f735rgBTzBK/GYtA1cnu0brMxpYx7aOvtsjCjgnjx3TcDmuwq n4RK962aQr0ScylXgCo8UzYxn7gmSeEzoz08MjbpBjEwiAL86PiKvkIbhz/hlAzPn1aR YcxEqA1UhF5HbuEkd5dJcXuO3HrNSfatELmnUWcIoVlFdiOl+l2QB4rmSMdTAh7VBWcE NckbfO9LtHcsvxjM34vSK2XHHAnpJJqhKdW2dVHIEMzno5EywcVRELScObhqQueInlS1 T1Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711529625; x=1712134425; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dNSpu6YM8BptgR2qjrv8QihJHcI+7VsMuE3/EFlGmdw=; b=VDtLoLXyv469gIadm1iXIa4NRWMRuinE/dZbWznnKWqSTW1tzuG9mP3tYKrD21Xefd 4F6TPBVnNuL6oARNvPfWwrf1TEqUIFNbLX5z/7THqZTFqfbxSlvte1GMwqaFp+o08qoj KssXeP2rz7/+uBMsDzKrh/QOU1CFyUmxZwOTp2NXWD/Ah1UvZSCe1ewrC1aLE32lZbol 5JKTNxXDToZzIqsWASVeRSkXqeSLLtc8LFRI9STPCB8LbdiCw+kAA36/XxuB0SLtPfHN 7qpFCkBGP1YDS8nWMp35AdXmcIuSs8BPVxnqzoKRBqOkmkPbxHLtNldcFYs79x1Vxmb4 33BQ== X-Forwarded-Encrypted: i=1; AJvYcCUBt8a6O7O/LDszD0jBubL5NOUYGhzA0j30T6/PEYHSSLa69NYHqbcMM5YUayTCj+NaDOgZ2CNDwba1Vmd4zvdRewEtaKt7sw9cZsBpdj3ZfEt1+Dc= X-Gm-Message-State: AOJu0YwCQgPUuKTe7BiZwjmxgUY95mr+75U7IjRM4UgwavOCx1orqmxG nW17QJHE8uZ/iZ87xaDjH0QvSQOYH56FxRDltviQDXhsfo0vy/h4 X-Google-Smtp-Source: AGHT+IHn+z3k+py4UVKTT73n+eHw2Es3sDNz128MEDJ3zzb3n/dn1oWz8gRzbMhU0oCuzm6/uIBFXg== X-Received: by 2002:a17:903:2a8e:b0:1e0:294f:17d3 with SMTP id lv14-20020a1709032a8e00b001e0294f17d3mr660549plb.5.1711529624925; Wed, 27 Mar 2024 01:53:44 -0700 (PDT) Received: from peter-bmc.dhcpserver.bu9bmc.local (2001-b400-e383-3566-013c-5a87-9abc-381e.emome-ip6.hinet.net. [2001:b400:e383:3566:13c:5a87:9abc:381e]) by smtp.gmail.com with ESMTPSA id h12-20020a170902eecc00b001e0501d3058sm8356848plb.63.2024.03.27.01.53.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 01:53:44 -0700 (PDT) From: Peter Yin To: patrick@stwcx.xyz, Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/4] ARM: dts: aspeed: Add the AST2600 WDT with SCU register Date: Wed, 27 Mar 2024 16:53:28 +0800 Message-Id: <20240327085330.3281697-3-peteryin.openbmc@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> References: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_015346_063830_01899430 X-CRM114-Status: GOOD ( 10.47 ) 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 The AST2600 Watchdog Timer (WDT) references the System Control Unit (SCU) register for its operation. Signed-off-by: Peter Yin --- arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi index 5f640b7d6b6d..2f7788f2f153 100644 --- a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi @@ -558,23 +558,27 @@ uart5: serial@1e784000 { wdt1: watchdog@1e785000 { compatible = "aspeed,ast2600-wdt"; reg = <0x1e785000 0x40>; + aspeed,scu = <&syscon>; }; wdt2: watchdog@1e785040 { compatible = "aspeed,ast2600-wdt"; reg = <0x1e785040 0x40>; + aspeed,scu = <&syscon>; status = "disabled"; }; wdt3: watchdog@1e785080 { compatible = "aspeed,ast2600-wdt"; reg = <0x1e785080 0x40>; + aspeed,scu = <&syscon>; status = "disabled"; }; wdt4: watchdog@1e7850c0 { compatible = "aspeed,ast2600-wdt"; reg = <0x1e7850C0 0x40>; + aspeed,scu = <&syscon>; status = "disabled"; }; From patchwork Wed Mar 27 08:53:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PeterYin X-Patchwork-Id: 13605979 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 B6C2AC47DD9 for ; Wed, 27 Mar 2024 08:54:35 +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:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=sPMS2cYkmc+f8BXxlDD+03Wqdxz2GUgPFRJHl0WuwNo=; b=hu09tWWUL5m+zm y2hnw4bnN3dWmGHEjtVUEMMGkEbCOlNFV6UZFiWTE2pSFcFqecS4UdQQZrN65BBMxdEA29HqDl2Jg OaYodIWydOJDiewqUWPPm/BLF6lGbGQamsN2sZS8nmftAjzYv1R1CWY08b2zB6ILMoN6Wp9OL5h7y IBq77ogwuIixofvoT1WLhjJiqyVeSBfVdTVkn2yPbNoZsH9DZt5K7dqgU4k5LYu2owB+fUZ3QYabU Vp5JdpEMuCMl+htL4HNyofRGNCyLNIeRAVrm9iTvD/9bM6VdCow0o22hSY1qORZsaN2FM/FtQPQY9 YX1aKOzZFXiWETJr+vRg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP3B-000000087XN-3j1f; Wed, 27 Mar 2024 08:54:25 +0000 Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2c-000000087E8-2S0Y for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 08:53:52 +0000 Received: by mail-pl1-x631.google.com with SMTP id d9443c01a7336-1dee5daa236so48906905ad.0 for ; Wed, 27 Mar 2024 01:53:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711529629; x=1712134429; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=b9G+01fnYmsgdrsm4iyF3y0ufJf0ihC4vR7iu7tY8Oc=; b=JmZI2QciTRaw31/Y6AoipdvlwCgSkdymPSY3cf8F5BWxFiBqFxOYu/JXs6w17GQ3Bk QzSFQNDp//lKly5b7e+AEdXLe8/G9KLgePyJxZXCyj/1QH2k/wFC3SdBEn4NbiW8JtoQ N1kc8y5ka1ynob50spDyc20wbieFGCIrezPVPtIQEAsBBB6qNrqJ8SvDo6tPOGTiroNj ekwDE5fbPcXi05nGm7H/hyAzlHYRHLBc6g+gtqZVcsfGyywVZlwj4gzeL3uH3BCxlmds 1BGy8kYfl20Gv4HoiH9A2SJ6B4eC1G/LnYIGf196VDQD2aIKaTY0rpcSeM3O+w3WExqJ unvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711529629; x=1712134429; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=b9G+01fnYmsgdrsm4iyF3y0ufJf0ihC4vR7iu7tY8Oc=; b=PXn20lRY1vGqAFP6kknsBXvteZUllTmd9fcGlmL4461mzW/1kraXOrHIzEi7jMMGAH PUIxpVbpw/m4ln58VgaYB4/5lP7hhXR8xLi9wNugvKZPxl1SoPCEgMXwyvS68xYnKZ1w ESGEMp/QeRhNdvPNv5ToXXy6dz7/oRoIY9VGxdWUREkCiOR9Q3WqE6fFfvEagv1glwAb 1Qu0i3gCiqXPVgXlLGXX8qRBkiBplW3GjUm1frpexX1V6/tp3+kHTHy8yADV69HzEjqj Vj9a3fBK1XUVenR+8byahoRUdNqChQaGqmTVLbZZI+iZJCxocmeqqSJHoDV7HhJhDkWg JJOg== X-Forwarded-Encrypted: i=1; AJvYcCW140W+jfxTrVFtvdT01g7UEv7S3tAYF7Ehtc4DJ0GCtD7Gi53igjeALmhVVwOqF6HZRoCdrTDpUnbMoQUySk21mHYdzPTIHd3//CYcXkqg7whIGhQ= X-Gm-Message-State: AOJu0YwUAE19nfLCYpr6MTTdvSmgdhN3P1HonPRS0MiWA7GxrjQ0iQ6l NlaMU4u+qhpzdqhsy66tVB51koeAq/gXaZV4PQJ0vM3Yh/o+H6E0 X-Google-Smtp-Source: AGHT+IHMtf+g4HCFGxUFbq7vGIja15S+RN2FfG532r/JlKdvx3ne3MqOCeZu8bYoa6cKVVkgxKSGoQ== X-Received: by 2002:a17:902:a3c6:b0:1de:e5aa:5ce with SMTP id q6-20020a170902a3c600b001dee5aa05cemr1931176plb.41.1711529629258; Wed, 27 Mar 2024 01:53:49 -0700 (PDT) Received: from peter-bmc.dhcpserver.bu9bmc.local (2001-b400-e383-3566-013c-5a87-9abc-381e.emome-ip6.hinet.net. [2001:b400:e383:3566:13c:5a87:9abc:381e]) by smtp.gmail.com with ESMTPSA id h12-20020a170902eecc00b001e0501d3058sm8356848plb.63.2024.03.27.01.53.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 01:53:48 -0700 (PDT) From: Peter Yin To: patrick@stwcx.xyz, Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 3/4] dt-bindings: watchdog: aspeed-wdt: Add aspeed,scu Date: Wed, 27 Mar 2024 16:53:29 +0800 Message-Id: <20240327085330.3281697-4-peteryin.openbmc@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> References: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_015350_763643_8D2DAD6D X-CRM114-Status: GOOD ( 11.52 ) 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 To use the SCU register to obtain reset flags for supporting bootstatus. Signed-off-by: Peter Yin --- Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt index 3208adb3e52e..80a1f58b5a2e 100644 --- a/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt +++ b/Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt @@ -8,6 +8,8 @@ Required properties: - reg: physical base address of the controller and length of memory mapped region + - aspeed,scu: a reference to the System Control Unit node of the Aspeed + SOC. Optional properties: @@ -62,6 +64,7 @@ Examples: reg = <0x1e785000 0x1c>; aspeed,reset-type = "system"; aspeed,external-signal; + aspeed,scu = <&syscon>; }; #include @@ -70,4 +73,5 @@ Examples: reg = <0x1e785040 0x40>; aspeed,reset-mask = ; + aspeed,scu = <&syscon>; }; From patchwork Wed Mar 27 08:53:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: PeterYin X-Patchwork-Id: 13605980 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 BE31DC54E67 for ; Wed, 27 Mar 2024 08:54: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:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=rZY5eWuvrsN/iyWvnBwelgrc36kBxgaBetsFJDUUDiA=; b=enqPbznpoyUANh 5bhIDyJLbD6/AipJTSzrWQxFlev69DeHy2zL2Ze76XwVcLBkVdsfT8w9FpI1HajJjXwzLpDiSwRjR V6HnhTRettDQH2NZ5Nd5OtlXNCKkvSxLtQo3MMat5wcKoQhFJzhNzBTILZd8mu18umMVRA15BKVqO E9JSghS1fwEqZ6VWe0V1QFb/qK1tDA7p12UtTTaW8Oo7CpRFnVX0u4zB9aRwoQLNCtz/0GD5qprFj in7VvlbRoj/SA3MXejM15ADyJoinVo+hiIUI92bMyK04N7nVD//c5ah0KxMh0RL3OvbH4N8D9wW3s 3tI54yW6iT/y/oorlhFg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP3D-000000087YH-0cNn; Wed, 27 Mar 2024 08:54:27 +0000 Received: from mail-pl1-x62d.google.com ([2607:f8b0:4864:20::62d]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1rpP2f-000000087Fk-3yWk for linux-arm-kernel@lists.infradead.org; Wed, 27 Mar 2024 08:53:55 +0000 Received: by mail-pl1-x62d.google.com with SMTP id d9443c01a7336-1e0edd0340fso15678035ad.2 for ; Wed, 27 Mar 2024 01:53:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1711529633; x=1712134433; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=QZEbTSOw9EjuXuuOhzMwhOK0HhVADXjRmiePaMQf/CY=; b=gbUTGaQc0rafxXP7fHVOluMbp9L6FLZOzLfswPjt/zlIFF4+YvVkFx0VGSLyTBfSAb viEfjo8c1+9DSrm5mwgqR0yOslNYhHRGVWNzQWIgJzsjYVxgcD/itsFxAoDzWIadpFbU EdR/F40CSzYjyDTacu6dVsI8Vb+qy1xxGV9I/WcsIpWdhJj6LIGeajT9fkiK9WN0cxyN H0hKk/5lBBxGXEeDwukJIV5C98uLTVz9EFvp/387N+1RXvMOhGHq1ApgFSfVvNosO4ch Nqh+8WZCfZCF9ooTPj/780+He4GpRd7Yi5tQK9Wa913GpxOpTs7Gnz1R8zZwo2JE10Y0 m8Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711529633; x=1712134433; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=QZEbTSOw9EjuXuuOhzMwhOK0HhVADXjRmiePaMQf/CY=; b=Op2CrKh6u6ziR1uClM5xFRHB05o7He+9q+vR/SNSA+9vV5Kvsu0gGuBeLln6OV5Rup dNMWfbq03OD/NvJLEJA7Zz4d6a0WRha7afEhm2PzTwii8FhkbmOv6sfETCvD0fpn2w/v 4/YCb8qoJgvAMbXNsVs0Map/bIXnq5qpswYmwAhE8Sy3dzHzOPYFHQ5gaSqoYvXDdJej eCynHcHhLlIePiXbX3cAKCuEvdBy+y+3d+rnhltGPvJI7OhKsAk9aZvvGcJ5oq7v7fEE SCYcSXhqaMlNjkBMzGL8RfIX8M32ETKMOIBL2FxcBEfTF51IVrDhHbV1iaGtrDv7sZIZ x0OA== X-Forwarded-Encrypted: i=1; AJvYcCWTLtSQJt38glyrLVMKWk6OKnWBo9ILQdvBHQGMdwZAtTxKSzeAvWyxffilR3t+Cov7o5Mwk+wZ5cnyjOdi/GaW+WVVWp+FkZNoAa0ulAdfZKEKrdo= X-Gm-Message-State: AOJu0YybjFVXrtQ0MBOXytWGzmf16JwAJUGnFvdKpltBeSN5EOmalh/0 TGB9WDqcA8xQI33yox9QaREZjYdEORGV9CqR42D4s0vAUxh9OuKT X-Google-Smtp-Source: AGHT+IFlw6rOiGuhTJ4vNythc7vqhRqSyiMQo9PeosfY33Phf1K75pTfq+88EaBWSjn9tJXb1tX3pQ== X-Received: by 2002:a17:902:c94a:b0:1e0:acb1:7977 with SMTP id i10-20020a170902c94a00b001e0acb17977mr785333pla.49.1711529633261; Wed, 27 Mar 2024 01:53:53 -0700 (PDT) Received: from peter-bmc.dhcpserver.bu9bmc.local (2001-b400-e383-3566-013c-5a87-9abc-381e.emome-ip6.hinet.net. [2001:b400:e383:3566:13c:5a87:9abc:381e]) by smtp.gmail.com with ESMTPSA id h12-20020a170902eecc00b001e0501d3058sm8356848plb.63.2024.03.27.01.53.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 01:53:52 -0700 (PDT) From: Peter Yin To: patrick@stwcx.xyz, Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Joel Stanley , Andrew Jeffery , linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-aspeed@lists.ozlabs.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 4/4] drivers: watchdog: ast2500 and ast2600 support bootstatus Date: Wed, 27 Mar 2024 16:53:30 +0800 Message-Id: <20240327085330.3281697-5-peteryin.openbmc@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> References: <20240327085330.3281697-1-peteryin.openbmc@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240327_015354_108079_45B8D8B1 X-CRM114-Status: GOOD ( 20.08 ) 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 Add WDIOF_EXTERN1 and WDIOF_CARDRESET bootstatus in ast2600 Regarding the AST2600 specification, the WDTn Timeout Status Register (WDT10) has bit 1 reserved. Bit 1 of the status register indicates on ast2500 if the boot was from the second boot source. It does not indicate that the most recent reset was triggered by the watchdog. The code should just be changed to set WDIOF_CARDRESET if bit 0 of the status register is set. Include SCU register to veriy WDIOF_EXTERN1 in ast2600 SCU74 or ast2500 SCU3C when bit1 is set. Signed-off-by: Peter Yin --- drivers/watchdog/aspeed_wdt.c | 60 +++++++++++++++++++++++++---------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/aspeed_wdt.c b/drivers/watchdog/aspeed_wdt.c index b4773a6aaf8c..29e9afdee619 100644 --- a/drivers/watchdog/aspeed_wdt.c +++ b/drivers/watchdog/aspeed_wdt.c @@ -11,10 +11,12 @@ #include #include #include +#include #include #include #include #include +#include #include static bool nowayout = WATCHDOG_NOWAYOUT; @@ -65,23 +67,32 @@ MODULE_DEVICE_TABLE(of, aspeed_wdt_of_table); #define WDT_RELOAD_VALUE 0x04 #define WDT_RESTART 0x08 #define WDT_CTRL 0x0C -#define WDT_CTRL_BOOT_SECONDARY BIT(7) -#define WDT_CTRL_RESET_MODE_SOC (0x00 << 5) -#define WDT_CTRL_RESET_MODE_FULL_CHIP (0x01 << 5) -#define WDT_CTRL_RESET_MODE_ARM_CPU (0x10 << 5) -#define WDT_CTRL_1MHZ_CLK BIT(4) -#define WDT_CTRL_WDT_EXT BIT(3) -#define WDT_CTRL_WDT_INTR BIT(2) -#define WDT_CTRL_RESET_SYSTEM BIT(1) -#define WDT_CTRL_ENABLE BIT(0) +#define WDT_CTRL_BOOT_SECONDARY BIT(7) +#define WDT_CTRL_RESET_MODE_SOC (0x00 << 5) +#define WDT_CTRL_RESET_MODE_FULL_CHIP (0x01 << 5) +#define WDT_CTRL_RESET_MODE_ARM_CPU (0x10 << 5) +#define WDT_CTRL_1MHZ_CLK BIT(4) +#define WDT_CTRL_WDT_EXT BIT(3) +#define WDT_CTRL_WDT_INTR BIT(2) +#define WDT_CTRL_RESET_SYSTEM BIT(1) +#define WDT_CTRL_ENABLE BIT(0) #define WDT_TIMEOUT_STATUS 0x10 -#define WDT_TIMEOUT_STATUS_IRQ BIT(2) -#define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1) +#define WDT_TIMEOUT_STATUS_IRQ BIT(2) +#define WDT_TIMEOUT_STATUS_BOOT_SECONDARY BIT(1) +#define WDT_TIMEOUT_STATUS_EVENT BIT(0) #define WDT_CLEAR_TIMEOUT_STATUS 0x14 -#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0) +#define WDT_CLEAR_TIMEOUT_AND_BOOT_CODE_SELECTION BIT(0) #define WDT_RESET_MASK1 0x1c #define WDT_RESET_MASK2 0x20 +/* + * Ast2600 SCU74 bit1 is External reset flag + * Ast2500 SCU3C bit1 is External reset flag + */ +#define EXTERN_RESET_FLAG BIT(1) +#define AST2500_SYSTEM_RESET_EVENT 0x3C +#define AST2600_SYSTEM_RESET_EVENT 0x74 + /* * WDT_RESET_WIDTH controls the characteristics of the external pulse (if * enabled), specifically: @@ -330,6 +341,11 @@ static int aspeed_wdt_probe(struct platform_device *pdev) if (IS_ERR(wdt->base)) return PTR_ERR(wdt->base); + struct regmap *scu_base = syscon_regmap_lookup_by_phandle(dev->of_node, + "aspeed,scu"); + if (IS_ERR(scu_base)) + return PTR_ERR(scu_base); + wdt->wdd.info = &aspeed_wdt_info; if (wdt->cfg->irq_mask) { @@ -459,14 +475,26 @@ static int aspeed_wdt_probe(struct platform_device *pdev) } status = readl(wdt->base + WDT_TIMEOUT_STATUS); - if (status & WDT_TIMEOUT_STATUS_BOOT_SECONDARY) { + if (status & WDT_TIMEOUT_STATUS_EVENT) wdt->wdd.bootstatus = WDIOF_CARDRESET; - if (of_device_is_compatible(np, "aspeed,ast2400-wdt") || - of_device_is_compatible(np, "aspeed,ast2500-wdt")) - wdt->wdd.groups = bswitch_groups; + if (of_device_is_compatible(np, "aspeed,ast2600-wdt")) { + ret = regmap_read(scu_base, + AST2600_SYSTEM_RESET_EVENT, + &status); + } else { + ret = regmap_read(scu_base, + AST2500_SYSTEM_RESET_EVENT, + &status); + wdt->wdd.groups = bswitch_groups; } + /* + * Reset cause by Extern Reset + */ + if (status & EXTERN_RESET_FLAG && !ret) + wdt->wdd.bootstatus |= WDIOF_EXTERN1; + dev_set_drvdata(dev, wdt); return devm_watchdog_register_device(dev, &wdt->wdd);