From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wr2-f12.google.com (mail-wr2-f12.google.com [74.125.225.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BA5C5497B8B for ; Wed, 23 Sep 2026 10:41:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160076; cv=none; b=m50/yYxxTV+mH97vXsMUqnCmsPdtD5fOf8NxAoju7IBA95yvNcSnmSa0o3j2W/NLQvp91lAzRDd1MHCzgmGToL6MKVd7FlxVKaiYxVh9H3hIsS+PEoX9IRxmI9bvkeqjlLjGs7bL1aeP4esqPVXA8IAd4zAvtsKfMxdwNH2JPYg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160076; c=relaxed/simple; bh=JPq1K/TtYhGpO+h9McDLSD5P9OgM/Hgg+AidAGB5kZ4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DmLhRBz9LC3gjZh6VCt2uvCnj0Ua9RhTP/HE8KhVjWCtqv9EUy3atZj5VCPorA+PDWq91ryRrUnnG2orhaZ17J3eAYpf4PdKRqU6RINYHdpUXxNocz9FufmPP16hSq+CKGPnE5Db8Isol3io+wj11Mh44nV5hr6jW0f5gGAM7ig= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=IYUL9gIP; arc=none smtp.client-ip=74.125.225.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="IYUL9gIP" Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-485b1d2874aso643195f8f.1 for ; Wed, 23 Sep 2026 03:41:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160060; x=1790764860; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=hfcYaXdQ4JhprU1bLeofN4mzB3OfwntG7DvJN30DUis=; b=IYUL9gIPYJqMH6ta6UmGeCGhk8DIsHHAzbYofqCLJvUcJd1cGFPZ1pmRwg6BQ59q1W hE2e0h0expbETv8Dbh3Ykf6PjAp4Dh86GNT1GKS3AsHGBmp+VlW7r0N6o7+0+PvE9+P0 AlYpOU3zgyCZlcNPLEThtBr5KSYBmvbf2IzoKvbY8leIFR5k+aQBfcdgd4E2QlSGOyX3 esmrHSVIqwUliWW5BR0TacEIngcloE9S3B+LFoW+wtnGxr/0zoFnXeIEmSAuSyoqg/4V 1gYc+O4fEdZExcqLBePgCguiixv2YpTL7FNOKXEL7M6GVQ/N8v/6Tridf2BtEPLjaa7O M3Lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160060; x=1790764860; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=hfcYaXdQ4JhprU1bLeofN4mzB3OfwntG7DvJN30DUis=; b=JsMIAbiXb/KXFgmdJKcz8/C1nsHqa6OP2HoWFjFQxnteBA1LX9RuwQ1QjNX+icRK7h YbguNzgu0soXfmKRl2s830i3CTZjcCaCib/fe0/+afHAWlKvZqI0Ans05QcjwucaKYaQ OVES7vvddyQgbsrAJMeQ0lgKN1kVHN5NWNOlO8NQTlmffw5H49Fz51OQEuii3al+Ge5w 2g/1wKsChigx8FqbMiiPSzdH3BvtnZtdvud1N0pt8FDhCfwf6Kp7+swH+gwbaf76hQqt OxPOB6gH+EDXDvrCVCyQyEhkaBZZhGAOVlboIIwcmBdwnAoOPiNxc6TgwpCZxStCAZiQ P0Vg== X-Forwarded-Encrypted: i=1; AKwUvBz7pMPQgmKb0LtSdD6NOioVG5lh8yHAtQpgb8Cfs/vwCEST/uDdV80R03v2FIthRQbsKqeosfX2nEI5xGQ=@vger.kernel.org X-Gm-Message-State: AFuF++mKsnnIbzzYT/XgnC0yfR+TUA1sJpuQNGthKfvv7ZkirBF6e/u2 qCLWuy/fueIvl3x8wVGR4+2ENZlm90rGE5+PK3PvKJSIXKgWkLPpbuMq X-Gm-Gg: AYBFou3NllVqwTi3cLPiQJFWeh9cd31QxdhUfeFoO151uGCV4ddRpKyHADB/xaWjDmf USCCi3y4rgDON/AqTGjVLPehHsKSmXbH8/XRsG+xNfqu6NuzKpe4rRLYjm+WyumpdipLJw1R9c4 JQ8bRt9GCqx8PoPTQmo6Ws/k7A2AdeS+DU00UJ8mWAuuL0ZlB1jXupXk8j+Wa6DPLH8uJ1WR2qQ O/Lsf+oqx8GIVR5+7kH/yoBHfQMJbLNhLGF/5PFe8BkUhmN+twRwmN5WzmzvLY25/LnVt9XX0G3 H7umJ/o28Dv1nY6McnK2H6lVVce+q4x1b4V3zoGyC5jeafCkeiiOv5McpppuLGDRZauZGbsqzMH VSf42xOYBQqsyJaRLCXQH+G53JN3e11DtkLWMkuy6RV0Q+ARvxVIvUKVIrJLh3y0oMp4Z+Y0+xG 0oREe+rRNvJu802vgWbIlLMUiaVIsyLBQQSASLhtyCpfhuy2ec74XJqAoulIxqT9Jk4ktiQqUTc Rm/UF9ZCrPQ5S6zR3VlF/8PmZAsoWyPb6I//HalvWk17e1pbimps0Tz9II4pswAL5MR2HsPHbGK Kk3sOdWYZZIuE3QQdrY= X-Received: by 2002:a05:600c:3b21:b0:49f:bd3c:bc25 with SMTP id 5b1f17b1804b1-49fdf25486bmr26346245e9.32.1790160059852; Wed, 23 Sep 2026 03:40:59 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:40:59 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 1/8] watchdog: rzv2h: Use pm_runtime_put_sync() Date: Wed, 23 Sep 2026 11:40:47 +0100 Message-ID: <20260923104054.3324830-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar pm_runtime_put() may trigger the idle check after pm_runtime_disable() is run as part of devm_pm_runtime_enable()'s cleanup action, leaving runtime PM active. Use pm_runtime_put_sync() to ensure the idle check runs synchronously. Signed-off-by: Lad Prabhakar --- v5->v6: - Used pm_runtime_put_sync() in rzv2h_wdt_stop() function. v4->v5: - New patch --- drivers/watchdog/rzv2h_wdt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index 83540dd9a37b..057b890de0b0 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -174,7 +174,7 @@ static int rzv2h_wdt_stop(struct watchdog_device *wdev) if (priv->of_data->wdtdcr) rzt2h_wdt_wdtdcr_count_stop(priv); =20 - pm_runtime_put(wdev->parent); + pm_runtime_put_sync(wdev->parent); =20 return 0; } @@ -268,7 +268,7 @@ static int rzt2h_wdt_wdtdcr_init(struct platform_device= *pdev, =20 rzt2h_wdt_wdtdcr_count_stop(priv); =20 - pm_runtime_put(&pdev->dev); + pm_runtime_put_sync(&pdev->dev); =20 return 0; } --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1E32849CF29 for ; Wed, 23 Sep 2026 10:41:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160069; cv=none; b=Hd4F4ap+unRGjHtUsAqwZ9c1oWEaS9mFQ6vFjSAd+gnrL8gM+zBPe9QzAnvf1STVXShjFfKH8z7sA3O5unH0AgTWOs0pfpjCy/a2RX3ySYZ+Nd4NWFdaYU9rOY+FDtHVhPO6Ko+Tb0kmPcO5exDqGqdP6/3pQr1bggsnAnryBmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160069; c=relaxed/simple; bh=zrebjrYHLxlkcLbOWhLADCVn448m5K5z0EZUcGG0+0E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ILq5/BwLY3JJQityFcSt33rpoUZOMVeWoaLm+vv+hl1sT9yvCiErhNDmIQkV1dFot40kV5Vi5Hr8h+8k59AsDUS6TYzfFn83V90H4fQZWiGK1DKdYqJ5/Y4yum9MmDSLGK/cYoLsF002uYgP+AsOmy3AJvt1G4cmHZmQKqSNlGY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bj9mLHOT; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bj9mLHOT" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e620fa473so4389225e9.1 for ; Wed, 23 Sep 2026 03:41:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160061; x=1790764861; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Ix3tO+d9OZKaRLRpGMWc7HAXEvurMPfFvhpnn2QHvZs=; b=Bj9mLHOTsWcq1mlqYhEDwsulSgdRbgCRu8/8iaA1wliFOoVt2mziwustNaO0W9CNdc UyjvOofDNHi2b31xFLrYTe5wraaZnpUayJRwdGFZeuDt1b6hSYlr+vNkBTPoHXbMqZsh 8HR4s9eLKSsnELfJvPz2/AzX7vEv8o0/IyKHI/p5xqaUzKYNb/RE5Gkv29cnMafZBhf7 S2jAZZPFa5JKEmo8d0VAq9WkgvkBJncpMCZD0oJfcpKvuW3MuoHkGLUACTc4GSS4y+BA ylzynqK36LXH5o61vadQtu3LVhfpKdqDCXY20WQU7JckqAxIijZCEVdnhEpZpekSOpzm fc4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160061; x=1790764861; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Ix3tO+d9OZKaRLRpGMWc7HAXEvurMPfFvhpnn2QHvZs=; b=WRPf472rsJm0EgISaIfLR9jtxCtRLI3q1zzaoe1shZWtpmB+JUG8OHLaphhuLywNWo YGjw19sqZs3mh+vy9smehcT9f202R2K7wyG0ZOF6ykhzQ6IntHPfsWIKjuBVyTDyAiWk yiXC1Tc6TVx/GU/KDZNH9n3hYPepoyXpzxJzJqmy7rn0SELIuE2LETq25bS0LJD1OcJj Eu41iKOGGOKF9dEys9j0bhsC1dzw3baOks3f42rRCDPrgvPsskYjeoQMiTxnyrABzrUz QvKV2bej7kAi4wKYtze+N4PDFGXgqZ336gxiMSxpuG7OV/WbSlaPuGLzmYlWqNwwGtVP SSjA== X-Forwarded-Encrypted: i=1; AKwUvBx6g0TKSUCsS4sQ5ToHCE6n/t/1XaRXWEnChFGOdYXTT8onAVZKZef/Ruy3sYhlWv6caFRzuVWcTCwmM3o=@vger.kernel.org X-Gm-Message-State: AFuF++nMC9SbBgg+0fj1wDfwQJqULPzAN/VimIroSy8z3RO/U/4jKvCd r4tUbmpOBtD3kCbUTOYDmLr/kGMSWjQd8qkkD0Sv3Xko/DxK9vN5MfNE X-Gm-Gg: AYBFou1zkYq59HbLYKTFS2Dl5OX/CO/zH7u1zpaNRCZIl2eYj+FXkxwbIdhXIHfULwA 56lX5fOz5N0RglMkKUnwKe0wgqh+nzKfr/NVfE+3dIyYKHiVtyDWv/qBqQ+k7tpvJjlLR63mC2H +YNr/3BD691jRWF3K3yReknOL0fge2CP4eZ2C3ThhwoYXiuNShB/ozUYQ31nanBc83nNESX+Bap Gy+gd8GfybQtqCx8fvMYSgDKLlmlqzHS1RPlh7I42zHiNJC7BC1z30C4fAJ9zittRijo83OOC7W E2GIMJPz+kfvIiW/gcEPLQu1OWnGbGY2Gl/ZOmEB3WIjRsrXVaXWP5jkHu6p1JPIidsc4zhZa4p qnXtADDPhMzlwTryyd4BYbEI+T79XZik8qAMwL0IQq1a5I17js32ojTPMFryv+EflRKw6GPJjOK 4ezBw2tr2DjBx08UgghPx0JkcNjgrZ3nUButmHVuIT/JHRRZ6LqnRHAbsFz0QF6ZXEyYMZ0C7ne lvFzkhIFcmCuE8T4iM814L9y/qX3MdU3H3zf98qI5GvPNLNd56OM5oqDBybxzGdVVsbch3Acykm 81MySbCJ X-Received: by 2002:a05:600c:1396:b0:49d:93c:d903 with SMTP id 5b1f17b1804b1-49fdf135413mr28275625e9.20.1790160060973; Wed, 23 Sep 2026 03:41:00 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:00 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 2/8] watchdog: rzv2h: Drop enabling clocks in the restart handler Date: Wed, 23 Sep 2026 11:40:48 +0100 Message-ID: <20260923104054.3324830-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar The watchdog restart handler runs from do_kernel_restart() with interrupts disabled and after smp_send_stop() has halted the other CPUs. Calling clk_enable() from the !watchdog_active() path takes the clock framework's global enable_lock. If a stopped CPU held this lock, the CPU executing the restart handler can spin indefinitely and prevent the watchdog from resetting the system. Keep pclk and oscclk enabled for the lifetime of the watchdog device by using devm_clk_get_enabled() and devm_clk_get_optional_enabled(). Remove the conditional clock enable/disable operations from the restart handler so it does not acquire any clock framework locks. Signed-off-by: Lad Prabhakar --- v5->v6: - No change v4->v5: - New patch --- drivers/watchdog/rzv2h_wdt.c | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index 057b890de0b0..ee1649e0edae 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -191,22 +191,9 @@ static int rzv2h_wdt_restart(struct watchdog_device *w= dev, int ret; =20 if (!watchdog_active(wdev)) { - ret =3D clk_enable(priv->pclk); - if (ret) - return ret; - - ret =3D clk_enable(priv->oscclk); - if (ret) { - clk_disable(priv->pclk); - return ret; - } - ret =3D reset_control_deassert(priv->rstc); - if (ret) { - clk_disable(priv->oscclk); - clk_disable(priv->pclk); + if (ret) return ret; - } } else { /* * Writing to the WDT Control Register (WDTCR) or WDT Reset @@ -291,11 +278,11 @@ static int rzv2h_wdt_probe(struct platform_device *pd= ev) if (IS_ERR(priv->base)) return PTR_ERR(priv->base); =20 - priv->pclk =3D devm_clk_get_prepared(dev, "pclk"); + priv->pclk =3D devm_clk_get_enabled(dev, "pclk"); if (IS_ERR(priv->pclk)) return dev_err_probe(dev, PTR_ERR(priv->pclk), "Failed to get pclk\n"); =20 - priv->oscclk =3D devm_clk_get_optional_prepared(dev, "oscclk"); + priv->oscclk =3D devm_clk_get_optional_enabled(dev, "oscclk"); if (IS_ERR(priv->oscclk)) return dev_err_probe(dev, PTR_ERR(priv->oscclk), "Failed to get oscclk\n= "); =20 --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0359049504E for ; Wed, 23 Sep 2026 10:41:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.140 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160080; cv=none; b=XDQSSuMgx+WzT6OHU2IvgNSTVbyHSHgLWgctAFCHey8v3g452MPhFt7r461kz1LR5FeDsqbjDkwtMyYBkSrwO2mIEau11vMEAe4a5wSEklBNH9dq+Wy3bgdFOAamR9BRs0H+E7JipLCg2nzPmo/aR/KLkaWI3LkP2paLH5J6xkk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160080; c=relaxed/simple; bh=3FpZ2LQPJEraDRB+xfM2+yX1c/xN43QUsBqOJ6MBVec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PSODkKD5S9O4U4EP9KBvN7n2hVc5HiHgJGT4e9raUsj9OuAHlj7XIQ8jtZ9rq/9/5rYGfx3TGARWS1X7yjDIayFu6jZqZxcvQbj423w1WToV+3OTNI6LGFR9MJ78XZ64gwiGy+lcU2fFfRm3QQ0qt+CEqz6yknIUsXB5lsj6T7E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=kTjAnPwz; arc=none smtp.client-ip=74.125.225.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="kTjAnPwz" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49e6598dd44so3574435e9.1 for ; Wed, 23 Sep 2026 03:41:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160062; x=1790764862; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=uy1/P3kdVU6Z6TgBEn/xi8p7dGk/j3Q9N42vq6jL5bA=; b=kTjAnPwz1Kc5kesTwhtOES+DFBF1BnpH065abtkiGjK6nCcj+w1P0ppyICpgFexZVY Odg8dcA6Ga/BsRmIbalJMhroOYhB8bpa3ux4EGHclq3yG/lyXlhWA20qOpy61ii5fFX6 106BvpkqmlnfW3wWuDHtjgtjD5t6Np9lRvxCg2hc3VCREdSrI2+JvtY4Q8m6f28ZwQe7 ZxQLKLmJ3lTXfR4BUu5Xlo7hdXDavFzhtMhtofvHq8WTRFEotG6cB+xSSFO7MNwrcn5N ACMiZEnmD6zLh+4DUWQcJVnT6Ie1XCwfcf+DKEDd+2cztOxF0/Yiqj9spdblCrzDV589 ysfQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160062; x=1790764862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=uy1/P3kdVU6Z6TgBEn/xi8p7dGk/j3Q9N42vq6jL5bA=; b=ocI/gbsLx1B/32M/XRsF8ryG+G/q+nzdpnmXCNhIpMIWIcfS28bcHbFnVYdl/qzCoA KlC9on8j5GUydpVMPer02aHvWf76heURzavIAu45TAJ5heSOi/FWkOmCh3cFY1seH0c3 M7hv8NY34T3oHmu9PYO3oEgVzSBZnzMkYAVJGzF4cjXFrnNc+Qwyq/zgRC9/wK2/tc/S CTFHKMzQUNh8geFXH5XYV8sR+ag0xdulash2ms5RaUksw0b5oAYc8BzIffC5FDuN8ka9 cs5Oh7BseVKP5EEpwgYx68d0u3sfLYNh6gbJGtNL2vZaJhfQY+9rHC6Jv9Mp4SxZDq1e oOvQ== X-Forwarded-Encrypted: i=1; AKwUvBxebKWGYEM+nmq2AKljY2F2s93td6w6F7o8611vpxclxTd55p1bJbdsRghs/5G2lwMWWh7mEczKVzxEgkg=@vger.kernel.org X-Gm-Message-State: AFuF++mdZWT3EvbpHjoiOQVHHPHwQG2C+V7AfpGTyNevSIvfR+CRQX25 hxhPAVW3Cfrz03YXzCDgrUkHXkY390Zm2DXBVqpf1/akATMbQ7o6qtgf X-Gm-Gg: AYBFou0ic1uh3AJuacJz6f+fuEUgpURu8dONDAzQMhFIbDTPuF43BS/WkL+t+3uaRsM IuvF+Wxi7nxYidJifRTsDTHXGWeJw0Ra3mIXoaq+Dg0gPR1AtGXFOuUKMm0X3a8MvEnSfMjZZMY cU50tH0br9OXXDdzoudVRyR9g1VhiYwMowy6uF6BZ/SoGO0BWk/zb6mNumXVkW/Jc91iegowY8S 64+unl3sG9KefpNWMLWn3wMiovfYi3lkrPpEGVc0mAjJBZV9p2bMVkoAAa0aXcplFuZvAZwO8+s Eb5PAvbLbZOZVl4auFX/NhjqJSgEmdE+RMXq0KtDXWxEiSgAh/t+2bX0JL96SgSaTk5k/g1cziN uQiYHM3i/bHEA7rBfBw1sbYHWBqkAq2s+1Pyu9RoCSINSyLKVuS8kELd581RN1gdegauEEIvrvA TdZgB2/e8K/C9Atp92Y/PFBMSg0YrD17YiY8XoikgFSdqU2WnD2cqapGYysjX2tvY3fWCRuLt30 Z3RA4df5WGgcmXu4moRKtRcKB3/IPpToi4dyefG913sN0cKOZLUkSOKk0cu5aNzgqH5zYzoihKV uxofW0Rr X-Received: by 2002:a05:600c:c16d:b0:49c:ff9f:f6b6 with SMTP id 5b1f17b1804b1-49fdee0b7f2mr26577895e9.6.1790160061713; Wed, 23 Sep 2026 03:41:01 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:01 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 3/8] watchdog: rzv2h: Drop WDTRCR_RSTIRQS define Date: Wed, 23 Sep 2026 11:40:49 +0100 Message-ID: <20260923104054.3324830-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar WDTRCR_RSTIRQS is unused, so drop it. Signed-off-by: Lad Prabhakar --- v5->v6: - No change v4->v5: - No change v2->v3: - Updated commit message to reflect the change in v3. --- drivers/watchdog/rzv2h_wdt.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index ee1649e0edae..9774fe8e441e 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -39,8 +39,6 @@ #define WDTCR_RPSS_25 0x00 #define WDTCR_RPSS_100 0x3000 =20 -#define WDTRCR_RSTIRQS BIT(7) - #define WDTDCR_WDTSTOPCTRL BIT(0) =20 #define WDT_DEFAULT_TIMEOUT 60U --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DE07249552C for ; Wed, 23 Sep 2026 10:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160073; cv=none; b=J435imzk9B9xYaDjjLNqQu7zIHtb+e8OcXHfLlSvmAAHArsgEFdr1gTOqMAkOnMGicLymjUvSqlUC+OZeXEoFa32mts+fTHyg7h6TQRtMRN2oYSHOob8H7Pw+v0d6whgHNwhEdLKmULk2cxsLNul0JpitUId9sYTt3/YQDxPjTE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160073; c=relaxed/simple; bh=nVHGzNoleuUx99SkwmPwYJ812T3riYThfKcHuu1eGHY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kSdgAv+h21h5YQ4sxG3/yNV8MLXL/r/FPotOW8sj6izWEjVgnkAUrmKMv3BlvcLJUW/Uvfg+CwKKlvKhmXcZMTfOriTUIhQIqmWgNKUdW0bRCCL6MiXT2BMWRx2dqH3uUO9z2gHh/I5v4qABlcv4AWWCIjh3NeuB6gzUDBR5RIU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=gB/lyibT; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="gB/lyibT" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49d1ca5b0d6so5296865e9.0 for ; Wed, 23 Sep 2026 03:41:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160062; x=1790764862; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=iiaiBHDqP8bmazWMSYgIlSNhn9kLxLCnZ+hvVqhHlR8=; b=gB/lyibTvlAxAgkmNBvTX8Wjn4nEWYKf2B+is/Qg6aqjFvmfGc8F9Ee5AIV+pyeKhW h4qYKR81Jaz1CU/X8qVp2j052pY3snYS+3ZnUH1dpRoVd/75wmVeh0Rgb/ji8CCKUFE1 e1sY6+2oglkjVNZ5pnD+hpaV9DqCGCVpW9R9+YY3MDrWum48uLPNENPlrlSVUU3L8lm4 ZNQ0AD+yQ4E4HICfusU5/R68cvusOTBy+B4C2z0pwyLHKO9cNMERNhIFikrU6c/48ckq cb8m8x65byPNZgyqgdMzMLqT/7szgSI4ZsZ/Aq8qVYrJe0Xe8sH38LjPKdfP28PcM3ep hqiQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160062; x=1790764862; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=iiaiBHDqP8bmazWMSYgIlSNhn9kLxLCnZ+hvVqhHlR8=; b=XDnv/GXud1M1rAylwssPow7tzzwlnnK3JhoEfp8tGngUZGHKUpVwzj+GJRsSvlnpCR SmWNvHRdUtWuO8+VA2CdaDMX2No4cVgcGzQDtGybX4vAu1H1s7Df89QpEUXzx483SqTN tGgwveU3dTDb/nw/yiWFR07ASpLxRWAh507maqFdsX4z7Lv9/dZ2mg++fFuCSDVIFqo1 e6a6j10v/zEkJFqkFwLcKNE8RhpHqwF2zlci0MMv8IvyoS9s9NVbGgwI1VV8WDWE2g6k qnrGmMcDzUOxSYL5/jhaJnaX83mLrX2gIGSeq65+J7AUVJ3NNegnLqSknQvb/SuAWMOY PbCQ== X-Forwarded-Encrypted: i=1; AKwUvBwnAq4p57UvfjAxqvTcAPBEqELK6GV6fQufBP8uy5eV5i48x8O+MVymb2tR6acCK2ppPA+TwYvWqsLupcM=@vger.kernel.org X-Gm-Message-State: AFuF++lmnHBaElvqCy1FKka8VenuMdjF8PGOcHF386U9XezPYovlCljb v772LA8dMiVoIpg1GboaGYj1J2VhaJeUAkPPdiPu0tq/sBYQb1IIzJ0Y X-Gm-Gg: AYBFou067mq4gs6cvOIHU/ij+H5ifis8b3ftsR9f4WpDvArDUKzA46Qq7BQJ+wQ7Qqd WePA2n2QYY1dW82Lu/bORNkdc1eB3AEkmJKefMKfU8kfjO2++JMrjyxP9rORKmsw8JZ7+U+q3FD LYmKtSmmYMtzJJmmFBHlTLeYPE9TO25aLh520uPes/ccMobnSzAL6uVOvK/V1XQaD7MLIZMRapp 3thYa/xMpW+I37OpwqnLkeEMjBaK8NIOPJP4SYXNSHTkMIrAHHdXuy4VoLBX+IV/g2WLBeiNyjZ rS+Tv4CBXNi94uotH3Tdxe4fZzfbB3QsE9zaxJBoHZWxkVOKh8qNhmgmdOT0Now5QC9TDYWCwa5 z256PAa9ekv/G3j/ky4niXaVGPc840AUMIAzCWH6MDWmz3ZF2ytoPTHFQjK+WaHHbnZW8Cg6RGw BaO7Qrb9jzKFhu/St7Mus84rVCYjO2ic+q7StWzQzxoUKPg/1bx7sK7U4/zYrS361TIzOI/JoNS 8V1uxjeE65m3oNlxybIqSY+RravgaYgnbIx/yFrV2kyR7ks1iVXJY3F7i85jURVvM7k8YaT5xmf JyCLhQ+9oct/5b93xww= X-Received: by 2002:a05:600c:c173:b0:49c:fc6e:8caf with SMTP id 5b1f17b1804b1-49fdf12b782mr30617975e9.19.1790160062355; Wed, 23 Sep 2026 03:41:02 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:02 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 4/8] watchdog: rzv2h: Propagate WDTDCR access errors Date: Wed, 23 Sep 2026 11:40:50 +0100 Message-ID: <20260923104054.3324830-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar The WDTDCR helpers access the register directly using readl()/writel() and therefore cannot report failures to their callers. WDTDCR is located in a shared syscon region and will be accessed through regmap in a subsequent change, where register accesses can fail. Make rzt2h_wdt_wdtdcr_count_start() and rzt2h_wdt_wdtdcr_count_stop() return an error so their callers can propagate failures. Handle these errors in the watchdog start and stop paths and unwind the resources acquired before the WDTDCR access, restoring the reset state. Signed-off-by: Lad Prabhakar --- v5->v6: - No change v4->v5: - Dropped checking rzt2h_wdt_wdtdcr_count_start() return value in restart path. v2->v3: - New patch, split from v2 patch #1 to make thing easier to review. --- drivers/watchdog/rzv2h_wdt.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index 9774fe8e441e..a65e5d6c48ad 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -87,18 +87,22 @@ static int rzv2h_wdt_ping(struct watchdog_device *wdev) return 0; } =20 -static void rzt2h_wdt_wdtdcr_count_stop(struct rzv2h_wdt_priv *priv) +static int rzt2h_wdt_wdtdcr_count_stop(struct rzv2h_wdt_priv *priv) { u32 reg =3D readl(priv->wdtdcr + WDTDCR); =20 writel(reg | WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); + + return 0; } =20 -static void rzt2h_wdt_wdtdcr_count_start(struct rzv2h_wdt_priv *priv) +static int rzt2h_wdt_wdtdcr_count_start(struct rzv2h_wdt_priv *priv) { u32 reg =3D readl(priv->wdtdcr + WDTDCR); =20 writel(reg & ~WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); + + return 0; } =20 static void rzv2h_wdt_setup(struct watchdog_device *wdev, u16 wdtcr) @@ -148,8 +152,14 @@ static int rzv2h_wdt_start(struct watchdog_device *wde= v) rzv2h_wdt_setup(wdev, of_data->cks_max | WDTCR_RPSS_100 | WDTCR_RPES_0 | of_data->tops); =20 - if (priv->of_data->wdtdcr) - rzt2h_wdt_wdtdcr_count_start(priv); + if (priv->of_data->wdtdcr) { + ret =3D rzt2h_wdt_wdtdcr_count_start(priv); + if (ret) { + reset_control_assert(priv->rstc); + pm_runtime_put(wdev->parent); + return ret; + } + } =20 /* * Down counting starts after writing the sequence 00h -> FFh to the @@ -169,8 +179,13 @@ static int rzv2h_wdt_stop(struct watchdog_device *wdev) if (ret) return ret; =20 - if (priv->of_data->wdtdcr) - rzt2h_wdt_wdtdcr_count_stop(priv); + if (priv->of_data->wdtdcr) { + ret =3D rzt2h_wdt_wdtdcr_count_stop(priv); + if (ret) { + reset_control_deassert(priv->rstc); + return ret; + } + } =20 pm_runtime_put_sync(wdev->parent); =20 @@ -219,8 +234,10 @@ static int rzv2h_wdt_restart(struct watchdog_device *w= dev, rzv2h_wdt_setup(wdev, priv->of_data->cks_min | WDTCR_RPSS_25 | WDTCR_RPES_75 | WDTCR_TOPS_1024); =20 - if (priv->of_data->wdtdcr) + if (priv->of_data->wdtdcr) { + /* best effort, ignore ret */ rzt2h_wdt_wdtdcr_count_start(priv); + } =20 rzv2h_wdt_ping(wdev); =20 @@ -251,11 +268,11 @@ static int rzt2h_wdt_wdtdcr_init(struct platform_devi= ce *pdev, if (ret) return ret; =20 - rzt2h_wdt_wdtdcr_count_stop(priv); + ret =3D rzt2h_wdt_wdtdcr_count_stop(priv); =20 pm_runtime_put_sync(&pdev->dev); =20 - return 0; + return ret; } =20 static int rzv2h_wdt_probe(struct platform_device *pdev) --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f12.google.com (mail-wm2-f12.google.com [74.125.225.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9133A495050 for ; Wed, 23 Sep 2026 10:41:08 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.140 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160071; cv=none; b=vF5ZLtWemT+0xuijPoKn20NSf9eR20Bxh8nrg7/0Yv/Rhtbsbm2JBGMs3RoC4DwPjoVaDHBYGqlr7HeIidPCMDGC8PHKLXn8ktDhELQ/eSF28eydJBCgftPr5j07/lmECblewpA+qaRd1uFRJYxfkSLasS2R0qOOydkPXp/4AYA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160071; c=relaxed/simple; bh=X1jAYThF13X8I2rqIxQ8X7qe4GN151gAbYtT21h/NrE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a+/cIRBYsDRHjfD2PJxyI97oER4JtlZ68I2iUE0Mz9uemo8dynqY2+Qfn1Yv/JIhg6pxVE/MhgcUzoP6fKyEP5ynFRLywMJGriKCckkQsVVz0LmTS3bb8V2cw7zgzg5gb7hqNWrTsVeArE2RXgABZ1Nyf22zLUfGQGTA3wGbp6w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Bda7NUQ1; arc=none smtp.client-ip=74.125.225.140 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bda7NUQ1" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49d097b4939so3896545e9.0 for ; Wed, 23 Sep 2026 03:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160063; x=1790764863; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=GoGtYfI6mbncqB1kvt8xB8OWSjQJ5DXHu4pe4unlWr4=; b=Bda7NUQ1iqN5KGhTSPDJ35nHq7cg3MQFM4vmOXEmNkMN1FrjgQQeM50oR/kLxDRe++ 4qRnIel/u7eE5fkEVXyX4pT4w6tehntWnF54+YLWmSynAl6A5xyjImJDt5cZMvMS3QcM 6WrCCvCfYkcWuiYi2P9RlrivSxa84LuO0XlOWK04hu0v009NoutFAzun6kr1c0WoDtfm aHvFXcGUAU/Bh5QqlSsenmP0ObYY16Dt7NKDYv4eWeakN5D9/ll8uMaA8hvihPEUhPf9 oRu98h2w/Oe4ZDvS6KwwD2SLkKyRHviapJ0L54924f+KDKT6njzqCxmLZmxJDVdQiF9m gw6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160063; x=1790764863; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=GoGtYfI6mbncqB1kvt8xB8OWSjQJ5DXHu4pe4unlWr4=; b=cfq3uUiw9LsehUru00ozzPX7Yj04rfyuLiwD2rCmrMF5St8Cw7zsZDRW9PzJXCb+x1 KQYP+LotAhFhGOY22zZOL0H9TMeZeCOFGv1MoyJWQfgCyBcw1mwgUcElpNPDTawzKN5l GXpyU7RVpswJ5vQTa3D5s7uXwjc/ngn6eKOsQG0KlpAjMvlUC74m7KWb7FGP6vh/l+Cg lIizd36MQDmZ73aUMihhn35fn0Gdd58YNOuCWVlNQU3yv3Lgp1GZVRVUSmp9o1HH95JG k5Prrwb8z8N52kffvZqjs++NNx/P+/g/2Nm/36nUmw9k4REOCch7CCeN0gwFFD4SZYkP V7jg== X-Forwarded-Encrypted: i=1; AKwUvByyksvVvG/U//0Y+pq4ktdBbGvqvCdSmjcI/HyJSoShtKbmN1V3jk2xr6SaFaptuSo7u2N68jFDVHhTmGM=@vger.kernel.org X-Gm-Message-State: AFuF++m7/v6+/j1Afq9pfvGir4B9ta7y8bI3NsT/j5w/72kAH4C+aoYx dmE7hB1kNE7GXe4WK8VJyxk9j7GvdSIJDNblUvT4aDWNFIj/JAQHjSQ2 X-Gm-Gg: AYBFou1eN4m232Y1HdSOtdddZN1rv3/VPMjgUbO0U6joR+R+ir6aRnHYFFKXliIC7uf HIQ2I+SSiooWGMsxsGFBVgA7eIXoLgYgWym1wTB4dNLe5/iW2AN3TYuSUqwMM9Z5Ssc4Hz89ZZE kgstZBHomjq+MDBkn2QB5BaG9WuyklX3AH7WO3uCOZym65ZgOaMJYCevb72U9KYUm2hcEls5A3o UGYgaDxjykoAOdUHouRjdpazS//2Ul86zoFApLeuITIDByd6EZBcRrHLMEXhJ7N/m/owlrQXqV8 m/Cc5wDy1j50rSXJqatihk5r1EqNHnE/rzWTV8byETcbqLoiQRosaI+G45ERkZyb7i4fb7l8M/X JDx0tEIUuFrIU9R2RFAxG8mS5FpD666i9iQUdkHAXzkAa2SYlNhSvyJKk1pCbAb8n870ShXB6lB vo8GQgYxyWIrkO69gSpp3MCvYDnlby2gOpe1HLMtEON4q6aLXuyyeWNNPCOiKJ96ySwhDgSllmN yMOQ+Fs5+vYfB3mCG3fpSSbxm0n2gr5ZhGmA1qU5M5edjY3dPc5ilSoABbS+UwpOtrw0/2DBx7A OwWMyMSp X-Received: by 2002:a05:600c:8489:b0:49e:73e7:888c with SMTP id 5b1f17b1804b1-49fdee0b7e7mr27113165e9.4.1790160063078; Wed, 23 Sep 2026 03:41:03 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:02 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 5/8] watchdog: rzv2h: Convert WDTDCR handling to regmap Date: Wed, 23 Sep 2026 11:40:51 +0100 Message-ID: <20260923104054.3324830-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar Convert the WDTDCR register access from raw readl/writel variants over to the regmap framework using devm_regmap_init_mmio(). This conversion serves as a preparatory refactoring step. It allows the driver to subsequently support syscon-based system controllers natively by passing along alternative regmap handles without forcing messy architectural branching at runtime. Signed-off-by: Lad Prabhakar --- v5->v6: - No change v4->v5: - Handled the regmap locking in the driver and introduced nolock version to be used in the restart path. v2->v3: - Dropped unwinding changes to patch#1. - Set use_raw_spinlock to true in regmap config as certain watchdog operati= ons runs in an atomic panic context. --- drivers/watchdog/rzv2h_wdt.c | 54 ++++++++++++++++++++++++++---------- 1 file changed, 39 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index a65e5d6c48ad..bf46e239751c 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -4,6 +4,7 @@ * * Copyright (C) 2024 Renesas Electronics Corporation. */ +#include #include #include #include @@ -12,7 +13,9 @@ #include #include #include +#include #include +#include #include #include =20 @@ -65,7 +68,8 @@ struct rzv2h_of_data { =20 struct rzv2h_wdt_priv { void __iomem *base; - void __iomem *wdtdcr; + struct regmap *wdtdcr_regmap; + spinlock_t regmap_lock; /* Protects access to the wdtdcr_regmap */ struct clk *pclk; struct clk *oscclk; struct reset_control *rstc; @@ -89,20 +93,19 @@ static int rzv2h_wdt_ping(struct watchdog_device *wdev) =20 static int rzt2h_wdt_wdtdcr_count_stop(struct rzv2h_wdt_priv *priv) { - u32 reg =3D readl(priv->wdtdcr + WDTDCR); - - writel(reg | WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); + guard(spinlock_irqsave)(&priv->regmap_lock); + return regmap_set_bits(priv->wdtdcr_regmap, WDTDCR, WDTDCR_WDTSTOPCTRL); +} =20 - return 0; +static inline int rzt2h_wdt_wdtdcr_count_start_nolock(struct rzv2h_wdt_pri= v *priv) +{ + return regmap_clear_bits(priv->wdtdcr_regmap, WDTDCR, WDTDCR_WDTSTOPCTRL); } =20 static int rzt2h_wdt_wdtdcr_count_start(struct rzv2h_wdt_priv *priv) { - u32 reg =3D readl(priv->wdtdcr + WDTDCR); - - writel(reg & ~WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); - - return 0; + guard(spinlock_irqsave)(&priv->regmap_lock); + return rzt2h_wdt_wdtdcr_count_start_nolock(priv); } =20 static void rzv2h_wdt_setup(struct watchdog_device *wdev, u16 wdtcr) @@ -235,8 +238,11 @@ static int rzv2h_wdt_restart(struct watchdog_device *w= dev, WDTCR_RPES_75 | WDTCR_TOPS_1024); =20 if (priv->of_data->wdtdcr) { - /* best effort, ignore ret */ - rzt2h_wdt_wdtdcr_count_start(priv); + /* + * Best effort, ignore return value and use the unlocked + * variant of the function to avoid potential deadlocks. + */ + rzt2h_wdt_wdtdcr_count_start_nolock(priv); } =20 rzv2h_wdt_ping(wdev); @@ -255,14 +261,32 @@ static const struct watchdog_ops rzv2h_wdt_ops =3D { .restart =3D rzv2h_wdt_restart, }; =20 +static const struct regmap_config rzv2h_wdtdcr_regmap_config =3D { + .name =3D "wdtdcr", + .reg_bits =3D 32, + .val_bits =3D 32, + .reg_stride =3D 4, + .max_register =3D WDTDCR, + .max_register_is_0 =3D true, + .disable_locking =3D true, +}; + static int rzt2h_wdt_wdtdcr_init(struct platform_device *pdev, struct rzv2h_wdt_priv *priv) { + void __iomem *wdtdcr; int ret; =20 - priv->wdtdcr =3D devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(priv->wdtdcr)) - return PTR_ERR(priv->wdtdcr); + wdtdcr =3D devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(wdtdcr)) + return PTR_ERR(wdtdcr); + + spin_lock_init(&priv->regmap_lock); + + priv->wdtdcr_regmap =3D devm_regmap_init_mmio(&pdev->dev, wdtdcr, + &rzv2h_wdtdcr_regmap_config); + if (IS_ERR(priv->wdtdcr_regmap)) + return PTR_ERR(priv->wdtdcr_regmap); =20 ret =3D pm_runtime_resume_and_get(&pdev->dev); if (ret) --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C605E4825C4 for ; Wed, 23 Sep 2026 10:41:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160078; cv=none; b=GxOg9J/5WnsmSDLxyZdbFK4UUeQtU6jlXMAA0qma/KpjsQ1c2vnvzYBlnT0V0QRvdzU9onMXS7W1Qn9FpfCJnZRty/+1t2+zFXk0YvveTtgbhww9rIauHtkqY8ViJI4gEU7mzPuov7TwMOLJCE0UrhcUQfhdNqi6eJscsICAXy4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160078; c=relaxed/simple; bh=d013R1cdFBAeWBFuyjbnr1PqsqBM+SjiYpEWoVpIAMo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=L7U6cxiTBUzoOBFUFeOESxciAJM0m0aQYRaw376gBLI5tKf9RoiECeyReAlhQnQhJQWdhL1qcKDVy8gwX3rOFS6f6TGjSf8zh5iW3bNHBtLooD+mmBenog/qxQn5Nmt9h5L5vmwOwxhe37V+xqX1zGrx3iP2jBx/0r0vtEyJcx0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=WuBy2/Vp; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WuBy2/Vp" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e83a388f8so4324265e9.1 for ; Wed, 23 Sep 2026 03:41:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160064; x=1790764864; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=7TJjWfJKLA0M2sdvfWYgX9IABTK6WiZZcNEAl74v/1c=; b=WuBy2/Vp9kkU8uyRkVDRsVq1p35N4QgrYsc2XUNdWEo9ut+6lxdmjXNAaM3/n73QKZ eq8UXI94Rj//3qIn1yFg1MCqPiraT7ZKXtIP44lj8yw3yNB/Y9is2B4ae2FtEEt2ajbK aqjLvxCpX4xiv5OraJukCoFVI1IWGiPAfyeMpZJNNhZbK7HrKMTso5JqY2MzlRkNagDU AuBqzGHWeCN0vJNHKGctXpMp+CXygF/tbqEPpwEGTRuejyss6onD21ZtD9mpMOThqBqq eWLvHd+sMXm+vRU5ZrtpkVBdCwpl4JDUIH5DPNgQx6OTzlMNadaMW9a4zYS2Bh1df6I/ +BFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160064; x=1790764864; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=7TJjWfJKLA0M2sdvfWYgX9IABTK6WiZZcNEAl74v/1c=; b=YWbIleUj+UAdczceJlcCPg8qY7sKy79kf0YQJKGbzHoJZJ+uK7oaa6EHOPkqwT04vu owOoz9WcrIGV0MQwsMLkpqPqYPBZeoa30wyWNzHjcgu789+22rC2fPyEpekofzi4C9Mm Ob2d101nn0fzzPtOpypwKLoWuT++PuNq2AL+K1x5ZIYRTSgBapKMObiuJTfSVR9x+7Jf bi0BCIv3eHmgG3ONPGTD3hbH4/yT/pX985j5H1U7RqVWtPyCwGKUzL7j0wGKOV0kaYpg v4jRV/ypHaDZR018YXHlLGLINS4jRXQqKRnhNs3fHkgg1KdpbcGu9/ir0JpdYiUKv+19 X/fw== X-Forwarded-Encrypted: i=1; AKwUvBy6KkkyXxHDj2ohOLeVBhYBnB3AdVMAtMsLqu3vcUbqABEVz9tcPqptcDvi7JowRjtr0RmD4uFt/JD+dN0=@vger.kernel.org X-Gm-Message-State: AFuF++kIEhauaULiX6SiNqqBe2KBEdLnZn5KqhS8i4v7olnegBxgXsf5 GpSDMonJ2gT2SLQnTsDV5+4bv97wirmvm3sDxJOhzeMVUJqaPbo4PWR2 X-Gm-Gg: AYBFou38R63/1J8MBwmYtJU4KZvhBLMRipBBnpTHArJ4Xkz3ayuG2fKqWBtDUzYZAAa xyuID6AtCQ36oneev6W9aTwnz1iRRtxub9/5lExOOgcTr4stZmgcxRFFRAKR7bvJFbVuuF9R3sV BePP8vjRCAhUMmcyZb+PfoIF9VKLB+8d7Y9YIfQqFQVCiv+B39SeRYJhmZkMtaPvG42hj8Rvkfl 3s/PqOTgAXXr0NGIQnvJ2q5oIXoF0VJWFGZ4JqVma0bK0X6S7WvDeoXH+BuiS0hy7AxN/eQt11G edpldcDtwrGM/O5zUpmMqoBKDXsJ/JpUt9pYKbs8H9WDH5x6TtTLgyClEl47HQZUp/+DswmC+Ry 4bqZcBz5ix/SOsl2AHdCJFxGHUViKlxG5EZmSz+Zhj7Jlt9W1OcsPV2nst7AG81L3sdvkorL7SV FNjvrYT6bjk+6sNhvjDU2yaMeuUQXPO24Lwcn2fiGWfDt5ViTbMNbd+u4bxYseq9zZkeKGBY2hA EP8MLcMG0B7FRcxRtm39PZooNA9+ECJfJZxcNd2+hJrXknqeALk/E3ucuIPsw3Hn69eKNGjKuyp CFbBTRAhGm8xQGIXboY= X-Received: by 2002:a05:600c:8b21:b0:49c:f512:2361 with SMTP id 5b1f17b1804b1-49fdf1087edmr28745455e9.14.1790160063762; Wed, 23 Sep 2026 03:41:03 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:03 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 6/8] watchdog: rzv2h: Add syscon support for WDTDCR Date: Wed, 23 Sep 2026 11:40:52 +0100 Message-ID: <20260923104054.3324830-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar On RZ/T2H and RZ/N2H SoCs, the WDTDCR (WDT Debug Control Register) resides in the second register region of the CPG/MSSR block. Since this multi-function block is shared with other peripherals, it is exposed via a syscon regmap interface. Look up the SYSC regmap using the optional "renesas,sysc" property and derive the WDTDCR offset from the watchdog instance index. Retain the existing MMIO-based access method when the "renesas,sysc" property is absent to preserve compatibility with existing DT's. Signed-off-by: Lad Prabhakar --- v5->v6: - No change v4->v5: - Code changes due to regmap_lock introduction. v3->v4: - No change v2->v3: - Made use of the new "renesas,sysc" phandle-array property to access the WDTDCR register via the CPG/MSSR syscon node. - Updated commit message v1->v2: - No change. --- drivers/watchdog/Kconfig | 1 + drivers/watchdog/rzv2h_wdt.c | 64 +++++++++++++++++++++++++++--------- 2 files changed, 50 insertions(+), 15 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index f7d0a0c2c0ef..3c4fc9916d8c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1046,6 +1046,7 @@ config RENESAS_RZV2HWDT depends on ARCH_RENESAS || COMPILE_TEST depends on PM || COMPILE_TEST select WATCHDOG_CORE + select MFD_SYSCON help This driver adds watchdog support for the integrated watchdogs in the Renesas RZ/{G3E,V2H(P)} SoCs. These watchdogs can be used to reset a diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index bf46e239751c..9d00e54b823e 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -9,6 +9,7 @@ #include #include #include +#include #include #include #include @@ -46,6 +47,11 @@ =20 #define WDT_DEFAULT_TIMEOUT 60U =20 +#define RZT2H_WDT_MAX_INSTANCES 6 + +#define RZT2H_SYS_BLOCK1(n) (BIT(16) | (0x5100 + (n) * 4)) +#define RZT2H_WDTDCR_OFFSET(n) RZT2H_SYS_BLOCK1(n) + static bool nowayout =3D WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (defau= lt=3D" @@ -66,15 +72,20 @@ struct rzv2h_of_data { bool wdtdcr; }; =20 +struct rzv2h_sysc_wdtdcr { + struct regmap *regmap; + spinlock_t regmap_lock; /* Protects access to the regmap */ + unsigned int offset; +}; + struct rzv2h_wdt_priv { void __iomem *base; - struct regmap *wdtdcr_regmap; - spinlock_t regmap_lock; /* Protects access to the wdtdcr_regmap */ struct clk *pclk; struct clk *oscclk; struct reset_control *rstc; struct watchdog_device wdev; const struct rzv2h_of_data *of_data; + struct rzv2h_sysc_wdtdcr sysc; }; =20 static int rzv2h_wdt_ping(struct watchdog_device *wdev) @@ -93,18 +104,22 @@ static int rzv2h_wdt_ping(struct watchdog_device *wdev) =20 static int rzt2h_wdt_wdtdcr_count_stop(struct rzv2h_wdt_priv *priv) { - guard(spinlock_irqsave)(&priv->regmap_lock); - return regmap_set_bits(priv->wdtdcr_regmap, WDTDCR, WDTDCR_WDTSTOPCTRL); + struct rzv2h_sysc_wdtdcr *sysc =3D &priv->sysc; + + guard(spinlock_irqsave)(&sysc->regmap_lock); + return regmap_set_bits(sysc->regmap, sysc->offset, WDTDCR_WDTSTOPCTRL); } =20 static inline int rzt2h_wdt_wdtdcr_count_start_nolock(struct rzv2h_wdt_pri= v *priv) { - return regmap_clear_bits(priv->wdtdcr_regmap, WDTDCR, WDTDCR_WDTSTOPCTRL); + struct rzv2h_sysc_wdtdcr *sysc =3D &priv->sysc; + + return regmap_clear_bits(sysc->regmap, sysc->offset, WDTDCR_WDTSTOPCTRL); } =20 static int rzt2h_wdt_wdtdcr_count_start(struct rzv2h_wdt_priv *priv) { - guard(spinlock_irqsave)(&priv->regmap_lock); + guard(spinlock_irqsave)(&priv->sysc.regmap_lock); return rzt2h_wdt_wdtdcr_count_start_nolock(priv); } =20 @@ -274,19 +289,38 @@ static const struct regmap_config rzv2h_wdtdcr_regmap= _config =3D { static int rzt2h_wdt_wdtdcr_init(struct platform_device *pdev, struct rzv2h_wdt_priv *priv) { - void __iomem *wdtdcr; + struct device_node *np =3D pdev->dev.of_node; + bool syscon_present =3D of_property_present(np, "renesas,sysc"); + struct rzv2h_sysc_wdtdcr *sysc =3D &priv->sysc; int ret; =20 - wdtdcr =3D devm_platform_ioremap_resource(pdev, 1); - if (IS_ERR(wdtdcr)) - return PTR_ERR(wdtdcr); + spin_lock_init(&sysc->regmap_lock); =20 - spin_lock_init(&priv->regmap_lock); + if (syscon_present) { + unsigned int wdt_index; =20 - priv->wdtdcr_regmap =3D devm_regmap_init_mmio(&pdev->dev, wdtdcr, - &rzv2h_wdtdcr_regmap_config); - if (IS_ERR(priv->wdtdcr_regmap)) - return PTR_ERR(priv->wdtdcr_regmap); + sysc->regmap =3D syscon_regmap_lookup_by_phandle_args(np, "renesas,sysc", + 1, &wdt_index); + if (IS_ERR(sysc->regmap)) + return PTR_ERR(sysc->regmap); + + if (wdt_index >=3D RZT2H_WDT_MAX_INSTANCES) + return -EINVAL; + + sysc->offset =3D RZT2H_WDTDCR_OFFSET(wdt_index); + } else { + void __iomem *wdtdcr; + + wdtdcr =3D devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(wdtdcr)) + return PTR_ERR(wdtdcr); + + sysc->regmap =3D devm_regmap_init_mmio(&pdev->dev, wdtdcr, + &rzv2h_wdtdcr_regmap_config); + if (IS_ERR(sysc->regmap)) + return PTR_ERR(sysc->regmap); + sysc->offset =3D WDTDCR; + } =20 ret =3D pm_runtime_resume_and_get(&pdev->dev); if (ret) --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F41D64A015C for ; Wed, 23 Sep 2026 10:41:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160088; cv=none; b=lwbJDz2nJGQWKwdtpLlLWjBXPS9LZ5uJKAfyzU+bIL/NRz9PyEsOCWtOeT2dajGgV2AdrN3dzonbsl+rZE65IVN5aYtQo3sjGoSDiatUhtG2B93ehUuc15fflyoZFDPD9hVvyblBISrZJnhTssh374sGInw4u0dzI3aDes1r1TA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160088; c=relaxed/simple; bh=1lFgLtLwiG9ZlazEhqgrw6NCUNeBFzcT8X96+NwLVuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cV8XGrt+TesAUzMl7qn8dSbMhqy/z5YVG2ttIgmf24PotUeuePb6qx3SXyx84amII+Jr8mqthACce1zhDt2b92SW21vtg5h8gL3adkjCnJj2exJYYdh3exUN2gexLK2fuZqnABgno/wi/xiQHIu2OzPwV23/KEckz7yki65O5Js= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=f9woJsjF; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="f9woJsjF" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e79a408deso4124565e9.2 for ; Wed, 23 Sep 2026 03:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160065; x=1790764865; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RLPiGOv8BG6J6N1wsKC4oaWQ6OSRmNQqyKq1m7eGBCg=; b=f9woJsjFIC+/W69h3fOGepQxMKPqkIl/oy9U8WCqFxQ3EVNem36QDllPRbko/dc6du U2WzfG2L9cfRpSQkxHgjjmlAmCdNowP9eG4ufKNyG0DaIkkUgqgQNHwLjM/QTZVY8gig qpyqFwEhi1jlJFOZDCHzFULs2NGZqOiJjalaWMJUDpNlhMIfq4/btRB+JdRStZDTRc5D 0UCey/LAoqdO+enMUCOe28Ueb9G1dm0l9KZ85bgP8xqaSAKDNcObqcbpQ1zbsR8VojjX Rw8nqV9wUXGk0hY71AdMnPz9Yn7bHUrFCMTvoudegag6BgSTfiMZZXr7KVv53KSm+Ujw ulPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160065; x=1790764865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=RLPiGOv8BG6J6N1wsKC4oaWQ6OSRmNQqyKq1m7eGBCg=; b=r9vimUD8QcnMrOUhBmPCESRfof8aFUdb24mVmRSSmGgU5DETZRbi7es0gPGST9yUjQ KjsNVqFrEB8RFiLz38R5av64YWdpDdOU+HLzJltkVemkZpUY02zI/AsARUP/eHmJdXjc 3z1FgJnRELbOnAg2HZEsqkTK6TpiwHG1o8R9SHUdXKCh4gNiOTc7jQmlLGn2V+wbi4sE azjxZHgyJj8DkXr8ULbNqPF98SLd/O8o2JZm8LBINh4ybCFUF4AgmXSYFaaWqguCkVHc bASVwHDG3wtQcUen3oBU10OeK3INTIS18Tyo1NTQduo+Zj5xTlz4DoWpZTgD4T8OPrF+ FHag== X-Forwarded-Encrypted: i=1; AKwUvByeyuDyUdiDNrxNC9wocLpgghnzeCLHxKI7tcA0lHkZeqm+vZbp+c+1SUDC9K8syq8MMtesZjLNmQD3yNI=@vger.kernel.org X-Gm-Message-State: AFuF++m3SlautyEefImVhwyh2/qcFdHudjEshCKkq8egOQrxD5izaQ7w f7/C+Nbs7jklmZGi0v8hapMymuAlbmZH8HqoT8YIGJe85XQnbxAQZHu8 X-Gm-Gg: AYBFou2WKpYr4SU8vACKhZcC690TDc2Wx1BRq0KVeMpcMEMYNBiH8nXZlWoqymWMUyZ t61D+juxP1ouCnm3O0BIrO6WANRP9AgSfeA8uOXIRcKeSS+ekfvs9AcF4WX3fhFNr/InQp6e4eZ EFV1ooIipu3NSBWTBKhoA1R4Gj/QHNV/eFL8BFEj/7xFRtxLFRFH7soxuLpYZdwwJb01U2eX869 XL5KfWnXaRoP8bBdMOHcMKMddMHRsTIVYaRV3CHjht1vrfCzPTUkVrEnuKiTmz7dDBNUNuMmTIQ sxYG1W5S6ISuZb/ABsMYBqJiKTGZMyN4sCFg9ebS0qOacygeX8N5eSxOORmm7+8hOEFHleOSexi +kqYkFuCmpFSOf3qDRkAYmQKaCHPcGaKxRP3ExWqLISDmm6trukVBJvSFO6Z/Rac7yr2WW6RICU asiGjfmt88NM0MzIBJ7DilwjJpELuQhRsCQ0Ww1Ax60tM9oE6/2OcK6BjdbsYMV+wechIJvkLjB oFaMByo6fERrR0nrUkjo79dnrtXazXeoms484/kNyX0icYeH1RsT95HyNHRt1jMddCU23/P4OII KYCZIVDm X-Received: by 2002:a05:600c:4704:b0:49e:799e:c1c3 with SMTP id 5b1f17b1804b1-49fdf12d3dbmr24470955e9.17.1790160064510; Wed, 23 Sep 2026 03:41:04 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:04 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 7/8] arm64: dts: renesas: r9a09g077: Use CPG/MSSR syscon for WDTDCR access Date: Wed, 23 Sep 2026 11:40:53 +0100 Message-ID: <20260923104054.3324830-8-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar The WDTDCR registers for wdt0-wdt5 reside in the second register region of the CPG/MSSR block. This multi-function block is now exposed via a unified syscon regmap interface. Replace the direct mapping of the individual WDTDCR registers with the new "renesas,sysc" phandle property pointing to the CPG/MSSR block syscon node. Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven --- v5->v6: - No change v4->v5: - Added review-by tag. v3->v4: - No change v2->v3: - Renamed the "renesas,sys" property to "renesas,sysc" - Updated commit message v1->v2: - No change. --- arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r9a09g077.dtsi b/arch/arm64/boot/d= ts/renesas/r9a09g077.dtsi index 674e35e4f242..18d748661a60 100644 --- a/arch/arm64/boot/dts/renesas/r9a09g077.dtsi +++ b/arch/arm64/boot/dts/renesas/r9a09g077.dtsi @@ -327,61 +327,61 @@ channel1 { =20 wdt0: watchdog@80082000 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082000 0 0x400>, - <0 0x81295100 0 0x04>; + reg =3D <0 0x80082000 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 0>; status =3D "disabled"; }; =20 wdt1: watchdog@80082400 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082400 0 0x400>, - <0 0x81295104 0 0x04>; + reg =3D <0 0x80082400 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 1>; status =3D "disabled"; }; =20 wdt2: watchdog@80082800 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082800 0 0x400>, - <0 0x81295108 0 0x04>; + reg =3D <0 0x80082800 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 2>; status =3D "disabled"; }; =20 wdt3: watchdog@80082c00 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082c00 0 0x400>, - <0 0x8129510c 0 0x04>; + reg =3D <0 0x80082c00 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 3>; status =3D "disabled"; }; =20 wdt4: watchdog@80083000 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80083000 0 0x400>, - <0 0x81295110 0 0x04>; + reg =3D <0 0x80083000 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 4>; status =3D "disabled"; }; =20 wdt5: watchdog@80083400 { compatible =3D "renesas,r9a09g077-wdt"; - reg =3D <0 0x80083400 0 0x400>, - <0 0x81295114 0 0x04>; + reg =3D <0 0x80083400 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 5>; status =3D "disabled"; }; =20 --=20 2.55.0 From nobody Thu Sep 24 12:56:01 2026 Received: from mail-wm2-f13.google.com (mail-wm2-f13.google.com [74.125.225.141]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id BDF94495056 for ; Wed, 23 Sep 2026 10:41:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.225.141 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160085; cv=none; b=Nc9mgyR+sBt/pC6tN+LhxGNA60EGcYeJo/euPjZJ0cSfocAh6eG8di1mXQY7qlkoyhGy0pN9QGWRS2LS1W1Pw+ghAP5OJmZkSKmglt/1sinv8d01rxTDCvSZF/qZ/RIXEtVge/LWhvfex+wsXXKAubBq3AScZSYZaZnwnIvWEck= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790160085; c=relaxed/simple; bh=tXbNh+yp4d7OYvEr6iL9Urt30LNuiyNLWr2xkFpYX0g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lS/aiPp7mkJqMNMMT67S7Ca8H5mBzceF8AnQIqU3QLhl7Scx9449Xm5TRDbEAFlHEH0rh393eeIXtIphPxX1/XdLws8i4IfOXbwxsMoNS7emxi6x3LIlhLEx57Vn6uThve6+ib465zBDv1Elb/cqFv2G3vGTk4SkjVmZdZu9w0c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=qEpO355A; arc=none smtp.client-ip=74.125.225.141 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="qEpO355A" Received: by mail-wm2-f13.google.com with SMTP id 5b1f17b1804b1-49e7d2bb404so2499065e9.1 for ; Wed, 23 Sep 2026 03:41:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1790160065; x=1790764865; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=d3YK9ZqrOI8tvqhJDLZg7k2Geye6C2Ui46D9pXHp0YU=; b=qEpO355AcaED84RlQcP9EfPBQgGB6WwrdQm33rBCcCjXgy3g9uBjIpdvkKt7qo9b9J AIkBXmsM3gBN53dCR5a3uMIJSMj8dJYuia9uYZGPznPaMLWWzPZfaEt4IX4W4zdTQQ9z HpxTsaeRaJ9riX+OD8WbPvFiQuFsEYlXYRoUV2krSh55OljviI69kNqxNOa9B006ZwIV jEo0JKotUUZetv4q0/dIows9Se1Y79qJICGKMBO4LPii8KSO+dvHNY8EhDIRlY783kW9 xIkGwu2J9jvKET0/Bn+5vqYysRIZXfgsZVuu68BNoSIlAF8X2IXQcp0AU7lB1cLUmKjX aBfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1790160065; x=1790764865; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=d3YK9ZqrOI8tvqhJDLZg7k2Geye6C2Ui46D9pXHp0YU=; b=EX9nq2LW1RctpmyrL7v/3nGmo/tCiAMihZxn4D1PjhAxlcN8eVgxFGQWJYBN6fNuVO X1GtL8d7cgMyTN/NiToNEk7S/1DiD4Wyy5txYb9LHOBIEuR9kEcFc3WzAUlBW/GN0Hj4 JieG9nzMe32m4jBzZp70GMaGLj8YF86I7NtXLOG859w2uM94H0el+1+xSTPA0fCp/ksT Otb07Qz27R1Zbe+EYKPCQncuG/AuvBtPFAwdch5noF40OmHNWVOCIk/tL7X7xkF/85T/ +HwEB1Ib2TRRg1NT6QOv4B7m829UCQVJ5TNfHMmUzOyZ/LQmbAKHQ8s0pDJbrkaP/GC7 yYXQ== X-Forwarded-Encrypted: i=1; AKwUvBzre8XYMGDg6lcMTwDA42FI/GKuyo30ByOylqV0MGqBtDxCcJt28fqHvsAHJcneYrM2QnurGGgo7Kw1/zU=@vger.kernel.org X-Gm-Message-State: AFuF++nHo1iX4M9/Mn++APKRkH0D/SiQEsPKaS3VQwKBWpBuDnPvmY+F xYADbfn8D2PxLgIUmF0iKLwCU4UIL+qbshUOAnboT3n2cQUaqqTSp1KA X-Gm-Gg: AYBFou11R/rh+KxIrmzk/wibNQDLfaLouiHm9+qXodvXaQHAsi5HnCO4Q25kmrh+pf+ YJlgGYQj07VC3BwVS3Mw6eRSZOGfEis76BK+9pHI/T1KN1C69eQIXH6d0MzkZ+mVkjOTw3o3OUn H8JAxrwUEccqXVz++PT0/iveFuiiqmD9qpw/wn9Zp5DZQ2mxM04GNZudf+FxnXpQQeNopDUjvXk PTQa2Jr5q8hh1li+vkGVAnTZzBE5Lc9rY6zyI9rVlM2ouEmDdOM9jdX7oVSBGhNOa2fezFxlf6k EJ+NjYWtFEkfFWmM1NNKbkEkFabWoTuzaaXtZ8y1Bf7mR1BDtKWEE9coZaeRNoY+yRtwPccCwAC dJX1X9C3tFwvjY6ZnQI9OACbChySts+7ckIAjpDWEYK7FBwbeN42CbcgTojtyomy5eDgOglPQ7I JUtvgTd8bUd+GnLILvRP5uM++86fl6mXZJCqfbF1ixNhaErFiOXe8kl5nWAB62x+GrvyU3+CS8x 788Lj9msenK9a8rJsQMPJ77CuxwpCYlW+oRwlECqnQYt+zE2tvjPuOBp4UmxoCeSyR+vU/q1bkg WDpLklj/r9vxzJgOw/8= X-Received: by 2002:a05:600c:3b23:b0:49e:6ca6:d40f with SMTP id 5b1f17b1804b1-49fde4972admr34153775e9.9.1790160065172; Wed, 23 Sep 2026 03:41:05 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:885e:6ade:cc5e:a35e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49fde1acb91sm65170415e9.15.2026.09.23.03.41.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Sep 2026 03:41:04 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Wim Van Sebroeck , Philipp Zabel Cc: linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-watchdog@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v6 8/8] arm64: dts: renesas: r9a09g087: Use CPG/MSSR syscon for WDTDCR access Date: Wed, 23 Sep 2026 11:40:54 +0100 Message-ID: <20260923104054.3324830-9-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260923104054.3324830-1-prabhakar.mahadev-lad.rj@bp.renesas.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Lad Prabhakar The WDTDCR registers for wdt0-wdt5 reside in the second register region of the CPG/MSSR block. This multi-function block is now exposed via a unified syscon regmap interface. Replace the direct mapping of the individual WDTDCR registers with the new "renesas,sysc" phandle property pointing to the CPG/MSSR block syscon node. Signed-off-by: Lad Prabhakar Reviewed-by: Geert Uytterhoeven --- v5->v6: - No change v4->v5: - Added review-by tag. v3->v4: - No change v2->v3: - Renamed the "renesas,sys" property to "renesas,sysc" - Updated commit message v1->v2: - No change. --- arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r9a09g087.dtsi b/arch/arm64/boot/d= ts/renesas/r9a09g087.dtsi index 68c8daed557b..abca7aa89458 100644 --- a/arch/arm64/boot/dts/renesas/r9a09g087.dtsi +++ b/arch/arm64/boot/dts/renesas/r9a09g087.dtsi @@ -327,61 +327,61 @@ channel1 { =20 wdt0: watchdog@80082000 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082000 0 0x400>, - <0 0x81295100 0 0x04>; + reg =3D <0 0x80082000 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 0>; status =3D "disabled"; }; =20 wdt1: watchdog@80082400 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082400 0 0x400>, - <0 0x81295104 0 0x04>; + reg =3D <0 0x80082400 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 1>; status =3D "disabled"; }; =20 wdt2: watchdog@80082800 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082800 0 0x400>, - <0 0x81295108 0 0x04>; + reg =3D <0 0x80082800 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 2>; status =3D "disabled"; }; =20 wdt3: watchdog@80082c00 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80082c00 0 0x400>, - <0 0x8129510c 0 0x04>; + reg =3D <0 0x80082c00 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 3>; status =3D "disabled"; }; =20 wdt4: watchdog@80083000 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80083000 0 0x400>, - <0 0x81295110 0 0x04>; + reg =3D <0 0x80083000 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 4>; status =3D "disabled"; }; =20 wdt5: watchdog@80083400 { compatible =3D "renesas,r9a09g087-wdt", "renesas,r9a09g077-wdt"; - reg =3D <0 0x80083400 0 0x400>, - <0 0x81295114 0 0x04>; + reg =3D <0 0x80083400 0 0x400>; clocks =3D <&cpg CPG_CORE R9A09G087_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; + renesas,sysc =3D <&cpg 5>; status =3D "disabled"; }; =20 --=20 2.55.0