From nobody Fri Sep 25 14:33: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 2C6AD443C39 for ; Fri, 11 Sep 2026 11:17:51 +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=1789125482; cv=none; b=ltY7CL1/dNzUPbZtwIdMXo/BIZVF0XgROsqbKGMlG4hsU7y/pCHjI/PD4QxZaP5s9J/kbfE7e59z4ZgDYCehl+UvulSuJKzvzTx6E1LTsStVNBD6H9tvF98qxe5E2AWnlvzIEgxch6jGKqqe4rmIwarKNLEucCNGMpoqeZ/FCKA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125482; c=relaxed/simple; bh=KyfbDt9czf3+HI+uydLbr5vC6KLYpGEYKOcYxmAcr6s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=mCjAvXsUtc/gHGeJK6JtsocpzbBQjnHPR06NHYyZLlKJmcqp2wprtpBhswytfKU77JJHpsTmD0NG4pw0KRJABxUWDB1chvkaDVKwdOPuzu2KbaWg/48V/jmYeey57ZcJ+x8k6e8fMsc9QNDoZAdefBELeRAqdT8HvAkU0KuUOeE= 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=r0X4IQvx; 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="r0X4IQvx" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49cd6185db7so4697045e9.1 for ; Fri, 11 Sep 2026 04:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125465; x=1789730265; 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=sS5eU6IT9I1jv6dzRX1Sx143P1BXIUwdXxgwRP/Lqvw=; b=r0X4IQvxCbzOW7exDOnA1OsWQcSLxZqsqsHwW8aGQ0DzV60jQb0CzskZwoaPJguVa0 hKVjlfgoAWRArRODmBt8vP3foAen9RgAcH07orqHTl6tWRqqI8ufudSpZ7X1Kt4If48b aHOJcckHTlOw9m6nlnjTR2mdA0GxXSq/Jgs0/UgPmdTDjdXU1FANzTWvglQ/Wy9mXBlB M2cXIBX/XTiChYZBmp8k2GXY2imu0mRMqJyuUqb8Fl8dBftQmvBEzpHD1idaGZtWjAKt K0gsZSzmPtET6G/QdpuCEKVjDZRjfII8JUdcO8oeXG+A28h6fb+WMdzRJklL+dTG7HNN wPSw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125465; x=1789730265; 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=sS5eU6IT9I1jv6dzRX1Sx143P1BXIUwdXxgwRP/Lqvw=; b=otYIiZlAicidpKi+62iDLsUMLPHb4LsRQ9KxnK3f4Vlh1w51zBJPR4MygujPzNgrDh 55o3qHVjgNs8W7hNHkm8DsgKDCdsGNEqNoMkQi7N0MST+H74qxBrRBlw0VWNlWlmLApw s5lU3jLZOzyLA6Sm/QOAkxdUjRoW+OIKKbsWgL1VklNdmAQMYe9dCkM/dojrloC7BKkz +fDI22u+mknT0p2z7xlNw9NrzDvcXc2lANlyShCFODnvscaMAXOTadyayz0H76D+ARAE 5QYqSR48p7JB20N5tYrzWQfydUmuZh4/9J5N5a5cMaWlnhpQc2UrKSK2xMDn/xK7tGWS t6Yg== X-Forwarded-Encrypted: i=1; AKwUvBxN69kosz4O9zElnZa5Q4/O/vdIiN4nZy/E65dEV9Ik10abL8yThgOT3K+mDJ8HMyTIG+QnTchsodWfekk=@vger.kernel.org X-Gm-Message-State: AFuF++mtNC4MsLPhiVktyQMOojBkzu3dPBhSwMuPAmsnZhmLteBcqKNP 8cMkrtSlpZ+osNWbnOAssMGrk7rW23GyJsSfswbKDhYxvNUBmol6GTvI X-Gm-Gg: AYBFou1BieE/GYklgUFTq7hE/OvApq8h4V7lgEvanLs6YOUn2oJE1GCQlKwdYFT2Jx7 wrTkX6hDbz7lRCgtIeeDmsCyGveuIKCvJjWfqJvlKRbYIygFGxq6uDh+fBFZPwVuZxduyZlPe7K x3rGRQvubrZqZdTMr2x2BDo+UcUvhP8diZtnolmmhCD3UywOl2fFy03IeIXYwJ+ll4SVYCTQMLu oH+ds9Gf2jYdsLYkIZvMZDcKxCUJ1UXqD1FUctqzvoicWxVmu0GlfSSjqScBzec7F7PLk066xve wtT2zV8gnXgiy3fGqR/mRDvjdXMurKq+CUOMQWPnODs1cSF6qCi8bdAv4GrKMFI04GVKh0bOFJn zK/OpQ3k39j1yPk5SCf2V0PoZmfdvcSBvJWp18RQwRw7gsphU4jc9bSkjnTtyccD8LfCO/Rg/yc Nw5AZe7+dByayZdNCE0KYnZaWmL6sf0iVA4ftzVeEkGZQyp5eR9ppBqYyXrwt/QOvjZlR+hPtu+ R5Wnr4l5ZwUwVxdBRLpNGFvkvtVjh7V5vV/4Zbrj7DAioO7TrggTaqB0szz4muVb6RoxoRRgJBi GAUMPZNQzv0INlzCIR0zv5KQOz7arg== X-Received: by 2002:a05:600c:3b1f:b0:49c:e37e:4389 with SMTP id 5b1f17b1804b1-49e60f6955cmr48817515e9.4.1789125464885; Fri, 11 Sep 2026 04:17:44 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:44 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 1/8] watchdog: rzv2h: Drop enabling clocks in the restart handler Date: Fri, 11 Sep 2026 12:17:24 +0100 Message-ID: <20260911111731.3404308-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 3b6abb66a1da..bd86da71b0eb 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 @@ -290,11 +277,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 Fri Sep 25 14:33:01 2026 Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) (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 4F6E344F55A for ; Fri, 11 Sep 2026 11:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.50 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125482; cv=none; b=gSyz65xILmdYcGkE20kyCpebkISDpslQ4R4vuyAdCU0Q519f/l48SDov8wEG0nK3nIQ15p7DPD5od9KyraE1Z9XuF795KPpLo0QeMQxz43l/mK6bBSdRCufwCDPDBCSJ/ZoVXrzDTqHZ+2zxl08OkqtyzylOUC5R5KxC6Wud/hY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125482; c=relaxed/simple; bh=fDZDTRI+aWu5LN17RJSF5MWiMpzqvK3NEpOcipYYhvE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KVTQjKy4m1oLvPo8qH0C221XWp6jzsEV4GV36EUI5hLm4W/2NAsDBWT3lEajbBUgKzGLeqF0saBfyeZGsI3/n0DlohAyBpPqj0Wr3NEE3cGnaosr2++uX5XWKdnMRu4VSRCNrdvlKvc051xPNbe62+mYrZzxwG2H8LuEfs11jn4= 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=r/tazKqH; arc=none smtp.client-ip=209.85.221.50 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="r/tazKqH" Received: by mail-wr1-f50.google.com with SMTP id ffacd0b85a97d-47de0093c42so734131f8f.3 for ; Fri, 11 Sep 2026 04:17:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125466; x=1789730266; 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=MZ6D51q/BQlK7MtFm054nWG9+DWDS+0mGNHkgeO5IsQ=; b=r/tazKqHQZjNLTW/Un2DkbLqNpel8YAooFL77376x5Z70WVE+bmc5f1fHER86XCRD5 NFfx9KaQu7Umg6mf8Nd+0xxGGClz7PbAIOkPSZ9GAD6dnJ28au9jixEMJw9YEBja3q9Z V5ptaG1XUpjKaNlH94BNqrY6u+wyuTTJDIz8OB2n040hb91aNnvix+ayb+60PeTAiGjw tScOrnN216Abizhx/oCAeClpuBEONmvnM2gJVDUbz5sIrAo5we5DW1cBj9xtyhDtYElc y7XRViZlC1ZO/tCEW84hxkbQzISNYGfvsowKyIWaIkP048rdQ4V7yYjX/VlyZpUb1i58 gFvQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125466; x=1789730266; 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=MZ6D51q/BQlK7MtFm054nWG9+DWDS+0mGNHkgeO5IsQ=; b=Ry4ZFNC7ROI9xYGy3s3Si1+N4O52tPgYzYAF8/OEU050mkGYAMlYt/YdgU3jjPKDVl 4G5DvpWsQ3RpvXh9Qg6TpguU77/kjo/nHMO65Qha/+8uEAxck6M8+rv/vEqvpIWV67z6 STerbexf/6nZ/Gzy6xS0j8ryaqM/t4s5iSNCEsH/mi4Dhn9Im+7a+dAJqJCtpS7dMfQX H4R2baNN2fTTvYGOCg6MP2aT6ydVXFiY74hc8wsT1brAvCoW9BthiMecr2f5ZxzMCKBA 6zv5YDsnn0WYWE6l5ltpyHNVVPJfw269x0b+4r5vqCVClv8hD3IFQaRMpnnHtxvrKaSt Xd1Q== X-Forwarded-Encrypted: i=1; AKwUvBwWc+FYEemJzRRsMD1Yt2yZ6cl6z6Hk1/BzlcHY8MCxmhvUcLSkwgan6SVufFobBfNysOhuIUW/TqViXjA=@vger.kernel.org X-Gm-Message-State: AFuF++ldeEeO3i5hrrLRiI6A9C6mR7x8YQnyIh8cHq7AbVP9OHEySEr5 qP7mtuvaued9R7iQ1iz573VUbebUB/tv34nGicr0bjl3c3whKW2Ha+VZ X-Gm-Gg: AYBFou16Mn7gGbPN8WSS3lAq5zPxw9V3F00mCxYJZsfocaT+do7I2c7oD8WBgxaurZv WIzQsNH12BUgIz/iUs6ZZCx9EZ4L5fCKhefqhmMLLsU+MKRi1KghjRRfrFuDuNr2cWp4U6lePvY DOTtxkrTMH7/bf/lrvkhh+FPSmLhECCRixDSe5gQpdbZJfpjjO1Z1hj5sl7pDdvu1kGFkrmn5ns s9gieZuQhRjVDgwlgiEj/qdxsxU+e0UC9UlKqxI9g/XJmXQIIRV2c3HKEV0YSCxg8Ms8REVJ/Du Ky2lgXJe/S1SGPHFFkmzJAhzGOGEnYEPz6tZmuPidxmHHt5k2Xu08slxVuP6NVq48/qbT5ZPcmj U4f9zt+Q4Q1uU/m5JU/xd93ubqxqFL6pAKZIFgf3bPBsrGJun6cmRcDRXpNcKeviC7o7N4lNqT8 k4cWwMctdSLWPHFl469r51l/SyczXfnBvvm9wnpUQh328UC4FoNOnQXFWiN1DXKugyB+14ckmxc CC2trXZ2GL7g6FeT3kc6lj7gDEge2Wot8BN9lIuPF+xYltClFtt0WMgq3Ggvu8UAUwso8vUfG6e tbCYcK/83mV7EQHThYu0 X-Received: by 2002:a05:6000:18a7:b0:482:de48:c445 with SMTP id ffacd0b85a97d-486eace4fa9mr4203841f8f.11.1789125465635; Fri, 11 Sep 2026 04:17:45 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:45 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 2/8] watchdog: rzv2h: Drop WDTRCR_RSTIRQS define Date: Fri, 11 Sep 2026 12:17:25 +0100 Message-ID: <20260911111731.3404308-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 bd86da71b0eb..7c6a4855bd8a 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 Fri Sep 25 14:33: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 259C144F552 for ; Fri, 11 Sep 2026 11:17:53 +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=1789125489; cv=none; b=tfYIJIPKTVfUCPUfuf5vQLkI27VdlA57iGvR8xuPoh7KnBNrKnxdkxZPpU9XWo0Ftf7pux/fWPd4UUGHH9ODpCXtM2HIq7jHST8IziaWuYTXynv/kWpoiKPL8arKavPw9Iz/6vES7mTRLtMm+zpskHTPQWnQ3hIOwQE8rR1fAGQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125489; c=relaxed/simple; bh=o2Tt/yZd0egGDvWknmiYQzQA8JdKjOEMa19faoQ8SpE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JAxDRwzsq9B4WwB1seLPNJyfGg4B+ZKKccyoW1J0/93vG7EpnKgtiU/QJElZADzP6sQI4JYB5BeghoUpzIaYkNyHhUgG8osnM3TENJj3TnZxul6PHxUtDdVisCcEL5Tg6J/3X/jdt7l6I80gyy+XMksyuHQOUgqNegaaOk2HJH0= 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=fc/nwl8k; 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="fc/nwl8k" Received: by mail-wm2-f12.google.com with SMTP id 5b1f17b1804b1-49cd5462b69so5122185e9.1 for ; Fri, 11 Sep 2026 04:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125466; x=1789730266; 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=NXZjEIsYlhrDTNZ38lYdKcFWIDewXWmia/iEsbM8DKc=; b=fc/nwl8k8UamwQgYFr+A3yqxLg9VTSJ9yGavNWm1xg3BDgbMggz26LDX+cAOWdg7q7 UvCiArina7hDecsq+tieOLKCNormSkdujrzWTBGxmwxhQ96bOyFGPzIhptWjXB+3e2za ltdMOYRwGxu36ha/QQEk6BDhz1KOpAOHjmvEMpcRrvyes3aWb7AYeZaZv2TnnJpHorkT 6ErG+rGuvTbXX/YebLkIcTz6L6IbhZSNTfC65jRpD52tVxS9ui4Ngdo9B7fQBzrpdoEZ K5FfHkBxjeML0/Exht3NiJzwnKlUv0ns99H6/fnss+SfkhW8wYvuID06Pgd1A1SDA3tj MPig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125466; x=1789730266; 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=NXZjEIsYlhrDTNZ38lYdKcFWIDewXWmia/iEsbM8DKc=; b=qSfli3B0kj6C3Sk87H5911JblEpOlCsTZjToqZf6hgsBroaVOZGvxcUAi9B42gQsYh tzpgHTl6dWSD2oo5GH7Gn2Q+I5B9tprrJDP94Neg4aUo5VPgWGkassnc/7Kgq76YYnom W4zW+n+phXCqnuUleXRODlGQNnZwyMIZ9DfeVgAoqlXB8rEIFg+RSITASMROa6sy3WQ3 SyM/gVjy1AycZg+BLK7jCmH/nPT3MQHKjbPtzzb5ZdANWQPAQ05swn7mCtflrPdblmKr 92qvLRkuwXbzChe5sFXqUNCYDEYKNUISp2orNR+Ri7BKKbHBZgbhUqNCFcD4PUS9Yxjw NFmg== X-Forwarded-Encrypted: i=1; AKwUvBwVHg+Dlgy22fhZvEhyLS0GapgbTlDx8cpLZ4VcTOmer3Z/zmum/Rp0vkFDyALnLoAHB+6Q91eAFBrsBxw=@vger.kernel.org X-Gm-Message-State: AFuF++nPZGeDoP7LoMuFv8g6XVk4zktDKH/W6bBtwsIYEGGi33jaCaeH cpmadX2aLCl0uWtjD3rGKBrqe4XTmzyguNzI/P+eTM+ryMq5cWrOCH2u X-Gm-Gg: AYBFou2HWlihsiJWG+hFiiaeTfJjdTsXxY4GflAKRvydSXe9oviTWNOvFn1MQltoKk5 kIk+9UNEaxBgHPFBRfIYnDwccI+KVeJXk+UlYkss0/gpk7L1GTk/NdHiJTTdfHQ+wWJJ0DrE2+K F5ZnkXI8IEz96WE8xsbw/i4aPgJcqOiHGA/z5CLvy/IvMIpLsrrs1CKrQkRHfwuue6eCLcxctPx jDCLTc+J81EyY8QLI1kDbD2XPoZj1dxJfDbYzUTXiZO5CiGe++SQTpfCRLbmxgkHBNmwlDUIJe2 EECs0O7Kwuptx6wgTOJPTA1FzQ8YM0/HEHDi6OM5Xzp7suQBXZukn4Z99Z387BR5w4pJDmsjAt/ 0MpzS3oqq/1+XeTrYr3UyGMmfRucO0UI9LOEA641rFOC9/BhI+mQnziZFqp8tcavT6PmgOL6QUN FCzi0uHB5zGbyJG+ERmvHxpX2g6kAqGugcFu1hO5656+r9S5QuqyVff5v2USuw2w1Wt5B5Wr7gy 5cablKUk6aplQrPZPWFWlfm2rIznZZ9NQ3nvtGlhB/0EldbJnJ27/cK1Bg3bSrBTS0A7A+qu1+K 16SZfH8Kp8g2+ZzZOgJVU74njzbtfgc= X-Received: by 2002:a05:600c:a40e:b0:49e:65ac:eb5f with SMTP id 5b1f17b1804b1-49e65aced4bmr38572495e9.10.1789125466496; Fri, 11 Sep 2026 04:17:46 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:46 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 3/8] watchdog: rzv2h: Propagate WDTDCR access errors Date: Fri, 11 Sep 2026 12:17:26 +0100 Message-ID: <20260911111731.3404308-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 7c6a4855bd8a..cbf414e0c9a3 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(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(&pdev->dev); =20 - return 0; + return ret; } =20 static int rzv2h_wdt_probe(struct platform_device *pdev) --=20 2.55.0 From nobody Fri Sep 25 14:33:01 2026 Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (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 2E4CD44F579 for ; Fri, 11 Sep 2026 11:17:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125499; cv=none; b=RyrQoi6r8TZTpsvn89XKwwEgxw0xOkTplXzpYt07PET+Vjq9PN03B7ZPcgzaRI7yZOgxCvCq4HYVtFPUabcFiazKJBHcLpKyjJMuzGvA81X+xOeHzGi08FBM4l2duEu87a1xzYJXha+bHvPkZJUX2beeBDnkduhRwKT41w4Fwo8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125499; c=relaxed/simple; bh=poHAk1iRSPkkWec7SAiFOpPgNT8Qb8coRxeZh15oi9E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SGs0N2slozew82zEAi/TqSMtUPVrbLYpmP7zTiXdb67iS9C9CHHMiWP9PtWTMYNBuw9H/aQODykF11G/XDEPMZSIJCLU35f2fhtBPnfLpKfmOpSeG5AC7SaI3ozPR96RO4a+UUuWofsgLlnPOufntpojqnMP4kD1aWUSknYJ1H0= 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=Q6HveQpq; arc=none smtp.client-ip=209.85.221.52 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="Q6HveQpq" Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-486e70f2457so363872f8f.2 for ; Fri, 11 Sep 2026 04:17:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125468; x=1789730268; 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=DfnV8b6AfEbN3w+t4mx2Du5Ole8Wgoa6AgZfitPXjMg=; b=Q6HveQpqJH0GGeri5qaeS1Zegh/Rg8a5oqcldnM7NHkB/YE6sK/c8zO3kBdc7/HD5l nglevh2+glLXKTQkg7FoGg7h5dy19g/ReTCjjUlB/T65yDe/IMuctxwa3K5G2MRzEEkU QRVvdmZQw25ZNqpXQJkpnGTnKGAL65iwEaOe8xyrvr9p9EkNVCHaaMTVFiKhd2xNypTf VQRQMNkFWOgFFSTURpeRwZaO1LOb/wwaTiul5lC619PEyqkw/HDqG55ld+dRQT2J5O/o 8sIOBQe4+G0FTdetirra9kBdeSX+fPGHrOm4ew3MY38b3XZs5hkLLfII5jqYPpjYnFUE Vp3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125468; x=1789730268; 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=DfnV8b6AfEbN3w+t4mx2Du5Ole8Wgoa6AgZfitPXjMg=; b=Bcl6JFTkcxp3t0MD+FjHUzNUTOtk7/NGSOzAY0m/IV15p12GPuh7SZKkWg0a//mCI0 iJBbTF+vFEsxqvCzrWrYS+Wi7eAbancQpkcDHjCMv36M70bg0XjrzeEIBwqV5zcm2fAP x9B+U2fB6eU9bqmxhrmc5DbJrKB9C11RB2VVuTyQ+W+5Iad4lYJ+FPl38lfHEpcgrefz q7EUU0KzVH4mpEKn3PIM6mbbIs/NhvTufqG1HOssyNF8n29W2z2TJbm46hmMGb7gctk0 z3D62ofJR6Te4d4UqQgMUkC+WAd3aUItG4rOewa4bg++jxzUZ5qUe9hqssz+BUelfncF jadg== X-Forwarded-Encrypted: i=1; AKwUvByrNRdPjtdn9/7jlMndlze4waYNzlbe2PgKyJV1fTUVjaP5I6gw2Mnv91t/tLPL5sr8ou7rucocvJF2IvE=@vger.kernel.org X-Gm-Message-State: AFuF++m6QnAT00/JZL1k2uscNij/BH3Z5CIF0r0/ir4e5bYLoIvpK3c4 7HPHNW6XqvsLumJtn7QM8+GllTpMtH29klsM0N0QRkwAhc1Bt6WbK41K X-Gm-Gg: AYBFou2jk1low70l/ynwo8+zCKEoE+8pStau76InYEwOzuPvBIUlVUoEx8D589Tm+aW du0DyAo0iUJaGQRziZZD/b6br3yxPnFNQjT7+th+1LUrYfurq7lCZknzjQIxvjkmbPsj3jQjWpF SyUS4PE0IeCPlyBDSX6MJyp+FAWeFb655ZsDs6CyBiSMj3JFZ3Hb8NEbvQ9o2J7bBSLvUEsM+jw yOIiF7mZKhwV/5vUk9nAcKNqKOzk1LUC5ztsZYVAdyZ5rvR4EhhVpqLdGfqQGptbFtJ0Y4vWlCj LlKMm51zZJjLUoKqyYlNjN43xUsd9SV7l4xFRGG1zMSu8fl39YqDek5HDq3I15pjdcN9G9YLHy7 dqIC25OvA5c0FkFcAjdOovMQ9uxRBLWI+7ob4+QuVi/y/TIDmUh8x+SRwfR4+mkkz32CMFmHYef aGpDv60hSpfu6vbegA34kf4vzmmx1rSei5hL47X1lKu79H7oyOfT//f8AHv1rpkqUBzBvJlBPkX 9vVlettM8gwJKt9m0ljiMacL2BDDwthnrImeMORxMtnBqdiVLuprFkFwir6LP7QAbjoE0yZEftB ukpCggsasGdoJ2OVn+c= X-Received: by 2002:a05:6000:2c10:b0:486:e37d:c57d with SMTP id ffacd0b85a97d-486eb345e9dmr4546787f8f.43.1789125467738; Fri, 11 Sep 2026 04:17:47 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:47 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 4/8] watchdog: rzv2h: Use pm_runtime_put_sync() Date: Fri, 11 Sep 2026 12:17:27 +0100 Message-ID: <20260911111731.3404308-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- v4->v5: - New patch --- drivers/watchdog/rzv2h_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index cbf414e0c9a3..4a5a856060e9 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -270,7 +270,7 @@ static int rzt2h_wdt_wdtdcr_init(struct platform_device= *pdev, =20 ret =3D rzt2h_wdt_wdtdcr_count_stop(priv); =20 - pm_runtime_put(&pdev->dev); + pm_runtime_put_sync(&pdev->dev); =20 return ret; } --=20 2.55.0 From nobody Fri Sep 25 14:33:01 2026 Received: from mail-wr1-f43.google.com (mail-wr1-f43.google.com [209.85.221.43]) (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 38B8842F6E2 for ; Fri, 11 Sep 2026 11:17:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.43 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125482; cv=none; b=LDsy9qufME8zsTPiP4vuoPxS1e2o5bfzoOZzCG970VRrBoWpr8XkvGZZG7qqbYBPcucYvqWDqhtzV8GsULZzKKTDWU4nxBI8UvJZNgZx0XgvG8ONy7LLoAJ/IZ0R9rUK6HGdMEUOxFLdU2nvxSDcm1lOXFWl+HyhMDZVsBdxEyI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125482; c=relaxed/simple; bh=M0s5qNvm6lgULK2n8QPcCEFSAsT+ro/ADdWPoCKHveU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=H6eg+9xy/hQE658RwtQVMVmMBExFGclDaHIGJefSg/Ko2qXxUeLGWmyxCDuZYbVZB4Ad9BeuzdwMz8LV647xAsTqum2/8eqaqVHAklUwx9dcDJ8pY7xa2afTKU40O4m72HxeKyd/oOvFciXB44Ad28FDEcO41BWjbosPjTgD3Rw= 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=AarCKnUS; arc=none smtp.client-ip=209.85.221.43 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="AarCKnUS" Received: by mail-wr1-f43.google.com with SMTP id ffacd0b85a97d-482ea739de2so509951f8f.0 for ; Fri, 11 Sep 2026 04:17:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125469; x=1789730269; 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=p4YPgDFVhAPV2YkfLlZc7dMgt04j5FYtenK3LnM0C1E=; b=AarCKnUSfJOClWAvJ+OrAx55BwAHtyhCbm3WDAcb40MVl5HiPbrLCCFgrSQMH0XEK2 vUiE2Wn5KPH9bJS97Qz4Ou3U69Iku/Hvu7GHdDjjmmDba1ebtEvqEpq1r4vksdiPUptU XxQvdxixVZtcBO0g1y3SUXpm3g+tWMaTnreQ1P5STqXxYtm1tdmzDzDlaMlRgi+q0j68 Lpba6uJiY/LU6YvWgElL+n09DAAyyLqdJfOujv5FOv0KoU81rHircYuppQ2d7gfEJ1Wm zu9hZGlV2h8lVEbuy1DuFGM2fTqVnZQHywjF0a3TjWQmUpxoEiuWJzk1Nr8OBJUxsyeW a7+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125469; x=1789730269; 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=p4YPgDFVhAPV2YkfLlZc7dMgt04j5FYtenK3LnM0C1E=; b=T8olVmq6DavN/OUfcvlWbvhz24oC/SioydAoLRZ65LxEIpYZbypmEqWP0VSqxdtjWb BoWBNstZTtGv6RDjrCUrv1ifQTVGiI2BTmlCo4yPHoC9iA8BByaJFqM7cwMEo1O/G6ZA qLQ2+p1hK9e7YtBdYFjPGMaVH0YGH30gzUUGgb9M/tqMcm5Ogw19/FZpgTRL9JzhLkc7 GzdbELdIan8oPtncRaBGSxEu46/aEVR8iU4jNxruEgen75Qw2HoTxN+ozHtrJdptx9ZF GiH6luMI+Ki139EzDaY0h9/PSPhXMv8ZMo9Y3A2ea4wfJS2TxBwXEqK3U3Qfm9Anfinv UL5Q== X-Forwarded-Encrypted: i=1; AKwUvBwfM4RilkxNKPyZEc/1fDAJvrHfjL/JFrfmFt0Eb4rvrjQUXHKfTYyzXzv1kR8n4WGxcjxEJWISaxKBaiY=@vger.kernel.org X-Gm-Message-State: AFuF++kolhSbpjT72RoP/2NOVfV29e9BtXsmeyGEo6Yesu08LpscIDZF 110Da1Ytl/upLQ9woiS1Q0gNyV8IBipT1hUacu+Fp0tReYw4jX7Wbheg X-Gm-Gg: AYBFou3SCvVlhaD6WZcGoIJ16hvk6F8GBUs7tKMWn01Leg9AKaH53Oe9Uo6IsEAK9CG 1EKE1A9QR82KoTyOKxNYNIhsK/zJDnmN0FNEhtu+ZGALniEcrCf7gT05MI+qDAX4YDFRrtVmqs2 R3jdfI05WOHUTWlk6Zg8lBF+AxqyGTTXnrrjPWxV1hO9J5P8okGzqIUQL2nG1XQ6UG3bny5OU4b OCXJhQMNYB+BXpMO4/7Fmjq+YFT2WDMM1OQZExqOybiYbP0nf1nWNw3RQz2kge8dGpHsuRrPD8/ vXXANf5hPAf72XZp26+4dQgXk8qF6dETnFq7fBU/6AHqvvpOgvxFPa5Kxa3uI5rMCfJhRbLOcg8 +xs3l9ekIQPmRRJyKVBJ+f+B10UxfFe5XjMNX/AgF0RGMVmn1+sVQRIyG0ZvpJSuekh+F0jWsKX 3I8VUHcoiKh9z7DoMC5P3gzDV0jpgZEcjtCJY6Qun5bQMsGViz2pxA8THcujgi7X7emLYhSG7Cb Tzy8bcFbu7RsrA5xSdzWE9IX4uEU2Ke5yDaTpgTCiOfX5kSYVepXtMQRLZuL7TS8W4U5rGanMCT EehMiKVh7ZdmkZACbYOlwxL6NPtvHg== X-Received: by 2002:adf:f2c9:0:b0:482:e22f:a2b2 with SMTP id ffacd0b85a97d-486eb303657mr3242321f8f.20.1789125468686; Fri, 11 Sep 2026 04:17:48 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:48 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 5/8] watchdog: rzv2h: Convert WDTDCR handling to regmap Date: Fri, 11 Sep 2026 12:17:28 +0100 Message-ID: <20260911111731.3404308-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 4a5a856060e9..550112446db4 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); + guard(spinlock_irqsave)(&priv->regmap_lock); + return regmap_set_bits(priv->wdtdcr_regmap, WDTDCR, WDTDCR_WDTSTOPCTRL); +} =20 - writel(reg | WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); - - 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 Fri Sep 25 14:33:01 2026 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) (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 71683457E64 for ; Fri, 11 Sep 2026 11:17:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125497; cv=none; b=umZS6vkuN/0BnYp+2npabfzntYjhI/jI0EQfluIsmnC3ayWGG04KuaSI6x5qMvK/fJRQChlkrUfviMGi8cwkXqZUtmLiqnCfnHVHZtia9s5INCU+/3hEQR0X95D3YT8F6IMLw6eKeFD90/CuZKtCwuBcyc3eSvjFMm0VFuHqbH0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125497; c=relaxed/simple; bh=7kpJ0HynFt2+Fb9i+/TLOlwncx9aXxoDxSm2N81XzUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qAounvaZ3XcNGvzi6aF9PBk6AsijaLf28g2hPLx312cx4d8dnYZs1Aq2EVTYdR8bkjpRTKK5+fOB3ZKReRsYkTnvSfO7isaggR8eI9YD2sZSDvmWDPAXDtQMzmza0PgK10JXPl7wEfUSQOYk9keN8VtI7/fSO0/e5APtlRh8N70= 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=T36KFw8o; arc=none smtp.client-ip=209.85.208.46 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="T36KFw8o" Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-69f7fa1c548so1249973a12.2 for ; Fri, 11 Sep 2026 04:17:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125470; x=1789730270; 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=fbBV9me3Y/nkvKnsfG5cg/h1HCFDgWHdjYuS8kLRmRY=; b=T36KFw8o8CtHNsvSVpt6A+YN3pK8Ceb9kNsVedh1IZqCHh/IgCkhQo9AVx3oc1nfjV 4aNgKcs9wTb2eLki1T+phE+ekXA4INuMFb9EEVZBJ/6cqrdUrSEub2ZMoqF6maeRelnA bu/fANL9zf60yaTwF6RjvIlhdptaVWtNwxnwiTXaeEl7ebHHNi6DEmi2DBtTBPRaKuRW uIK6iEy6siU4tSGjJP8TWX1gnR28w5VbYDAkfFz7Xohlk9lLlbNcdaKH0QY6Hj2Bxvea B9TxT7P7KBiyzQKby0ck2Ukupn7P8GV2Zfr1T94B9SED5l7NstHRKZLA9pgiselGwCW3 PvDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125470; x=1789730270; 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=fbBV9me3Y/nkvKnsfG5cg/h1HCFDgWHdjYuS8kLRmRY=; b=kwpVzTHH3FNczAhFXlXsb2ieOWKTanVvNifMpurku2RDotWyzJjn5t/oC1VP8rQO8s o1QdFj18371vPeA5t/RBpgbcAjniUKWUVHoLYOPgEXQbk9o2A0eIwBQlM8p4+nPIsiyM 4jDDk7P9NzbRjFevHw9hOp3Xd95lJB97rEBHP58sI9qxnZ2gjKbfwgVPizHTx0Cjdw8p q93CiEaM03imxVJq3d/VjQr1Y5AzQjRnWGjlg8Z/9+fvjZZrQXdaLmyxqSnppu0sd9RD 1oRkYoKsb1cuPwc0dn2+XF1M1tOQly4PN4HtvR1pnJqcTSLrKhRvC4cePXmtqN+ZcR23 8JPw== X-Forwarded-Encrypted: i=1; AKwUvBxijO+nFdZiFRcBjGI1QaO7AIXjMTVR6Ff9WMPZOx5d7j9o9uLsm0MwSLwq2FfTY6++uckkv004XDIzEwU=@vger.kernel.org X-Gm-Message-State: AFuF++lAg4Pb0YehrIbTUgUJ+/XgW3dRWZ1a9DJNYE7EEekMNlvnGtZd NuMsYfas1UQ4Vkmcm4arGOTKWmMXgC0ATmcrSZcMLt+vSA91QpGxtScH X-Gm-Gg: AYBFou0o3x3+8IZQUEjAmkNgu7jx/GWN3W5ZjEnLuGwlO5VLaj+sVvTxFwG4uuLhV7c MZy/jLcwGbggizQrbN2RVYyWO65Csru7ttL65qDIlHMsT75/IT6FK7ja+2ZFOQjvVKDQk06/XB5 6+mWztxhm5DXIAYDIng1SMHax7RWjOS6GBWjDolnz3K+UsC/y/wqW28/yMPiKjpui5ykAaM+Rjm uUtm6BzdaXEwxeQbTnumZBrKg3cj3lz49dG0Do7MWJ+K8haMBsTnCWRkxhJyU7fvJnsXidT5TPx zEShNA4AFGCDIijzV1Bks1FRIX9p5+pmbwbA6ZDlAvR2dhSN2tN561qwrVkBMgXBFa+z0Urt1kQ 1q0qhkDfNy/qmTUK/P2ru1J4sYvV+Krqzy6IxMh3CY6wpao6O03PdCdrmhzYYUt0RS5FlNWYLSe 6X4APvoxXtO8cZbF2PDRAa39u75GKseOIaXcK8yIN3zX81B1rUkW0NAMAzw7tazwcCo2UFuYCKA Ug6GriBaX0VI7AZQr3Fazy4+3fSaeP3ASuAMIcDpMXWaExingrFCuSbhv072KqNqtQkYnx2AfuQ 6Nbk0FgcsgD4qaD+OZM= X-Received: by 2002:a05:6402:3907:b0:6a9:92f0:76c7 with SMTP id 4fb4d7f45d1cf-6a9b56ae97amr1630629a12.34.1789125469553; Fri, 11 Sep 2026 04:17:49 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:49 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 6/8] watchdog: rzv2h: Add syscon support for WDTDCR Date: Fri, 11 Sep 2026 12:17:29 +0100 Message-ID: <20260911111731.3404308-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 550112446db4..fcd1ff99c0ed 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 Fri Sep 25 14:33: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 BCF59443C1A for ; Fri, 11 Sep 2026 11:17:57 +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=1789125487; cv=none; b=S3aGa86FYErbMxSrxcaWX5guVy7WpZmAlW7h0uMCMPFn0MnuJXWSqgy6VypW4zofYVVfod3WxzICesdqgGsq5HpI1wkAHZ/p5RQq0HjcrEGTnPStNEUeQk1DQjNgeWJP1jjKhoU7mVkEP1tHWCue+8M/TomFAL3mC8//Y+ySBv0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125487; c=relaxed/simple; bh=4mxpI2/893Z5UG8GLLl14OQMNMqg1usOfIurJ8Ot5xc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ovgsqgk+1/01U1cZH6rhBp9LBqjBj0vwCoOm6e8eBXoafSUevSxggxb58hsDLZwkGzQxC+uLq/v/tZLznRcFFjZwe+31Xek4RO5zXykGCPZZpJf9vC99Ex6OYL8qmRPAdIBRfaiacjbqCpoLvJT0Bv0zV0PHW7PuBKXbSSnQzHQ= 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=Hj/J9un6; 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="Hj/J9un6" Received: by mail-wr2-f12.google.com with SMTP id ffacd0b85a97d-484366874b0so404125f8f.2 for ; Fri, 11 Sep 2026 04:17:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125470; x=1789730270; 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=JeO3ig0BGAoWhhaLOpxWQIYCf0wbWpDn5BIfkqhUQfE=; b=Hj/J9un6I6+pKzjcLr8Ag+M3oBqa0r+mVSlQ/bxrTdt8KTJa4TF70FhTz0JYP/WuZz TL/w0nR7i+Ei7D6l5vAX0CoUJ9N0CN/2hzOH+dNJR5GjCghsxbCNA3T/S5W2rEn7qmmu bHzc50aCvnA7XhkLH9z58YfOsHZBAG41xvqqxLWJN2o3q30CpYgfUm8BLtKewzF5iedv 2KPs+W/r8o6R3f6U+BoxJPgOK1DQbEZUbjHPtIk61SF0X9t2tgfbO2oc1URojnFPfDqO LJC8JOKJUGQhHveE601z/jOUFsw9O9iT4zGcLODCGs7fDH3HzfcPsXDR01m/e/SpmSJi WPiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125470; x=1789730270; 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=JeO3ig0BGAoWhhaLOpxWQIYCf0wbWpDn5BIfkqhUQfE=; b=dFeGHxo4dQrcH/vzptd5YKg0XGp864hcpBuEr/7n6oJ5VKofnQIaX/3uCG1QZ4PjZH 9sF1UbeJitH08XUKwQ2m/r7B0w10gjDwgVsbRyQbFGSYTw7X7KkAL3Zm5jsXtjI/gsrG AhVzruNBsQZ1M5qRheAl9SL8I61cRrPmCPY7Y/B04ciIuVo2tPw2AVtlg+KLIfYLHHHf gl5id63E0JZUC3Q7PejD0xjrSKUkiUa6l0xQsHna3Od+1uu2nuquIfYeQwm2uY63HJzQ vnxEJ8Kh8DuMZIKYUi/WyUF10qpo1QVXKQ5q2kS5BXLn5pxuOBpShZFfw3/X++TFH2Ue G3ug== X-Forwarded-Encrypted: i=1; AKwUvBze6VjodYbMTcMYxzB62RPcWU+ZyvKvSWHeaJtpAiIcnYPaFBAOmJIDj73Zsgumojr1SIOqhdnXS+6U3do=@vger.kernel.org X-Gm-Message-State: AFuF++mSJZ8mZLEaFl2siVX6HpCkfWWwcXlGVgTN1zt7F9KKh7KdmRTA ureVPuFPh6RFO0hJonwI8HN9GC5aEGUFZcQM5TDAiMMigJGZQ0alijqH X-Gm-Gg: AYBFou0kXOSQ/6o+CLjv/U5cOjnlBqc9kydljBA15noIVZSsezXeqO8dqrkvI1TRB5u WYFCNtCJwt/7OJ1Ebzlq058pXwEXzaSKrtKtvFMEw3tLKmK46odoTOjEuFbhaiBnGL2mqi8QPjz m6TkbQ4DlwISyPlcEr0X8AtG5h8iNbSjYRh3A1eKlqYQAM8m3dHj6U8nXarfuEbVSV0yLIyVuVQ FN3igWlEULTtzRssa2A4gP6GlNp6TNiKOVYUCKNhKufmJYInmI/zKNNtEt4eBWQLpmMbCU8agVS zcXlefU2OJezekQEI8eh5a3oBC5DJUKh8KePkLIlfwmBjdqTBzNkNjDRNUqUIDV8Dd1rpgafps3 LYgU4QfJaMM3PnpUELjopFhF+KnToyg+L2kKt1ohqy66uPu7ou6e3VcFlMO0XzgjzRYUBsep4Mm U7plV5hSY3siOklgPwc5WMN/9VS5WUHomuRy1qwdo17c9zD4nRQTg8eOGG0iDlNZipT8QrvwXIs KEvngu16QzU0lb033Vu7Mtr2hrwzxBOx9tWZtnJbdideIE7Agu5DkS5jTrDBBge6dCjezyys2Sj EL/PFyuNu3CcjCXBweY= X-Received: by 2002:a5d:5f49:0:b0:485:b169:54fd with SMTP id ffacd0b85a97d-486eb1d388cmr7915145f8f.4.1789125470232; Fri, 11 Sep 2026 04:17:50 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:49 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 7/8] arm64: dts: renesas: r9a09g077: Use CPG/MSSR syscon for WDTDCR access Date: Fri, 11 Sep 2026 12:17:30 +0100 Message-ID: <20260911111731.3404308-8-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 de20bed2797b..80910e0bd977 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 Fri Sep 25 14:33:01 2026 Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 37D2843DED4 for ; Fri, 11 Sep 2026 11:17:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125491; cv=none; b=eplWc5gq6E88cqcmo5eEnXJeUJpCB+ZV+IqLj5fgKs6V5vGz2pV7J76KJJP8p04r7JkTiMi++0tmrC2M6cucBfMmPKAYVTdsvmMQ0fWGqphFWE/RXcJKHfmEs3wYat6m97nwE5A+i/hmJPLGCrS4xtl+o5QgghhCm+n47iINPPk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1789125491; c=relaxed/simple; bh=mhbdJjLcWcQrWxoxCQqlUnOAIweP+fW4TKcbmVB9Eig=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Qesp5H1JY6vtSFHj1kCy8xRFIDsi1nEKZLcewB5s6EWWwAtsCzn6bMiOqi3mrLBicse1zxuJRqv95NEwQETlHubKeOiaOo2QObnl/lee1qoUYqZj3gFMxLB64DYIakQakSflWB+40YHf3vF6mR/yaNv5q7nlsJD9LJ95j6wI8+g= 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=ErXaCt+k; arc=none smtp.client-ip=209.85.221.45 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="ErXaCt+k" Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-4859b45abadso89060f8f.2 for ; Fri, 11 Sep 2026 04:17:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1789125471; x=1789730271; 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=W390DCGBG6P5p4/mz1YZbyKjCuVONBNojwF2gHmC2H8=; b=ErXaCt+kNp1vI8oYkkLEyUfI99AKypmjL7CftTqJl7kG1PXLRQ3C153MzSFyipEzdL AbcNz163gszA8czf8VqJp8zcWgDGQTrX3X3Yuej2xNQdwoS+T4HZl3PdLLhvEDHgw61H DxENJd51k7d616osbajPG51hlKDqfSoFzqAB7+/Vqqx1ouJJMYDA76WbcMPJwzQkxN9h 48ZUKNiMRu/NyGzZEw2mIMnqBWtSHSezI607NrGLQSA05JUnUWgWhyDGCCpYm2SPZ6O+ zaLak4tfq1KCgCGHRCRIIrt/eGhA+DVzhoVnmi8H47lx4Es5IGoAQ30FfH1fEanaS6GR NR4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1789125471; x=1789730271; 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=W390DCGBG6P5p4/mz1YZbyKjCuVONBNojwF2gHmC2H8=; b=UDIBz2J8SzVUjiX57WyJ6jlP1v4/qcUK73oMURWpFegXapMqE03r0pULGUzYvBUZGL sWiInzY8GWBzCDfnnPX/ZMSQ9PUG2hIp/KhQKWqKqUJiteXibTWDZjvTkvS6ReO8zbN1 pFuzxvd/eM9uu11gZrTlTjJ6ZrY1dtcmbZJELE23G5izbW+xWL71Fn0TWZaT0jikltvf YmcexbTTyBbpf5DorNFzrjwmluy+CNr+QYst8p6hbpyEvmLzASSegOcGHM3oxeyYUsM5 U2+B6t/k5h64ddQrzVAa1xKxsL4MEA+ORdyYHe6CtER0bUiTYAT5vUt3uBBEm/PhHxcU Pp7A== X-Forwarded-Encrypted: i=1; AKwUvBy2rcnZwwiW0V/26awuzltLyEiRZAhKyheg1Oo5j8ArVh9U2Mba4VcxVini5DVzRetAyZ3p/k5DzJekuYs=@vger.kernel.org X-Gm-Message-State: AFuF++nVdDX5Hwa4xNMxtZ7JNHIw0zCJV3c4raW/LqAu13ky4aOQzNJS tIS0pEvtvyXxVCXJ80al2Lo0kODuHCtQYpFUBJLkMhwtso8YwHC8P4Jx X-Gm-Gg: AYBFou0ETuNCALonUx37ezbrMZWJut1rO3iIOOoJORUsHb9H36bzQzSGbI7c0g5k+9Q ojK3FSlheCz2x6WIy3Us/aHuQM4lImKEG1hevS2+83wIw1g1B4z31gUiSBy8VIOppU2nYiGgoEt uN/2Stox7foj25QifJQYdpuYqGMx41ot09QVEdQKAGcc1eNYjzP0LABGhIwwxibGgECzcZHJY3e b6SiPJGSRa3YXgCCDaGpBjI4doyLtPS7daqJXY10Nc7NAlebYkAljmApSU/gkNsU25iYZ7dFc/H BEqfpTZ4qZmvy+gu1sTvprbgGRi57zwomyXDYzAb1maa/vSWc2jNMcMu+MqbotS9VB6CHMso1bF e2E2Wfn9siz0OwFR4nEt01hu2CDXp6MN1RTFqo8gXsy6d+YszRnDeS+iaFb+44WbLcrcfc5mABy yn7+8i+2f6i0jjmwo9JFPqK8QiVCuRHo/HRNuXJpLkBh/hFx33CBu3r/vUzJHLKQKtGk73r1VRj y+DPgUtVWIWdB+ODSz0OjwG7ZZQDgpPpex/j9buJxsBcILlOP8VigEMyFTREONn6rqYcz+HTA9W zCh76AH8qsjEcviCtv4= X-Received: by 2002:a5d:4083:0:b0:486:e9b7:4868 with SMTP id ffacd0b85a97d-486eb2ee556mr3524487f8f.20.1789125471098; Fri, 11 Sep 2026 04:17:51 -0700 (PDT) Received: from iku.example.org ([2a06:5906:61b:2d00:3de1:9f21:e874:3931]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-486eb2ecf23sm5438182f8f.5.2026.09.11.04.17.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Sep 2026 04:17:50 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Geert Uytterhoeven , Guenter Roeck , Wim Van Sebroeck , Magnus Damm , Rob Herring , Krzysztof Kozlowski , Conor Dooley , 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 v5 8/8] arm64: dts: renesas: r9a09g087: Use CPG/MSSR syscon for WDTDCR access Date: Fri, 11 Sep 2026 12:17:31 +0100 Message-ID: <20260911111731.3404308-9-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260911111731.3404308-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20260911111731.3404308-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 --- 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 813bb0cb021c..3ede2e89cf67 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