From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wr1-f42.google.com (mail-wr1-f42.google.com [209.85.221.42]) (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 B51D02BD001; Wed, 20 Aug 2025 20:23:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.42 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721409; cv=none; b=F+I6zpp6O8lHXeq5Vp3bh4y3on2Mb2TiDzlSp10VOlYFvp7XcRvWl4GNN0S5wVnGXknCn3gK6dU0/1mae1asuUTwyQRqE2kbOhzA3fFvyQI+dVGXm4Aan7KOB//Ul+wT9aGjOM215TkSmhLac93gBo2RPEOiCkvjD0mehJoHRkw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721409; c=relaxed/simple; bh=rCh0jm0hKWAUX+VCLeR124MAi6P/voIn91Yn0jBGCVc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=REzRTHadLtK/EAqIus43DNX7HeS1d+EBSS/uf/+6c/iQR9UAC2SVU2aUYebqm6XMsgeb4mN6YB8RJ0llno+PSxVJdoGPifA8D6oVgvNMk5/wxnZYKGFDA8c8BxUvaA4UyVFARO6JLBBOaw2ZB5fYA7ApfRQGn3U1JlF6Hw5Gcjc= 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=SjawLkFT; arc=none smtp.client-ip=209.85.221.42 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="SjawLkFT" Received: by mail-wr1-f42.google.com with SMTP id ffacd0b85a97d-3c380aa1ad0so197777f8f.3; Wed, 20 Aug 2025 13:23:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721406; x=1756326206; 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; bh=Y0U8LYRMmqG5lX7rJXuYXLHt87CXjM0esinNNcYoO3g=; b=SjawLkFTWqFFjUoVVb9nxxglzl8ELEhWtqOKCBo81bNmLzMn1e2+a6eKp16L/MqonY KkDDqqtVp7WNGwmkcePf+3ELSRj+RaQ4Wy7k9AHFmeZ48svD4/KeGt7Yh3b3WEa7Z1U6 LLE1tUbybD3aC3njCjsd3t5eIW3kCdhJKsSkPBM/9l+JwoxCfwdRu2hRr/L8bGues/pZ K8N+13f0LD+pfhQ6dJzxK6jyqOJsvXyY1tIuohTjYa5Kp8+6GVOMHdGQ6Rt9ZmZC0+J8 /QtgJSiUPIu+sacLV6Q/zxOGN7zgQALbGWOrfky4GP9BU2Pb016xaXEt+sVmjBDUo6n5 9mUQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721406; x=1756326206; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Y0U8LYRMmqG5lX7rJXuYXLHt87CXjM0esinNNcYoO3g=; b=nV4XnZse0ztibQXBSUl6bm+HUEnA1VovaXDEKu/fs/4Ni5foNHXeMR25wBTWoST28D drQ8vcLmYq+6wDzujftDSMyHSpvjOyO3uIyhK/Man1YgHVtPk+XQjE+aXfcAF9UQWJlX 6jDMag/OxZZhY3cwtCpyk/kRJYAfzz4XR2HDZ0CcKg7+bBvP1JLOzcla1R+B/fozNZAA /viP9qF9EnB4r5AAGRTPcIT/BaWruxS/WphoVQtcgFYHaG6cl9YIer+N2y8nP5MacCkF KFlQXZd3gW1D0bUQVOi0GRSr9Cu5clrAoSXn6wXdxIVTnWDmx6bq0WsUOIczyGCTtpcm z1TQ== X-Forwarded-Encrypted: i=1; AJvYcCW7850M+jOrwt7j0AV32ZqlbBd1cXYjAg1qB5loa/m+HBlGed6wXXNBxM90zK/+3vWCXwRH3FJQm/DNaGJo@vger.kernel.org, AJvYcCWRrRBKXhkNbzsxyX+QAyIW0+4NSHp2dFbCL46cl/LOiZH8gE6WbfFh7Mjobpg1Fk6kY3VMqGD5ejQoN9IwUxoNPwY=@vger.kernel.org, AJvYcCWS+JhiFtiqZRl+05udnY0cwMu2jMoIASzSdH9DQ7f2cUlUPi6GYzh4pH+jAVsdK8Q71ZwXF7Kcnsbj@vger.kernel.org X-Gm-Message-State: AOJu0YwqaYW6wBFYSWfYuHqvQHYa1LlcuNEYU0EKhbkQ4xsGU338eE1u 2LQpRWMDAzAql2g9xJis8Jb6TsoYuv9OtompuKVkUemmc7cpgVoD4u1y X-Gm-Gg: ASbGncv60o9bGDZhNXBfBxibkNTWuiMsNs62diQhdHwMu9mlOOq5aNcnoA+1M4YSGXK 852uAARgIvGmfeuYSwowSQGvV1aaOfhwIkpENSvCJMumD1k0YOoBxHI6rvmGN0VNdrIezak/6bn Enim3xvABYoV/jqkz2DlX8C4j6jXNMLkg0RI2qt/fNzZVqg+jaya6z/+WTePxQnLYkB8Zjm9bll fr3VOpLAXqjeZL/QLJOC5wbw920mBbs7BiL/2oVMTEaLB+M85vbH8a+Nyf+Buy7ngbzwLO5F1un XmGetdobyYANI5GaN4VNJp3qv7B1zgFIOlf3ja6R1COdkWodhjovFDtqrlQGYBU3UZwH79tMONy oTZsWLQG0s1kq7Rv0VGvvVu6340+f1MmFuVSdE4nuE0aUBt0FvZeBQ8DL X-Google-Smtp-Source: AGHT+IH+6oF+xWEODFBnDuhgFlZto/2SsHppVObMXuYk/sEu3KMArFPBzh0j4ROnWC3cLO+5IGOthQ== X-Received: by 2002:a05:6000:4013:b0:3b7:973b:39bc with SMTP id ffacd0b85a97d-3c496caf42emr115109f8f.54.1755721405877; Wed, 20 Aug 2025 13:23:25 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:25 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 1/6] dt-bindings: watchdog: renesas,wdt: Add support for RZ/T2H and RZ/N2H Date: Wed, 20 Aug 2025 21:23:17 +0100 Message-ID: <20250820202322.2051969-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Extend the Renesas WDT device tree bindings to support the watchdog timer found on the RZ/T2H (R9A09G077) and RZ/N2H (R9A09G087) SoCs. The RZ/T2H WDT is mostly compatible with the one found on the RZ/V2H(P), but includes an additional register and differs in the clock division ratio settings for the WDTCR[CKS] field. To reflect these differences, introduce a new compatible string, "renesas,r9a09g077-wdt". The binding schema is updated accordingly. On RZ/T2H, the WDT does not require the "resets" property. It also requires two register regions and the presence of a "power-domains" property. The "clock-names" property is limited to a single entry, "pclk", for this SoC. The RZ/N2H SoC uses the same WDT IP as the RZ/T2H. It is supported by using "renesas,r9a09g087-wdt" as the primary compatible string, with "renesas,r9a09g077-wdt" listed as a fallback to describe the shared hardware features. Example: wdt0: watchdog@80082000 { compatible =3D "renesas,r9a09g077-wdt"; reg =3D <0 0x80082000 0 0x400>, <0 0x81295100 0 0x04>; clocks =3D <&cpg CPG_CORE R9A09G077_CLK_PCLKL>; clock-names =3D "pclk"; power-domains =3D <&cpg>; status =3D "disabled"; }; Signed-off-by: Lad Prabhakar Reviewed-by: Rob Herring (Arm) Reviewed-by: Geert Uytterhoeven Reviewed-by: Guenter Roeck --- v3->v4: - Updated commit message to include example node - Added reviewed-by from Geert. v2->v3: - No changes. v1->v2: - Dropped items from clock-names and instead added maxItems: 1. - Added reviewed-by from Rob. --- .../bindings/watchdog/renesas,wdt.yaml | 36 +++++++++++++++++-- 1 file changed, 33 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml b/= Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml index 78874b90c88c..b6e60162c263 100644 --- a/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/renesas,wdt.yaml @@ -81,10 +81,17 @@ properties: - renesas,r9a09g056-wdt # RZ/V2N - const: renesas,r9a09g057-wdt # RZ/V2H(P) =20 - - const: renesas,r9a09g057-wdt # RZ/V2H(P) + - enum: + - renesas,r9a09g057-wdt # RZ/V2H(P) + - renesas,r9a09g077-wdt # RZ/T2H + + - items: + - const: renesas,r9a09g087-wdt # RZ/N2H + - const: renesas,r9a09g077-wdt # RZ/T2H =20 reg: - maxItems: 1 + minItems: 1 + maxItems: 2 =20 interrupts: minItems: 1 @@ -132,6 +139,7 @@ allOf: compatible: contains: enum: + - renesas,r9a09g077-wdt - renesas,rza-wdt - renesas,rzn1-wdt then: @@ -183,7 +191,9 @@ allOf: properties: compatible: contains: - const: renesas,r9a09g057-wdt + enum: + - renesas,r9a09g057-wdt + - renesas,r9a09g077-wdt then: properties: interrupts: false @@ -192,6 +202,26 @@ allOf: required: - interrupts =20 + - if: + properties: + compatible: + contains: + const: renesas,r9a09g077-wdt + then: + properties: + resets: false + clock-names: + maxItems: 1 + reg: + minItems: 2 + required: + - clock-names + - power-domains + else: + properties: + reg: + maxItems: 1 + additionalProperties: false =20 examples: --=20 2.51.0 From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) (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 27FF92BE048; Wed, 20 Aug 2025 20:23:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721411; cv=none; b=N2uIDN/2vH6zgZJ7xMsXRqNySpyc9yv3pHUp7+gQW0bhd/m4uHHFc7ycXFfggfzLSk7XelODF9FAH71Y9f233jB2nLZSEcdi1Niv22D9GQ/IdRLB1hrepKFY6Oia3QmVo7TM3FNOsG+k7fhWfsMSZpj6gCOWZUcNLzejIyqOSjc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721411; c=relaxed/simple; bh=CjjwHUmo36KbpZcoW9susR/nTVVNkUUG+7qTeq4vuJ0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KNIGQfSI0CRvOWzzuC4Jl50JdmaONU0mZP6/se7+dbSJ7mpy5DH4/Cv4c6terghtcMnlTIeG2GT9r7Q3NjNsx9s+V9/VyIPZ33WYOqlOwPqp4B4VEms1HLJwDNsor2doTyURAqP6HF63OYrXXSQ4tMz5RXbU7wgxECXsbXgRTic= 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=g118oula; arc=none smtp.client-ip=209.85.221.47 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="g118oula" Received: by mail-wr1-f47.google.com with SMTP id ffacd0b85a97d-3b9a342e8ffso210073f8f.0; Wed, 20 Aug 2025 13:23:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721407; x=1756326207; 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; bh=Zr1iFcvHB55MEbh11M6+C4Bj3+1ragxm6Wtrs+MkHRw=; b=g118oulayKA42YXfQuB5kmzwZFtKXBPzGOvsAEf7TeVZ3+mIA1Fs6pX0al1ab/CGTk T4fud/aUU78QOuZ7Z3T6rC8OJ9b/Us1vqfJgTes0KEiEoO84PpO5y6vZLoqxAyoOsxHR S1yznWK3P1nrUKkuFNHlGExAlNEy8UwxJRdDdD2v+EiBhNngEy9Gx8H/t01TBPLtK37x eO8dIO65ImN+xoIXY9/D3ouHGnIWx+wcM5IaooNpVMQFF1gFL+pvaFmwWgs+j7sLrZjW ZwdLpWhcpKWEqR5bIbgGexl50FNYR5kJeHvojSEOmQeNirHweigva/02tlEulf16M9Ji VAyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721407; x=1756326207; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Zr1iFcvHB55MEbh11M6+C4Bj3+1ragxm6Wtrs+MkHRw=; b=ut9aJ2TpsiDSi9nJgWwqfHAkVIlce097kxfhKExkEtH+QPob6CrGEjVy7xZrsAdG0k 7JaUtFO6tZZnCIk3v5o6V7aFPOcwyWBSAAp97G9PUq7Nj+94lrrjtwiNy1DcoBHUmGog PCPdfDRi3u+Ha4s37TvseAXCEngWNCYhVsPzbZBrA9F77zDGMlG0yuwY2O+7D9OxYWNk kK6XLguPoVcrLrYd48HcP/vLIZJWLLoK15uIhytPRMcVcNTV0tw5z100hMK1N2hs+d66 v/YSVuO4ZF+XGWy/8oWWO/gbR2g94DI+d9r7T69tKZFlBhfqr9jkCR5BefY2ZcFdtCHZ mXZQ== X-Forwarded-Encrypted: i=1; AJvYcCV48XRneHELfOE0iu6wNoaCvBb5CJDmpyaa1Wdfj6TvChDbVcOy3BNaQGx/zsxe5kskfXtaAHX+n/RF@vger.kernel.org, AJvYcCWiaOnIoPe8FvFmR2OLon3TI95yol/WuY3OF2G/FixaABQPjVRCXZ/cfYxqX2AcjFE4gEj4/qup2iYUgvhi@vger.kernel.org, AJvYcCWtNtV0th9DZb8qGvOFfZkQ1ouPswbRkF352nQ5qlWuJJEOF3CMb2LokkKPQSOjcGsZppv7KNBDhKJvpzWK2MVWJUs=@vger.kernel.org X-Gm-Message-State: AOJu0YyVf5sksmAYDKcO2jkfLT2Fws1zg+UKJhzG05cG0m8+seWeJgWa g4TtTvIZeF9A8I8chm6enl6oPFXcTQ75WR/xV1RP9LWZILGytuO60gM0 X-Gm-Gg: ASbGncswlFNP4uL92ABWqp13T0e3ioIB+slIL5Pzv1P0R8NlDmHcP5HC0w/Z0an9fN0 1qzYMQNHQN3JSh8WFPRHnNNqNuimeK5bH+wa55Sm+DlQJqFvXE8TbZkvKy1byl0d66qI1r0uQw/ OGlJSayTH7Xy1KlCMCK+kTy1F03Mv8W6rO/rzDsOKpC3kQJSjbPGXA2i9PjocemLlRg1cHDN4fK MrlJxM0e8tNiBhYQ6C/GHHZkQSwxvCsw0HuHB66pFPw0rmjV7U3i+LLDUJfna+u8O7wU32RrBdy 3M4CVAlBWvf71jmFCF6qM0XUkiqu9NRwbEhpCeOmutClSqY0ucaPMoOWFiokyOEvxXmOhHsvmhB d6kkl3IBrj1XDB8xdvq04oroQu7h80+NSnaGaxuObcrzIIYnLm2qE6tyI X-Google-Smtp-Source: AGHT+IHh9GJVypBRo2SRQEfhHtQe/PRkU8wT4DU6oYpIDsWWAre3075S3lOi3Tm/SH4mm92vftThnQ== X-Received: by 2002:a05:6000:4403:b0:3b7:910d:8054 with SMTP id ffacd0b85a97d-3c45f0da276mr452334f8f.11.1755721407260; Wed, 20 Aug 2025 13:23:27 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:26 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 2/6] watchdog: rzv2h: Obtain clock-divider and timeout values from OF match data Date: Wed, 20 Aug 2025 21:23:18 +0100 Message-ID: <20250820202322.2051969-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Update the rzv2h_wdt driver to fetch clock configuration and timeout parameters from device tree match data rather than relying on hardcoded constants. Introduce a new structure rzv2h_of_data that encapsulates minimum and maximum clock select values (cks_min and cks_max), clock divider (cks_div), timeout cycle count (timeout_cycles), and the timeout period select bits (tops). These values are provided through the OF match table and retrieved via of_device_get_match_data() during probe. This change allows dynamic configuration of the watchdog timer for different SoCs, such as the RZ/T2H, which require different settings. Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Guenter Roeck --- v3->v4: - No changes. v2->v3: - Updated struct rzv2h_of_data to include tops and timeout_cycles. - Updated max_hw_heartbeat_ms calculation to use the new struct fields. - Updated commit message to clarify that the change is to obtain clock-divider and timeout values from OF match data. - Added reviewed-by from Wolfram. v1->v2: - No changes. --- 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 8defd0241213..755067800ebb 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -35,9 +35,6 @@ =20 #define WDTRCR_RSTIRQS BIT(7) =20 -#define MAX_TIMEOUT_CYCLES 16384 -#define CLOCK_DIV_BY_256 256 - #define WDT_DEFAULT_TIMEOUT 60U =20 static bool nowayout =3D WATCHDOG_NOWAYOUT; @@ -45,12 +42,21 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (defau= lt=3D" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); =20 +struct rzv2h_of_data { + u8 cks_min; + u8 cks_max; + u16 cks_div; + u8 tops; + u16 timeout_cycles; +}; + struct rzv2h_wdt_priv { void __iomem *base; struct clk *pclk; struct clk *oscclk; struct reset_control *rstc; struct watchdog_device wdev; + const struct rzv2h_of_data *of_data; }; =20 static int rzv2h_wdt_ping(struct watchdog_device *wdev) @@ -84,6 +90,7 @@ static void rzv2h_wdt_setup(struct watchdog_device *wdev,= u16 wdtcr) static int rzv2h_wdt_start(struct watchdog_device *wdev) { struct rzv2h_wdt_priv *priv =3D watchdog_get_drvdata(wdev); + const struct rzv2h_of_data *of_data =3D priv->of_data; int ret; =20 ret =3D pm_runtime_resume_and_get(wdev->parent); @@ -106,8 +113,8 @@ static int rzv2h_wdt_start(struct watchdog_device *wdev) * - RPES[9:8] - Window End Position Select - 11b: 0% * - TOPS[1:0] - Timeout Period Select - 11b: 16384 cycles (3FFFh) */ - rzv2h_wdt_setup(wdev, WDTCR_CKS_CLK_256 | WDTCR_RPSS_100 | - WDTCR_RPES_0 | WDTCR_TOPS_16384); + rzv2h_wdt_setup(wdev, of_data->cks_max | WDTCR_RPSS_100 | + WDTCR_RPES_0 | of_data->tops); =20 /* * Down counting starts after writing the sequence 00h -> FFh to the @@ -184,7 +191,7 @@ static int rzv2h_wdt_restart(struct watchdog_device *wd= ev, * - RPES[9:8] - Window End Position Select - 00b: 75% * - TOPS[1:0] - Timeout Period Select - 00b: 1024 cycles (03FFh) */ - rzv2h_wdt_setup(wdev, WDTCR_CKS_CLK_1 | WDTCR_RPSS_25 | + rzv2h_wdt_setup(wdev, priv->of_data->cks_min | WDTCR_RPSS_25 | WDTCR_RPES_75 | WDTCR_TOPS_1024); =20 rzv2h_wdt_ping(wdev); @@ -213,6 +220,8 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) if (!priv) return -ENOMEM; =20 + priv->of_data =3D of_device_get_match_data(dev); + priv->base =3D devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(priv->base)) return PTR_ERR(priv->base); @@ -230,8 +239,8 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) return dev_err_probe(dev, PTR_ERR(priv->rstc), "failed to get cpg reset"); =20 - priv->wdev.max_hw_heartbeat_ms =3D (MILLI * MAX_TIMEOUT_CYCLES * CLOCK_DI= V_BY_256) / - clk_get_rate(priv->oscclk); + priv->wdev.max_hw_heartbeat_ms =3D (MILLI * priv->of_data->timeout_cycles= * + priv->of_data->cks_div) / clk_get_rate(priv->oscclk); dev_dbg(dev, "max hw timeout of %dms\n", priv->wdev.max_hw_heartbeat_ms); =20 ret =3D devm_pm_runtime_enable(dev); @@ -254,8 +263,16 @@ static int rzv2h_wdt_probe(struct platform_device *pde= v) return devm_watchdog_register_device(dev, &priv->wdev); } =20 +static const struct rzv2h_of_data rzv2h_wdt_of_data =3D { + .cks_min =3D WDTCR_CKS_CLK_1, + .cks_max =3D WDTCR_CKS_CLK_256, + .cks_div =3D 256, + .tops =3D WDTCR_TOPS_16384, + .timeout_cycles =3D 16384, +}; + static const struct of_device_id rzv2h_wdt_ids[] =3D { - { .compatible =3D "renesas,r9a09g057-wdt", }, + { .compatible =3D "renesas,r9a09g057-wdt", .data =3D &rzv2h_wdt_of_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, rzv2h_wdt_ids); --=20 2.51.0 From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 765682C11E2; Wed, 20 Aug 2025 20:23:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721412; cv=none; b=oTbV5wukjOR6tF1Fip4LrH9NT3+MA/UYCUwxFCvBOa93wmZZXD5eCCbVfN0zhQcsHKii07mjPrpME/f+j7DaMovQD/3yE6opQljE+HROdMHD42T9UFj27pKrBMzqEvgZVVIgKagdWjM1UHyiY3DzXre2EeVCzx0R82KCWC+qh44= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721412; c=relaxed/simple; bh=PC4x+STpG+FigmJ17CobwvQnk7nqQUBlV/yUkwR4Rcs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G4IlfX2bkrTgdrOkM150YMXqSQWuv+Q03SJOcA1kvUiYdrtTEncAgvxyj+jIH+4LtKxqG0I3uAtXwPrmFOdmMo535eV+F7ANSN2zH5pX/n6wgehb/5l8HQYSF0PNBqwJ4vLic+LWLsCVyCZuLuxjn8HUX0AEYGaq8vBuKq7cMnU= 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=jzXpHUCI; arc=none smtp.client-ip=209.85.221.51 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="jzXpHUCI" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-3b9d41baedeso188477f8f.0; Wed, 20 Aug 2025 13:23:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721409; x=1756326209; 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; bh=ZuPMCINMdbRi/5rFniGwyqBe1yF8/C9cfZ1DcZQg/Og=; b=jzXpHUCIoRwV7P7hkOmnmYmFFvGNvVCsob0C3yZnw59UAvFF8YCSQtAdyUZTZo+OT+ BnSmchC/jXcbirYIPF5/x1VTqk4K3lt6ZfsFoXrklWZM6aTA4SiTvHIQlI2mdFjlxUsW l/k7EBCMUUw95jfOzzvc2/p4PQGEUkYGG1mvNqN8ITZNUDRwObBkQQEozxaz/9DBjsU/ mFdyHOgp+mEJ9cqGHcDLmDRL5hs6fSvg7BQEDPT6xKMtldEHosm5lfGMNj2f1iZr0fwh h8n5F6yvdUcOGhJdfbq85waaYN76TyseepqSYWjEqvcBiNXeMcFJQ28h8assAyIc4cN7 V60g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721409; x=1756326209; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZuPMCINMdbRi/5rFniGwyqBe1yF8/C9cfZ1DcZQg/Og=; b=VTthfmWnK4YfrfYLTCAZKP3f+hGjFmhdWeon8eT+qgTt8C/s3Ar0iMm2g1qPDmAayK BFjubh1bzp8XpXYLpEgu3YhlgYKxeOVpsI2GLrxjcQzYEDFv95+49c/mrcf4vdAfuHsS diJwd1IHMgzro3nRnQad/LoBQdV4QIXNe/vlSwURzB7PU0xUg5V5vBEJmj8eZHkM71Nz PjNRsMj1EmWMuXukwTjv+/KCptCpCj96sHUAogeXyZE2sFkx+YWwsGdQdsUzSjcD1Fyb 6AcMrf0pI7fQHHquBTwP/yqKO1lwyjw9TO3n0JVlIICtv04X5GH83PeCtH1bY6o7sK5N XCkw== X-Forwarded-Encrypted: i=1; AJvYcCURZdFcqry7m+UcPCEqk/DnGdpwDCLeMRovm0/iikQMsrJ2VLtcNobhIs+Z6wvtpjGqMsSrd1PILyvV88aOLA62Sro=@vger.kernel.org, AJvYcCWbkdVeT/k5pmp3LoNloDl5MfRiKAe73PP2G5dE6IT75jETAeEeNye55ZRIifOkz8LirFeXfMzC5QMbbHVk@vger.kernel.org, AJvYcCWr7RjTHsFi7esTaMFhjYII+I8Ygb0472dd0KpENH8/BFYbm32xiwpSWHwVc4nqUgjnT5ViLtQFnwl6@vger.kernel.org X-Gm-Message-State: AOJu0YxXSSxPn5Zvb8O5iqdl/t0885HZeiMe27wwE8TbJZCCH/AzyQ/O 2TjXheCuz6F53dUs0kCJqsE9THVzOJS0BAPx3YVvg/V3h1HBdAssRXQx X-Gm-Gg: ASbGncs77+dDe29jKzHmz/B0oTFHWxHP4jBFK1xLEQnU9TzTLjy5zueG7DJMHJJarQt eBPCuoo6ZPsWzMh3G2L1lBChabnSOtlT3IIXMBAc+PR/jLY6rtEotoaaFiYF6OQ3MX73h97ZW39 FP4JxZGvc6y+Z6IdooAW6L6HmuwbO4+bqKS2uqD5/hMAtgdzsoThwknvfCpmg4/gXRAWE59e4IL dhieBSr5yyinKleoR4lKxt8H8IiHpizMJBPztynCKh36X9SQia+qtP7/wXpHPHVy9Y694Pu23Si L52XgA6jEncyJkzAChXaJMSMgWoMKOrIMIFrt7jCA6vA2ATE/zow0dhgoEowkNX4C6mIfj5AUC5 r6XolZBTN2BIWJc5Ia0DO+OiNAtRTKCw0AySdmosoXeZwmx+5SxZxXCaE X-Google-Smtp-Source: AGHT+IEbxUVRo4T0WBgmP2vZ9//v01l0J9WT/f3JriL/+QgBzLcYUCG/Krqow5P48TvrG8wIAu4f5Q== X-Received: by 2002:a05:6000:2586:b0:3b8:d902:e200 with SMTP id ffacd0b85a97d-3c49480f2eamr117864f8f.24.1755721408653; Wed, 20 Aug 2025 13:23:28 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:27 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 3/6] watchdog: rzv2h: Make "oscclk" and reset controller optional Date: Wed, 20 Aug 2025 21:23:19 +0100 Message-ID: <20250820202322.2051969-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Update the rzv2h_wdt driver to make the "oscclk" clock and reset controller optional. Use devm_clk_get_optional_prepared() to obtain the "oscclk" clock, allowing the driver to work on platforms that do not provide this clock, such as the RZ/T2H SoC. Similarly, use devm_reset_control_get_optional_exclusive() to allow the driver to function on platforms that lack a reset controller. These changes are preparatory steps for supporting the RZ/T2H SoC, which does not provide an "oscclk" clock or a reset controller. Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Guenter Roeck --- v3->v4: - No changes. v2->v3: - Merged with the patch "watchdog: rzv2h_wdt: Make reset controller optiona= l" - Updated commit message to clarify that both "oscclk" and reset controller are made optional. - Added reviewed-by from Wolfram. v1->v2: - No changes. --- 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 755067800ebb..3c02960b65cf 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -230,11 +230,11 @@ static int rzv2h_wdt_probe(struct platform_device *pd= ev) if (IS_ERR(priv->pclk)) return dev_err_probe(dev, PTR_ERR(priv->pclk), "no pclk"); =20 - priv->oscclk =3D devm_clk_get_prepared(dev, "oscclk"); + priv->oscclk =3D devm_clk_get_optional_prepared(dev, "oscclk"); if (IS_ERR(priv->oscclk)) return dev_err_probe(dev, PTR_ERR(priv->oscclk), "no oscclk"); =20 - priv->rstc =3D devm_reset_control_get_exclusive(dev, NULL); + priv->rstc =3D devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(priv->rstc)) return dev_err_probe(dev, PTR_ERR(priv->rstc), "failed to get cpg reset"); --=20 2.51.0 From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (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 EA0B22BE7D2; Wed, 20 Aug 2025 20:23:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721413; cv=none; b=kV35JsxRJGvw0cAahIyxPPpRJnGucb9URXTwszPtr1KX2SVZw6G9JR86lDUGdcJARMlEIvUktJCfTvD3BFOn7Qc2AzNBnnq3HA1BW6eD2uNExELnYrhNLEh3GYxcZwIqw6u7HbYzsO58DvFK62h6uFD/ul9Of3bg9TFsLx1SgCk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721413; c=relaxed/simple; bh=mXIbESrXLnx9wly1IyY9mo7ptrv0/wPucxVUKe53m9w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DVr/vtMi6DIPht9XLkUWR7kFYTjosV8eaCEkQCgjFutgRx4JQ3C7Lv3LiuygVSEISnk3fmfZJQPuuc4um9rbbiU/1TshGeH8yu2NosbgH7vq2Io/3uqfuA8gHvveUn1mUjVO+SgDvhABuOz0vWZVK/WPCT9E2f1PfmBeRog7Usc= 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=aTdRKO2w; arc=none smtp.client-ip=209.85.221.41 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="aTdRKO2w" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-3b9e4148134so188725f8f.2; Wed, 20 Aug 2025 13:23:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721410; x=1756326210; 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; bh=1sCOHv5AH4AIWnT7tVlZuV6NhvcCtATJkR59ypP69OQ=; b=aTdRKO2w2D3hswbaMRYt704H6LUBFHj/MxlzvXch1UfQcD6oWwUWMzfbawbrq95AJl qR1K1R+jXhmXl8/n1EKgHsgCRfvXH7ejcT/TkgpT/yz7HSbAEfK0uAbnuEgN1XWu6JRN ZBp2hxXeRVr83UyDGVy2NUwhn/79r1KjTXZc67eOyTEc+ERKiSx3fSNIUg+fAbARBu+R k92xUe86N+fJrKo1JU81IXi41QIi6G97wY7utWNNYZzqWI3I9IiTBh68MQnKmLa9JltI MFulhKbZ4lItxk+GkksdPGD/w/L9VhrLxmbzbvIrJpJ5x59jKe1h8PM2MNkV2BWvOlHh J3Vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721410; x=1756326210; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1sCOHv5AH4AIWnT7tVlZuV6NhvcCtATJkR59ypP69OQ=; b=f0J9ENd7vjsRy9cpwSB8070jAVA9X6ZYsaBnCuBI738NFzMtr2c6lAzF+nk3BVrZi0 /bABR+D56yKhM50Za46SFXkAjGMc5soskQp28cW17V8S6cyrWKZgoWKcsHLL/mj6LbJk B9dPGec0tTw/uhHuTN/BhXwFveN6+MHdQ6l2ZJYkIItiCUfKQLqhIrLWXE9ENlaD2qGm 4fMvZFEw9JGuIfj6l+xHkGv+pRcMqgA0Pvg30Fe5dmLdHeHea9X2JUVyL9SriD76xns8 QBY0IEHdytGVHHxgxHuzHYlrabHEDXdn+VdsfxaGY04c9BGMs/s7mWefKu0Su7lRTLd0 GB1Q== X-Forwarded-Encrypted: i=1; AJvYcCUchv/wy16Y8Am+rClAkjoYPUud5XHBQIXYPdgeSCJbSvyoVGpeYT/8C8ZdFf28wmIAvJejlKNp8eSGb3YV/1x2K/o=@vger.kernel.org, AJvYcCXGAYBDpuhnZow5k+NXn3CuO9Q3jbYe/aTm5neWJuwgfUmFTa+rzhBtywgpIQM5M8+w+nM0s5MPogh+@vger.kernel.org, AJvYcCXk6X0yRHTewJsbvLeX6Oi38HnPxVq7jGkCo7oalIEn7scTHlps/wlYOpmjC90w9m/Ty1rZYEY2B1xQPdKz@vger.kernel.org X-Gm-Message-State: AOJu0YzNbMgu1jP7XGnFe5k007MmpauEjdr+EV2jQ9ORWsNQmSH3HIYN KHf7yE6DPjNWkHzqOcfHf6GXT24z27ajJ84+/Coj5SrlQ1RefXGpjWcq X-Gm-Gg: ASbGnctElk5GV2dvcjOL+QNnh06pwnAhLPO4k+S9bHbxtPElfV/8FnGnRbyekOta6Uq W1ipatiWFqoLWFmi4QE+Pbe39KnD3+bjGszY5eJL19LbPJw7T3t5Z20uXJgsEPkaXHnUH+DK0rH N5RLX5z0Pr6qtElPZJSIkad+x8EFwX1k+LSZyjOLr9Q6Kn6JaHLZ9VnBW3JEFnD536ZW0LgnheX L6pw7DLZH29gm9O1P/GVuZzWfqnRrgdOMIkY2qrlD7el+rjCIzQA92O8Pc0KjQhASX4C19K+rz4 3aCv+I1fyrLialeCDR8zeNUCHdBUOAnHHYmfV3hdUKfP3bYj7efsw5fZE24/ik3bA6hsYJi0XSl sMifWrE5YiHrP9VtvH4/qR5R5MmWbTJU8mKQh5r658qAiLyYrYWHvfU0g X-Google-Smtp-Source: AGHT+IFO8t+WY3u26X3JT8f8u/FswNN1WNylkmp5V/OcP3PYB0GFL15Me0iKxaBckZazgtaagHGXtA== X-Received: by 2002:a5d:5d10:0:b0:3b8:ffd2:6745 with SMTP id ffacd0b85a97d-3c4965fbf5fmr105845f8f.44.1755721409950; Wed, 20 Aug 2025 13:23:29 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:29 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 4/6] watchdog: rzv2h: Add support for configurable count clock source Date: Wed, 20 Aug 2025 21:23:20 +0100 Message-ID: <20250820202322.2051969-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Add support for selecting the count clock source used by the watchdog timer. The RZ/V2H(P) SoC uses the LOCO as the count source, whereas on RZ/T2H and RZ/N2H SoCs, the count source is the peripheral clock (PCLKL). Introduce a `count_source` field in the SoC-specific data structure and refactor the clock rate selection logic accordingly. This prepares the driver for supporting the RZ/T2H and RZ/N2H SoCs, which differ in their watchdog clocking architecture from RZ/V2H(P). Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Guenter Roeck --- v3->v4: - No changes. v2->v3: - Added reviewed-by from Wolfram. v1->v2: - No changes. --- drivers/watchdog/rzv2h_wdt.c | 21 ++++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index 3c02960b65cf..e71d1e108f69 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -42,12 +42,18 @@ module_param(nowayout, bool, 0); MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (defau= lt=3D" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); =20 +enum rzv2h_wdt_count_source { + COUNT_SOURCE_LOCO, + COUNT_SOURCE_PCLK, +}; + struct rzv2h_of_data { u8 cks_min; u8 cks_max; u16 cks_div; u8 tops; u16 timeout_cycles; + enum rzv2h_wdt_count_source count_source; }; =20 struct rzv2h_wdt_priv { @@ -214,6 +220,7 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; struct rzv2h_wdt_priv *priv; + struct clk *count_clk; int ret; =20 priv =3D devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); @@ -239,8 +246,19 @@ static int rzv2h_wdt_probe(struct platform_device *pde= v) return dev_err_probe(dev, PTR_ERR(priv->rstc), "failed to get cpg reset"); =20 + switch (priv->of_data->count_source) { + case COUNT_SOURCE_LOCO: + count_clk =3D priv->oscclk; + break; + case COUNT_SOURCE_PCLK: + count_clk =3D priv->pclk; + break; + default: + return dev_err_probe(dev, -EINVAL, "Invalid count source\n"); + } + priv->wdev.max_hw_heartbeat_ms =3D (MILLI * priv->of_data->timeout_cycles= * - priv->of_data->cks_div) / clk_get_rate(priv->oscclk); + priv->of_data->cks_div) / clk_get_rate(count_clk); dev_dbg(dev, "max hw timeout of %dms\n", priv->wdev.max_hw_heartbeat_ms); =20 ret =3D devm_pm_runtime_enable(dev); @@ -269,6 +287,7 @@ static const struct rzv2h_of_data rzv2h_wdt_of_data =3D= { .cks_div =3D 256, .tops =3D WDTCR_TOPS_16384, .timeout_cycles =3D 16384, + .count_source =3D COUNT_SOURCE_LOCO, }; =20 static const struct of_device_id rzv2h_wdt_ids[] =3D { --=20 2.51.0 From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) (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 08C3F2D3727; Wed, 20 Aug 2025 20:23:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721415; cv=none; b=qW+UgyjsF4/wQp80vy0OsOuNIiEGxJyhzkcodckJlZRUa9YqXwpKBVm3jsYv96SctOnVbmw2mABNhT0n4r/tW0Ti2J80myjf+XnsLr3MD2KaVrqg3FG1Km9kEcf/4omxJ2BZu/h9mSu/sYjM79Lz7wCdpBX04y66s1fYoys+LXs= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721415; c=relaxed/simple; bh=/OIVTtRusZZH4TYPV7NYoaORY3sXSBiZWyBjY5wUbWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tXeR9Wsz+KvfofiHbsWKFJCQ2JGAhyHXVpyJpGw1E9FE/vkD83qK7kYTPC/Qjh8jvJJNhvDpSy6iCDWGhkKqaGrezvbRqLz5jM769+kNqL4MnICBQrq15lSWN9FSkkC06UxkB/j0YeuEe3T9MF/DD3lT8//TmwP/EUucqMSPQ8E= 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=WC2sJitg; arc=none smtp.client-ip=209.85.221.53 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="WC2sJitg" Received: by mail-wr1-f53.google.com with SMTP id ffacd0b85a97d-3b9dc5c8ee7so272475f8f.1; Wed, 20 Aug 2025 13:23:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721411; x=1756326211; 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; bh=GSU+05zeeqxeQozS0kVq/YsDf11HPmLtSI26jxvtSVQ=; b=WC2sJitgu6DFbGV4B1zJdPLHxbuGX/K8S/Sl4cu76fS+xsWVRGMK7uJc1Uqq0eNm+w Zlv2J4bg1ge9u0IfreQwAdmPnsPicb7CeXJP2IkR17goDVK3z8jXO9cJ+SjHsdGqJ5m9 QwTTC0EmgizeA5vmbwB2ZIL8TUyoWj4nKCOkO7B3bzDwezbuGoGh7g2Now+kppNTV2X3 ci7jPauZKFil0vGC0UYcrLjjV/jfhiq09bVbLay9XqnJq0ybhrYRbHSoarKIlfNaMdEc Zz06J9EfHrudh3mXpq+Gn+WMlaXjsFiEEw+FlbxYTohLcy++CKxW84kapfJewOMDyTQn ZE9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721411; x=1756326211; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=GSU+05zeeqxeQozS0kVq/YsDf11HPmLtSI26jxvtSVQ=; b=vc0luohWiqDvb7By3En6WfJCset6d2TuNbTKhYkj9r+mFZCWa3SjOhiVAjwcp3h6xQ /Ot0B2OaZqkmkgqWFKodGIwigzJeE+uSQPIA6Naa6MUPUqc2/p9w8CoR+dA3Kgk+6jXN UMGnKNXReWj2W+rbZbjAQNusqqTA9H7wg7FuV5w5IAKN4fFjTVGJYYnDD5PKRc3xGalM UVHbRWSxpsRCvYFcmRmwnE7ywqvdqQ8X+QIhgYpIre/KE8Bia7YHb9NUvD8hKnImO3Vq j6WZilBRYCqCfIm8lP5N++n1nnQEPDZsKIOd1uxl/19qYBWHKB9yPpEU4sLr+MfAlh1i p8sw== X-Forwarded-Encrypted: i=1; AJvYcCVvt+6l5A4jz7loMfERChs5WCYx2oPJSb8fNbCsf3Z+iFS0I1wq45oy75AOpKra6JwYn1HdV4SP4v1b@vger.kernel.org, AJvYcCXkjvPkjRQy6by0kzwOi1GYM8D3JRkdrCRASnilcvakCe5p/Fnb1/O9hqAdNoEm0RNaqUxesJaeyF4CgF7UttrzVJ8=@vger.kernel.org, AJvYcCXvTONgZ6/vuIPcHTKH4fW2dgaeEfUsK3xbhaoq9aibKtDhV4b4f3ssAWMoA/bP82miD5lyw7XmSMNcAHmG@vger.kernel.org X-Gm-Message-State: AOJu0YxIrv1a5bR8m68E5fMvyCyULnEPe7jxxNn0GawmgplKGaqeqzDq XX2K0TLPmJpUIrHPK4cpDFhEc0fozL9VNjCH2K9THUV2GT1/b97dAxKl X-Gm-Gg: ASbGncuXEWiNqKU87YIML2zLnQe+YCGGwflVq2GBkFHZqXzSKaA6AQimk0e13Mr2LM4 e+ADFCgOd3HASwX+9F0gH8hjBOfvHG1DHb0IsiJURAtPTyI7gWPiJ4FNy8h3lT4qj/d4FaslOxb QZFSHsQMEvV3CdI4zra3CIiPVKKwyZYe3b18qTL1FE4su7623R1EGmR8ytVt6D1RRW1hAyr45FN FozNXAQWyk+F4g3JVvEXYdqLs3pDzCiQ6ty25Xt/c0ya4cT878LGbcva6dPfMMkoDGuXdwym2LE cYEiskcukF38bPyIpp14hN3eYhZX3xfpNtnD64gFXSrzw4Yt68HTWufpzoAWSVhnp9+ayMH5m/F Fam3tSK1Cco3rIhSwuigwBErt/upAxYTAHEDgP5XdfGN0Nb8rWUdhCYdF X-Google-Smtp-Source: AGHT+IFeYRtJ6c/b1Ij/i6ibiNiSQR1ETOTgrjqFZ60z7vHrKsmUY9umpHtjOr8Ax5wuNrgIuSifbQ== X-Received: by 2002:a5d:588c:0:b0:3b7:83c0:a9e0 with SMTP id ffacd0b85a97d-3c4949faeaemr101366f8f.25.1755721411204; Wed, 20 Aug 2025 13:23:31 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:30 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 5/6] watchdog: rzv2h: Add support for RZ/T2H Date: Wed, 20 Aug 2025 21:23:21 +0100 Message-ID: <20250820202322.2051969-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Add support for the RZ/T2H watchdog timer. The RZ/T2H requires control of the watchdog counter using the WDT Debug Control Register (WDTDCR), which allows explicitly stopping and starting the counter. This behavior differs from RZ/V2H, which doesn't have WDTDCR, so the driver is extended to handle this requirement. To support this, a new `wdtdcr` flag is introduced in the `rzv2h_of_data` structure. When set, the driver maps the WDTDCR register and uses it to control the watchdog counter in the start, stop, and restart callbacks. Additionally, the clock divisor and count source for RZ/T2H are defined to match its hardware configuration. Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Guenter Roeck --- v3->v4: - No changes. v2->v3: - Updated commit message `doesn't use WDTDCR` to `doesn't have WDTDCR`. - Updated the comment in rzv2h_wdt_start to clarify the clock divisor and timeout period select bits for RZ/T2H. - Updated rzt2h_wdt_of_data to include tops and timeout_cycles for RZ/T2H. =20 - Added reviewed-by from Wolfram. v1->v2: - No changes. --- drivers/watchdog/rzv2h_wdt.c | 84 ++++++++++++++++++++++++++++++++++-- 1 file changed, 81 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index e71d1e108f69..ee3ed5a6d98e 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -21,11 +21,17 @@ #define WDTSR 0x04 /* WDT Status Register RW, 16 */ #define WDTRCR 0x06 /* WDT Reset Control Register RW, 8 */ =20 +/* This register is only available on RZ/T2H and RZ/N2H SoCs */ +#define WDTDCR 0x00 /* WDT Debug Control Register RW, 32 */ + #define WDTCR_TOPS_1024 0x00 +#define WDTCR_TOPS_4096 0x01 #define WDTCR_TOPS_16384 0x03 =20 #define WDTCR_CKS_CLK_1 0x00 +#define WDTCR_CKS_CLK_4 0x10 #define WDTCR_CKS_CLK_256 0x50 +#define WDTCR_CKS_CLK_8192 0x80 =20 #define WDTCR_RPES_0 0x300 #define WDTCR_RPES_75 0x000 @@ -35,6 +41,8 @@ =20 #define WDTRCR_RSTIRQS BIT(7) =20 +#define WDTDCR_WDTSTOPCTRL BIT(0) + #define WDT_DEFAULT_TIMEOUT 60U =20 static bool nowayout =3D WATCHDOG_NOWAYOUT; @@ -54,10 +62,12 @@ struct rzv2h_of_data { u8 tops; u16 timeout_cycles; enum rzv2h_wdt_count_source count_source; + bool wdtdcr; }; =20 struct rzv2h_wdt_priv { void __iomem *base; + void __iomem *wdtdcr; struct clk *pclk; struct clk *oscclk; struct reset_control *rstc; @@ -79,6 +89,20 @@ static int rzv2h_wdt_ping(struct watchdog_device *wdev) return 0; } =20 +static void rzt2h_wdt_wdtdcr_count_stop(struct rzv2h_wdt_priv *priv) +{ + u32 reg =3D readl(priv->wdtdcr + WDTDCR); + + writel(reg | WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); +} + +static void rzt2h_wdt_wdtdcr_count_start(struct rzv2h_wdt_priv *priv) +{ + u32 reg =3D readl(priv->wdtdcr + WDTDCR); + + writel(reg & ~WDTDCR_WDTSTOPCTRL, priv->wdtdcr + WDTDCR); +} + static void rzv2h_wdt_setup(struct watchdog_device *wdev, u16 wdtcr) { struct rzv2h_wdt_priv *priv =3D watchdog_get_drvdata(wdev); @@ -114,14 +138,21 @@ static int rzv2h_wdt_start(struct watchdog_device *wd= ev) =20 /* * WDTCR - * - CKS[7:4] - Clock Division Ratio Select - 0101b: oscclk/256 + * - CKS[7:4] - Clock Division Ratio Select + * - 0101b: oscclk/256 for RZ/V2H(P) + * - 1000b: pclkl/8192 for RZ/T2H * - RPSS[13:12] - Window Start Position Select - 11b: 100% * - RPES[9:8] - Window End Position Select - 11b: 0% - * - TOPS[1:0] - Timeout Period Select - 11b: 16384 cycles (3FFFh) + * - TOPS[1:0] - Timeout Period Select + * - 11b: 16384 cycles (3FFFh) for RZ/V2H(P) + * - 01b: 4096 cycles (0FFFh) for RZ/T2H */ 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); + /* * Down counting starts after writing the sequence 00h -> FFh to the * WDTRR register. Hence, call the ping operation after loading the count= er. @@ -140,6 +171,9 @@ 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); + ret =3D pm_runtime_put(wdev->parent); if (ret < 0) return ret; @@ -192,7 +226,9 @@ static int rzv2h_wdt_restart(struct watchdog_device *wd= ev, =20 /* * WDTCR - * - CKS[7:4] - Clock Division Ratio Select - 0000b: oscclk/1 + * - CKS[7:4] - Clock Division Ratio Select + * - 0000b: oscclk/1 for RZ/V2H(P) + * - 0100b: pclkl/4 for RZ/T2H * - RPSS[13:12] - Window Start Position Select - 00b: 25% * - RPES[9:8] - Window End Position Select - 00b: 75% * - TOPS[1:0] - Timeout Period Select - 00b: 1024 cycles (03FFh) @@ -200,6 +236,9 @@ static int rzv2h_wdt_restart(struct watchdog_device *wd= ev, rzv2h_wdt_setup(wdev, priv->of_data->cks_min | WDTCR_RPSS_25 | WDTCR_RPES_75 | WDTCR_TOPS_1024); =20 + if (priv->of_data->wdtdcr) + rzt2h_wdt_wdtdcr_count_start(priv); + rzv2h_wdt_ping(wdev); =20 /* wait for underflow to trigger... */ @@ -216,6 +255,28 @@ static const struct watchdog_ops rzv2h_wdt_ops =3D { .restart =3D rzv2h_wdt_restart, }; =20 +static int rzt2h_wdt_wdtdcr_init(struct platform_device *pdev, + struct rzv2h_wdt_priv *priv) +{ + int ret; + + priv->wdtdcr =3D devm_platform_ioremap_resource(pdev, 1); + if (IS_ERR(priv->wdtdcr)) + return PTR_ERR(priv->wdtdcr); + + ret =3D pm_runtime_resume_and_get(&pdev->dev); + if (ret) + return ret; + + rzt2h_wdt_wdtdcr_count_stop(priv); + + ret =3D pm_runtime_put(&pdev->dev); + if (ret < 0) + return ret; + + return 0; +} + static int rzv2h_wdt_probe(struct platform_device *pdev) { struct device *dev =3D &pdev->dev; @@ -265,6 +326,12 @@ static int rzv2h_wdt_probe(struct platform_device *pde= v) if (ret) return ret; =20 + if (priv->of_data->wdtdcr) { + ret =3D rzt2h_wdt_wdtdcr_init(pdev, priv); + if (ret) + return dev_err_probe(dev, ret, "WDTDCR init failed\n"); + } + priv->wdev.min_timeout =3D 1; priv->wdev.timeout =3D WDT_DEFAULT_TIMEOUT; priv->wdev.info =3D &rzv2h_wdt_ident; @@ -281,6 +348,16 @@ static int rzv2h_wdt_probe(struct platform_device *pde= v) return devm_watchdog_register_device(dev, &priv->wdev); } =20 +static const struct rzv2h_of_data rzt2h_wdt_of_data =3D { + .cks_min =3D WDTCR_CKS_CLK_4, + .cks_max =3D WDTCR_CKS_CLK_8192, + .cks_div =3D 8192, + .tops =3D WDTCR_TOPS_4096, + .timeout_cycles =3D 4096, + .count_source =3D COUNT_SOURCE_PCLK, + .wdtdcr =3D true, +}; + static const struct rzv2h_of_data rzv2h_wdt_of_data =3D { .cks_min =3D WDTCR_CKS_CLK_1, .cks_max =3D WDTCR_CKS_CLK_256, @@ -292,6 +369,7 @@ static const struct rzv2h_of_data rzv2h_wdt_of_data =3D= { =20 static const struct of_device_id rzv2h_wdt_ids[] =3D { { .compatible =3D "renesas,r9a09g057-wdt", .data =3D &rzv2h_wdt_of_data }, + { .compatible =3D "renesas,r9a09g077-wdt", .data =3D &rzt2h_wdt_of_data }, { /* sentinel */ } }; MODULE_DEVICE_TABLE(of, rzv2h_wdt_ids); --=20 2.51.0 From nobody Sat Oct 4 03:17:13 2025 Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 B28F92D47E1; Wed, 20 Aug 2025 20:23:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721416; cv=none; b=AkERXyd/hLkqHhJIoC3VkG+uvfcY69iUJeGfxV4Y3/2cz4mmvJnhVQCbweA0+DhX5yMfxJiNwkKpqBlT6eAa30PgU2wqUGKdYrb3WTgV4PikNAIxIomfj46sVvHCp7bi9m5RZrgZgS/UvwCbno/sJ2GylBjuJoLc+uW+vkO9zbA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755721416; c=relaxed/simple; bh=V5K9QEx8ADSSy2eD7GW8zzIdgoFeyqTWYgIgn9bZc4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Mr6hkYLr9yonjNw6Bx9aUWVBn3VHgZ/hgYdAdqOfU0gjHG2T/rcg40L/wkTJA9Ce9yxdTr4kbVjQKh/2PQQgjNPS748vZPtNOZDMAR9VBZqXHiKGrdUInIIDEzl9DiyYfdRa6ozx/Qi3fnrpGskipXwW7agXWoYs4J1w0TA6saQ= 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=VWNPbiQt; arc=none smtp.client-ip=209.85.128.53 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="VWNPbiQt" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-45b49f7aaf5so1612045e9.2; Wed, 20 Aug 2025 13:23:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1755721413; x=1756326213; 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; bh=fOg6o2MdpWl+NZL59tvPC1VGwC54+fKIAVm4C17XgSs=; b=VWNPbiQtk7SAC1fkDFRE5ZBGHOMunHq0lckWhLSjstzWho1IfhXLwc6oq5NEk8rTNl l9xS43aVopHFC/90VVZZHc6lkJVCxy1unG3Y2Aj1rFvnXYKWkHlDXyJ5yW585RffjCsz wgp4EjAM68EoWyu6EBrZdO9wKM13j7bLtm9QMz6HQy6zGQFXrnmR18QD0RvO3n1OPitV hWO10WS/BAmKV77vi+MJgtyz1whSNVfiQQujWRynfuaxmSaaUe0oY2C6TXePME13xLVf s3eobw8qEU2IqFWqO9PbT5PlobDVGtDyyRvFGf6ow4Wq0t/tiEZwhJTDFDda5a/x8Ha6 QK9g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755721413; x=1756326213; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=fOg6o2MdpWl+NZL59tvPC1VGwC54+fKIAVm4C17XgSs=; b=M363Xm0d/anyaZIYfCVUhfjTSG40yrm8g2nlOL51a6ROPA51fxnbtELdk4PcUzZpA8 DrQCNN0d0FKqVoJBMyMDeFUNtfsB2oDxWFoGa25liYvSqN6TRh66psqMIcVw3b5/BlHs wiXtva0kD5nM3fXIt3BCJ51zxN6RjpYvz+CLt13VDXsUDKTpyi39g8FoZAae5O8lk4Pb UhuotOgNcGXBGxHxrL2zIussyW35zTkSZDFUgeVF8UQhct9CPT7BtHsGk4LSTC0d9pIu cP3cQ3ObLAoXKAMKSllRqGc+0NsrKhDzpRHjVrJYGtZ0i8gYi0rdDRDn48toMl3EK2Va ia6g== X-Forwarded-Encrypted: i=1; AJvYcCVQ0fR6dUFfdhi1LIwzRPjPV3eDeAqkGD7/SrSLASvpR5f/HMlyUElPD5VDs0TmPnvazugSVXPfZq3kCYlBBl3bEs8=@vger.kernel.org, AJvYcCWMivHXqwWzEtFZ/88VwpK9Zl0twG4h1338pOIYUnCvfYsGdKW8HMgPRCAhKc7Ymc5XE8lL7pXYANahKO6y@vger.kernel.org, AJvYcCXBYtL9Vyzaiab80LsdN83zySGavGiXMhCTt5QmKRxlrjOcTTfMsbrhwpFEyIzjkzUho1HpTgXSJqxq@vger.kernel.org X-Gm-Message-State: AOJu0Yxqokf/IinZPA9MSH4K5R7D6Oe5xHeqT4K8KzIOc9SRfepf/PFp 2RUBKiH3ftmF0Kj7mG/2gyFllhj4kcxT0jID/SuuLwZb3+7cko0JvUsL X-Gm-Gg: ASbGncu3M6EQ0X8mNuigm7JEYZaqWtRBArKtJTsVbLdLfE9H2zzaxmA33fqGZYkVZMV aGrLPRfxn7eZhjti+4w0jOKp6R4QxXpO8Vc+XjXDvWHyljVn561Lzmwh5H0WQf9W9/XPOLHHqs1 PAX+2WRH23rznZ/F39Kr0xtWAbp/Uxz1HfzkdAM2MIbBWPSDFvu3XzOb9oL3WJQPUvJGKsTINAb STgRQUjscZbrUWGORhXZ4kjyycxWb6ejBYkHBvm4wE9t/Wq6JNERLI0JwmNjBdA+Xjn8AmLzw8Z 7wwMScEufPbmQwlnDmUnWQwf5obbBMwwO99NQGgoGJ8R82As/x6RZZ0UHRKGJphwY+6tPorj5bf rML+HVTvwcNw4TkafBsxCgnlaVN8doOnxWL5cCCk6Sl4tI3ZW0WLglXlr X-Google-Smtp-Source: AGHT+IGwtdZtw439q2hTXf1RRpj+mXGxqMZG6j5pMhfYrrfZPPBdt49EmB7QuwncrkF4ei8UK83yNw== X-Received: by 2002:a05:6000:2c12:b0:3b9:1d32:cf63 with SMTP id ffacd0b85a97d-3c493f65b97mr108154f8f.8.1755721412715; Wed, 20 Aug 2025 13:23:32 -0700 (PDT) Received: from iku.Home ([2a06:5906:61b:2d00:9b1:f84b:89f6:b00e]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3c0754f3b7esm8471059f8f.30.2025.08.20.13.23.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 20 Aug 2025 13:23:31 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Rob Herring , Geert Uytterhoeven , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm , Wolfram Sang Cc: linux-watchdog@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Prabhakar , Biju Das , Fabrizio Castro , Lad Prabhakar Subject: [PATCH v4 6/6] watchdog: rzv2h: Improve error strings and add newlines Date: Wed, 20 Aug 2025 21:23:22 +0100 Message-ID: <20250820202322.2051969-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250820202322.2051969-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250820202322.2051969-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 Update rzv2h_wdt_probe() to provide clearer error strings when retrieving the pclk, oscclk, and reset controller, and append missing newline characters to dev_err_probe() and dev_warn() calls for proper log formatting. Signed-off-by: Lad Prabhakar Reviewed-by: Wolfram Sang Reviewed-by: Guenter Roeck --- v3->v4: - No changes. v2->v3: - Added reviewed-by from Wolfram. v1->v2: - No changes. --- drivers/watchdog/rzv2h_wdt.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/rzv2h_wdt.c b/drivers/watchdog/rzv2h_wdt.c index ee3ed5a6d98e..2027795f212e 100644 --- a/drivers/watchdog/rzv2h_wdt.c +++ b/drivers/watchdog/rzv2h_wdt.c @@ -296,16 +296,16 @@ static int rzv2h_wdt_probe(struct platform_device *pd= ev) =20 priv->pclk =3D devm_clk_get_prepared(dev, "pclk"); if (IS_ERR(priv->pclk)) - return dev_err_probe(dev, PTR_ERR(priv->pclk), "no 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"); if (IS_ERR(priv->oscclk)) - return dev_err_probe(dev, PTR_ERR(priv->oscclk), "no oscclk"); + return dev_err_probe(dev, PTR_ERR(priv->oscclk), "Failed to get oscclk\n= "); =20 priv->rstc =3D devm_reset_control_get_optional_exclusive(dev, NULL); if (IS_ERR(priv->rstc)) return dev_err_probe(dev, PTR_ERR(priv->rstc), - "failed to get cpg reset"); + "Failed to get cpg reset\n"); =20 switch (priv->of_data->count_source) { case COUNT_SOURCE_LOCO: @@ -343,7 +343,7 @@ static int rzv2h_wdt_probe(struct platform_device *pdev) =20 ret =3D watchdog_init_timeout(&priv->wdev, 0, dev); if (ret) - dev_warn(dev, "Specified timeout invalid, using default"); + dev_warn(dev, "Specified timeout invalid, using default\n"); =20 return devm_watchdog_register_device(dev, &priv->wdev); } --=20 2.51.0