From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wr1-f46.google.com (mail-wr1-f46.google.com [209.85.221.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 923DA1DF269; Mon, 4 Aug 2025 19:57:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.46 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337453; cv=none; b=eNF/407lu9yx65JdoDb+g0nqfi47PbAGQ96XHZaXH8aXM8gRsfE+sWGdbsAsBJYVzYZdcAK/vufcxIg4gXvMyKYNu8Jm+qIaMTbxHqsOaiKbmtiK04Uiwg0vkPx/rq7HWW4F9WgoWnnpe5l7vvz+rNlfqcTFbFxoHDnvF46g+qQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337453; c=relaxed/simple; bh=qVaC3BO1vdexvq1x/1dF6b4EcLY5+d1m3fCg4HeMDLk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=FI1EozVhTVl/RLY7jo1R1VMKTxMEeJvNT1bynfRYX6uIKGxicP70QWyQS2RTikiVRAoVUGW/Y0Z9a1pEXSUKZkGGqGiateK8sbjDB1lTF+mwb58xY+0oJYgTP3Fk9ET7oElSVjZjMGSqRhefdYGlKhXIRiYMg0QqRdhZBDzHOgc= 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=N+a/oukh; arc=none smtp.client-ip=209.85.221.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="N+a/oukh" Received: by mail-wr1-f46.google.com with SMTP id ffacd0b85a97d-3b8de6f7556so960804f8f.1; Mon, 04 Aug 2025 12:57:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337450; x=1754942250; 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=HSn9VjlCgdV+2kvM6aIx0YPpc5jS2CNcHjZLUNGdtr0=; b=N+a/oukhOTuha0d9NmoBGGkxShu2mULfVH8PfpdzBZ7GMSMCt4GL4mx3fh+loU0fjJ SI335SsL1VHQkY6UtiiyG2vjVGteduLDGjMtOllJn95PxGgBNVaYRhB1WWIQKw93hdr/ DOvrJzHmDqLTtqJSZoS+/cVwXvq9cN/sOMyPWUF+7aVnK0T+nP5ko/sHIYtK5YvCj4jl e/aVcCQNnVQjQ2xRTW7ohNjEz1My4KTfqZvGgHJ+GV7ZL+VTTzghhz2iCloQaRE0kix0 5wimPRIwtrrsaSSxzl1KSQ7AhjQ3Hs7KEDJxNCClTpiEQw7i1bvFUUYKoYs2WCQgXDcr 1M6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337450; x=1754942250; 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=HSn9VjlCgdV+2kvM6aIx0YPpc5jS2CNcHjZLUNGdtr0=; b=KDLbSLiUxmwBy/0pTfzGY2LYfvNApXcdaUVKI4b8LAaUkSZfVzE/Pg+F6JwKu1CSD4 AohY1bzokdcxPGQANuMA667iwySk5+JKhOkKMa0FOPN5iUYVMipACgfYB3yM8VQa1Spd oHI/5Mhw1JrFxqkD78ImJD3juZQkYfDrjR/qnjj0ku1PCxJU/DlNaCLXedghj3PmEuOC 2UNH+2KCPBmV53RCUl9pzHd1H1kV6+amLXg/MIqY33Rb4Je+zby8hNQa8JvbYuBYl7ta ypXzQh9VpCghzj9rtKWudrxECVKEzrsuNU9JpsJq6GznXaSI2udhf6xoEDg9guQNcvqC jZXg== X-Forwarded-Encrypted: i=1; AJvYcCUmUrvcdyGMsQyExHqC2veXFzoT8z+S8jg+AJ1X/+EiQ8ZgId2hj5ADXdEZ4ba70f0dO8jJ1B3WGjJJ@vger.kernel.org, AJvYcCWYxybkHtJHIdBaTvAFQ0A5wtgncCYQqfnkqV2Yq5UgYIEFvDeQaQ3n88rXRgAWNRrsrWG+Jb1puMZvIRzz@vger.kernel.org, AJvYcCX43yu11cAB4Ii7DwrhUnN8l4t1UO58+vMZYMyGQCN2iOJ2eMnRb56dnuJlNMBfr8mxB/7aXuVeEyim39b5n8PGNRA=@vger.kernel.org X-Gm-Message-State: AOJu0YynBiwXWj7Vhe6mJaEdzM58Ui8zdaioCuzS4QLwDPLZQ42YEIiM 1BtH1vLui04toAbOCaB4W053YnM8ZTDEgC4WnH9A4sG8vmxdqGOw9Wnz X-Gm-Gg: ASbGncvhN6D13hxHxBBtEGP0+3NucqEZS29hKGGz47he6UU8C54TUxJkcE67SRumhmS FdqSCdVwRpsfmroTEQnGjZe0XE9yyoOJFMSuA6uAgYgwkJrIc31lxgZCsAkhf1+smRpFWmh322L 42baV39sdr9JM6jU41lYRHOYVP9jVsjFxqOL2wKaU7rMT+/F42FJuJdyfSXkhZIMA47Z4VyCSo7 zqSfu/pkA/BCSNE1RMCRStcgZjP6iyw+Y0qEk8MrLcixLMv9QEp00gQjJ/bq58iFAw4E/0tFl3Y OARGuBJj7gqbIoN0xdJSdgjripns4rsqWHraScpctMk8NwDfrTblaXDr0tzoGLiI9at24C+Fd1+ 6LDwPUVgJ616vsLPu1t5fDCyKTwA08dH48cFDeXadpovqd/vq0K0BEUZVJT90dtF5H0qJZgP4Ig == X-Google-Smtp-Source: AGHT+IGWKy91sQ+kvopcey5WRxnVuPBptprmi1/Q0gEOisct1Z021COhZf9sS45lL0TQovPONsjoqA== X-Received: by 2002:a05:6000:2c06:b0:3b8:d360:337f with SMTP id ffacd0b85a97d-3b8d94c9d48mr8191090f8f.51.1754337449492; Mon, 04 Aug 2025 12:57:29 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:28 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 1/6] dt-bindings: watchdog: renesas,wdt: Add support for RZ/T2H and RZ/N2H Date: Mon, 4 Aug 2025 20:57:18 +0100 Message-ID: <20250804195723.3963524-2-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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. Signed-off-by: Lad Prabhakar Reviewed-by: Rob Herring (Arm) Reviewed-by: Geert Uytterhoeven Reviewed-by: Guenter Roeck --- 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.50.1 From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.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 08E3C28B419; Mon, 4 Aug 2025 19:57:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337455; cv=none; b=aRhiOEf3Ldy8w4FAlGMQP1785ahgZztqFsM4JsYgnKSsTIdVCPzssJoPNsPQ/lezdDppAVjraZQ9ghyT0plArW2ujGrF6+7T33yEbsXqz6AK0QA6xAsIbbWxp+fbaxlxwefNenbPr5sQO2nnelMVKTkYmaUc8Viw4fqTwBFsx28= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337455; c=relaxed/simple; bh=O7gMG9LJRqG3JH6h9IN9KjpS2FyuQb/JeOXs1HIfKLU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MDfCltJZigoEDTsIYxO22HBjMRKmEEueGdUTqPUGnIIzQeku4tAUX5gYyVOxJf1726vcxtjSrzkkncbfQN2dijOIqYtJ40cZRcGcRPqOotQXJVhyUfEko8g1BX+947J37OwqJwKpJgOeD+mcM+RIKkXOQMtT6cQoMssAS7pCi/k= 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=GeRfcNQA; arc=none smtp.client-ip=209.85.128.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="GeRfcNQA" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-4563cfac2d2so34279315e9.3; Mon, 04 Aug 2025 12:57:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337451; x=1754942251; 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=95qdUjFCrM5xDIVpXvypofLT3arjC/swnbpIHBLpTnE=; b=GeRfcNQAyfltvGhNrpEDzyh2D9HNEbPYlpU7DS8gq07IO7iF6K9DzNP7ZEL6aLi9/0 7ZYd2uNtoDAF2baU1MjrqT9gz0y5K3GkaDVmXA+RgSChUy20ZhBthfeNfGx77z3EilgH Fyq7/TphHDHuXHzJhW2XqVKHrgWIpXlV0hcE/IW532RfMxdKgKM5/xQJJFcoh+dIyuuL 4Km7kuUGib79rhChSjGpbVNd6Aetq6k4TiMNAFwPvUV453dbw01qR/jK0jiGZUFeU0yp +gyZ06DoKfm9eHq1FRpcy+kD3tdQ13VtCI4QUrG9duujMUYdySrP4D0ynWPEMN6MC2bT ZwkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337451; x=1754942251; 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=95qdUjFCrM5xDIVpXvypofLT3arjC/swnbpIHBLpTnE=; b=XWCK11Wl2k3ZZW/ZGFWvNP4mS7+BJPLJqaYK43OXWg/EHt1We9xLqu2+W4k1z0j/t3 7NYMP+iYw4tvDxYyeMChwHA0c8lIPsyRGS2XwUd0z0d40+3jHA0jehv4LoMbfyZUXXea M+M5RVy7w1rRn8fbNPQRQ49TfFGMoUpgP5awgE8GQVZYWH/wEMCu0VoJOICMDVgQY5eZ PqXKmtAAaa8MuJbh+y0JE0gObUXxjWKrZq7eRbCgASnX95VwWMvvQBCAwQZGlsDxX89I kJxmg+ApyFSddNtmKOsMqJAiKio2gNVdO2MjHOSzhkwaI/ATgT5CjBpGySlaes0YZKPp gVaQ== X-Forwarded-Encrypted: i=1; AJvYcCVR4XMVxaSecw00ppGgWC8Jef/Wyz+f3WJwvmIoqmmOXNEVa6nixFW9WCIB9jns7X3wvkeOCiOHRRHgWkyHupyAH8E=@vger.kernel.org, AJvYcCWI5gL8hGwVieuUlFzQleJKCBN9QgBF3q6kU+BnteVbzOWoBLgYoWpenDgxBGUWfKcH22IUuTsLklgc@vger.kernel.org, AJvYcCWi8m9j6rjiPnbR0DCQNUqFPSNxi1ABUoLVPFukeh8lFPYJ/FybWcE85EgFvO2c+Hon3cXdCJBGaZK2L5Nf@vger.kernel.org X-Gm-Message-State: AOJu0YzYomYe+11A71JgapJAwqnPM+ZmFB2ruYRvYmLuJAJiBTApW/wQ ynLZ1FqilsKNdz6jV8zVpr2FrcPPdlkDJBv1VqihjHmE5kLdWCT2OqqC X-Gm-Gg: ASbGncvsF1CE9HlEYVpiaejqkLGCLS98MJv5W/cq7nUlyMyGiF53dDoy46EqCTJLp8a vDicLpHjRkkpWbgQT1NDKT7mcM7Ds9lDiQ9Ki74jzakliZxMNbznBfYF2CwcLZr/0vMxP1gKJQR c5Vf7yABc+pZM0rAQjm1CbNRQBw/CE4Zba1asLGpjCPChhtuozx2YLFu39nVcIgE/WM7eLCQXAD b9a7f89cQiHeYtwipb8OCfRT7pdZxzw4zA245YAWPyk3bH12/BK2K1np77nHTl5MHGNO/3W2Cbc BzkTIFq3M7oKzvePawaiR5g4kjSQ7XB+kEvdnbL6HC6T7taAhCoptQLOxAH6dHTLnZALTP5F1wi fMBfWnrcGLP3hX0rIRgFqO1ZzZdwi0F954CgDYf75VXr88Jk4O1UoQOB6GQefz5GgbHdAW4Jd2A == X-Google-Smtp-Source: AGHT+IFauweegyNNoTilGo/HPL9252kHPQykuiNPyCcHk6zfWoMBXYfdcYM6CG84hwWA28uoBs2HVQ== X-Received: by 2002:a05:600c:3b22:b0:459:da76:d7aa with SMTP id 5b1f17b1804b1-459da76d970mr31218435e9.25.1754337451259; Mon, 04 Aug 2025 12:57:31 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:30 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 2/6] watchdog: rzv2h: Obtain clock-divider and timeout values from OF match data Date: Mon, 4 Aug 2025 20:57:19 +0100 Message-ID: <20250804195723.3963524-3-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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 --- 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.50.1 From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 8024F28B7EB; Mon, 4 Aug 2025 19:57:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337456; cv=none; b=ajyFnRUDzg3NotP53vkxg2bivfGfTg24/UeKOHbIxuEnAy7xoZkoSXJcbA2Fsipu277bbTP1PPeyh/6SDbkj8lwGV81r2CCFD/DHy/WgpumXaxe6CscjPtMP+MYmQRuJXtmZVie2+P9s8G9UlGRQJzx2iiksVHLWt5T0118b6E8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337456; c=relaxed/simple; bh=9j9aJ6r1I2u2YDmF8Y7JiU78TMonHg3Fu6HE+g3S+Vk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o6KoXqW503LQ1s2kHyunSQIjo0e5ouhECWwmaTHcameiO0UZBolg2B2aE7KUB7F9YXCs5GEG1ecIGqRYdn2YVn2bxAgJ0vYoRJh9v1GZsLzWEU2lx9dZIfIcjea90LJc5Xp6MGrLn80O1ReoSEBFRlW5yf53CUakPNu5g/UhY68= 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=d0oEO+d6; arc=none smtp.client-ip=209.85.128.54 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="d0oEO+d6" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-458aee6e86aso21801355e9.3; Mon, 04 Aug 2025 12:57:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337453; x=1754942253; 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=KOkmDnsNkA+vW/lZ6uq1C/Z7TLqfpXQVz8a7heaHjOE=; b=d0oEO+d6SW60F17hhLmUKgPKvllSdSeZRZCkYKHNJ5BGObWLbb3Ed5ADkpx+IfoqxC mOHTBZ08btBY17IdiznNUavvkfQI1aEYUw624cZasnZiQi2DvS9Sd5uWPx3r6kqGwxxn 7InRYWMeb6oxxjSRDQy3r3m/jfyOIRCJc/q7KYuchhoJqCFP8LUCsbZsUsNui9JumIqz 6PP9rJhbpmazNHWp5oswFiryWiDyo1+m+EraUkNO2Xq8JkpUDPs/H/aoNiFvWs7TZfBv CFT6atA8NKpJt1finrQXEY43EMRsJ7jb/tAHUBhX0zvEoHejtvieLFqRgisasG4Q+VcC L36w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337453; x=1754942253; 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=KOkmDnsNkA+vW/lZ6uq1C/Z7TLqfpXQVz8a7heaHjOE=; b=Wvq1M0PvpkhPo39Ic89ie9iR0tWR44KqJSHKdjp59oN5gn+SSv9FZWl3kRZKgIaGzi OwB12sg18uICk5nIt+15xMHJvJDAZIxlcwQdLGJMTWQNHfLrXb2cOjma4cNK61vgOLyb Y/arkWA5ZKMvFNTgMxRItHDI8OBF02zYLtpUE5NVL+KlyYlIRx4AkKEZ/qGh/sa/MTuJ oxO2Vt6eQ6WTRPiyU3GXi0/tFjPRcK8kf1l3HLZN/9wO9/0ZLLV9bnO86nGVIJSezkVi 4OemEC0NUWS/MJZp2kAXTzjOAzvL04FlIf6KUzbPx4guOUDRuKs+CjNgVbEY8fQASNv6 dABA== X-Forwarded-Encrypted: i=1; AJvYcCUf9HfH97UNZTA7K9JhA/gRwoZLClrLe5h7pzDy4JhEdZfBIz3IviMhGWeXgR8b7eK8N9eTBMuJw4xm@vger.kernel.org, AJvYcCVifzR42MCX5BZfudGQlCPwFQioNp2dJaeDl3B1dFFXilhYH9B2YX4aAdgBd2/t12DQopZknM5OvzJ14c4Y@vger.kernel.org, AJvYcCWLOQdsWNo71tLl+0VMlF2RQmuYQAYrVzw/Bg4EymIjpr37pMx13lP07XPg5sfW75vegbDJ90CgMnqwTlwGS0KeOxk=@vger.kernel.org X-Gm-Message-State: AOJu0YxCc49H9riMlZzTpDCq2oyUU5LN1c1vVoyXD5rFhtRcE0za/Kpy coSO503b16LzMJepxtUKhsakPzSJYKcB8ndRDs8Xp3H7C9f/Kb2w3wna X-Gm-Gg: ASbGncvER4qmivHcVcPk8QE6/Zy6nHiTovu29b/w3UYjCL1Fo5FpPTQ0xBfRAHSC7Hi i8GrQ/oC5yOPrR5lawM0Z3MnJnACClU3ysJnF7pMWEE/m+dMCjTpqTx9SZt+fky2K97dfZAgPHR TOxNKut7Cvj4oUmSTfRb6a6/WsVh36AByxGH8mbgxlLB9bZNT9QBqpL23sL94O8mC/IhSmG7YZS k1ifzqTC+fUWHKkgabwWrYLJsCtCDUtKgZxOT2aRmLjqXSDNtQSfX6HIbR+j10etCCgW9OoZu2q n3IEp5GkRtMCTDGY0yeVtQ+bbFgM+EtPcXYDX9s/RywD/n2SMjguIXMFJjq0VSRG/qofRFV5ZiH MKrcyWlImSBQRcpaoTU88iwrfaTB6CdzZoTB4fmZeNhpZGCt106xozjVOaPrS+Z5hSJlEI0tc5f GdQXn/n8ag X-Google-Smtp-Source: AGHT+IGszXavcuwTmbVIqme3LnZrlrApp0gEZlMR1LPQF5CI+fQ0RrxBWgbIu28RuUUVaSgWi5hsCQ== X-Received: by 2002:a05:600c:1d0c:b0:456:1bae:5470 with SMTP id 5b1f17b1804b1-458b69dddedmr80540125e9.8.1754337452658; Mon, 04 Aug 2025 12:57:32 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:31 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 3/6] watchdog: rzv2h: Make "oscclk" and reset controller optional Date: Mon, 4 Aug 2025 20:57:20 +0100 Message-ID: <20250804195723.3963524-4-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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 --- 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.50.1 From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.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 2F0F128C2D5; Mon, 4 Aug 2025 19:57:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337457; cv=none; b=F2vuXM+baAk9naU3xgPwrmz5eqtTalL+3x50qcQrIMK4DKwBn0X/wpSMufBQ/R7vpbgnXMD4VbGVGGwc/6e0sIv3Bx/II9Wz4rZDIinAfYVcIEbe/GNwIaWh0o4mFQnNrb7rHef/XjSPVuquTMeDMWh3k6JMUJTHjhWtS/Kz6uc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337457; c=relaxed/simple; bh=42boYoMG/y4QAR+iec8aaKmpyPux2/tMdZkEBgsF6iY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ZtuE2OHGKK/UOgN+/1gDT8rfdNa0GinbtYaKeCXqbDlPFE64yr/QTPmaV4Qaw986vN44KzoJ1BMhbvVtg/hgk+ef/9DWS6bwXaO+hZsI1v/nT1/8i3TYOwspapDv9pV49Se94gBUhUf6i+K30jY6B65HvjuKBqiWU1oZ39XvE+Q= 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=E8pnKW/I; arc=none smtp.client-ip=209.85.128.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="E8pnKW/I" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-45994a72356so14905735e9.0; Mon, 04 Aug 2025 12:57:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337454; x=1754942254; 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=age55wbZhUILPh9ylrfGSynJrjpmIlO2XVYgrke2dNo=; b=E8pnKW/Ix/SMwdV+gQ7emtLULiJQFDg1N5ffltJI6zR6qQHK9cwwmBF0O8Ubh9qGTQ O0+jumgu2UA2ttxRL8lmr5m2n5yPvd9K/OecO34+su5NLEMSuZ7DeNFFTOXeeg8dWz+D JlOIkT3cxEejymTHTD+iyFSCJhnBOyAWehcGnrN9ft3f6k1nGOTa9x4Z5pbv3V+LOVv5 3VUmp+k5ni1tSyLxrsx0Jj7KFC3bSJO8MEjznHkkMqjAtRuyHsnmO/4NtaKZYkZSbqhh AjXh4xJZbWva3srOHmwyg9uKP/qVoaIwK13vf8Bk9Vsf48LheAc5ykvC+z5656rcDLYk Ss5w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337454; x=1754942254; 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=age55wbZhUILPh9ylrfGSynJrjpmIlO2XVYgrke2dNo=; b=Yxk70o9MMeu/OOYbWUb/w3jVsau3K40RStYh6tERSSNBQvNeOVbZuTlDYrewGj8/2C gF/oU2t3+ksqrZL1D3x0MEcZygf4XvxNwSorVFbP45KaXGeVR3YS8UslmYJnMTiMNc3F ui7KHB6Y6RGw4o3c7rZNScy7VGfELpCbDmjHVTeh0EDw97AoSXcCtvmrDXVP61zCWbNP Yhum5nrAzG0gUbZiDepg9cuILNxSJe3uoXvbln04e/FSbYsbtvBffP6nZHW+8iA74GgV fTSbZ7VSxCpqnsqGWOdCOaECmwu2K9wrJRAqbRAzl4wpyUe8p9MKMDH+ObyoK63RgEtD iZTw== X-Forwarded-Encrypted: i=1; AJvYcCU2q0PmjU3W5gGXX6uN3ksgpmRsh6Su/z9YL/V4hSxra2SqlRgj6iehvUmplhtfJp0qnnyMdSFFZcPr@vger.kernel.org, AJvYcCV2Eu7F3sdsn3FR9zAXTfAMc15v13cbQX0vyX94f0dvNwCpfbOsHG/DkOyHoMZ0GdbqTNlH4LVVgfyW8891gQfCCwY=@vger.kernel.org, AJvYcCWAhyeoQy/VxML+uWPP5Y/pfB3tVDeNC7cp3cKZMhM3k80Jc4qz9o32Gb9C3CFWMO2VIm5/QHUzyAyPx+rU@vger.kernel.org X-Gm-Message-State: AOJu0Yyp7VvtwaPOsZzm9ojuK0UaXLRIpP48UYmnf25Iqh6hBcVM/9x/ 5YTmmI8/bjfFC6F4tCnrL8TjKiSl3mdBFbvN8WiKup61OioZrgZSCgyo X-Gm-Gg: ASbGncvPMODYSdGrdLBHVUOtD7ZVSprp9BwKT5UTGi7JIZF/9I0LGa+yn92WrXIhPu6 yTrBk0WvhGRX9JGcY2o6jAlKrdPFCe/uMTfEmKDI2j76YAc/EBCifIFiQpcf+F1g8lO6mCbtmJQ 79UELz4nd3DzGIK0sd7Ca5/R53wqhW090qrObH4dcPGG02k9oi+qZRAMiqcF+pburQLz59bPgr/ 16CpXoTHtmrNHWS2eWCuqlTm+SVrxgW8dSlfr06sJ4j0Ctah4Twqgi6h0akstJJK7x7p5/DQHyy r12ZU7jtWWRHf+U88906L10BrVOiXsSVrUyFQ9lj6EAXGdoxOPXUXu5HeQ8wxb34lyn8qz/OVdy LVHobP2KwhcyoaB04mKA3Z7fit/lhJEYJwBK/BM3QhJ/0nr73jeosBI2qEp0eB/fh5XiBThfeNQ == X-Google-Smtp-Source: AGHT+IEagAU/Bnj1Ds7svrQ9UJcYaGd8BaxU8CmqdUxUKaMqT6oz8XaUBmvR3+urXT9ZVAB1gR1BFg== X-Received: by 2002:a05:600c:b93:b0:459:dfa8:b85e with SMTP id 5b1f17b1804b1-459e0b2af38mr7787645e9.0.1754337454051; Mon, 04 Aug 2025 12:57:34 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:33 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 4/6] watchdog: rzv2h: Add support for configurable count clock source Date: Mon, 4 Aug 2025 20:57:21 +0100 Message-ID: <20250804195723.3963524-5-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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 --- 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.50.1 From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.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 F3B5D23313F; Mon, 4 Aug 2025 19:57:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337458; cv=none; b=fUCm2qVd7AfHNFkWIQmAriWeg0vR5/VwonWGM63lzs5fGwT4mlkQdyrWENANK52+syI6DC5nd9wu7+Th20MAN2g6EpGd9vgwJGLpf8k6DkngpwZZWmLc7K4mv5Jxg+dPTXtZSBChK32nuHUuqQyIG1ldSi/yeJpU+BE33tePKMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337458; c=relaxed/simple; bh=Uei7WzHf4ufcSYmXJmjdkG3Y2RTo+kMYfa1w7DOs5bg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=morITDudUDEA1iavaXivi1GEpUYADOKuSEivJUjNzM3eeV6EZTav2NYChMDJZ74AyOYaQsaY1uoU//15cM2dkQazuUsifjmWvF6R2Ons1P7Dv2234Fuc8fG0hlTdBTDTt1QeB37zzTFXIC1j8jGW+/LEEAJr1uFvJeJsAwSg8jw= 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=jVnSINSI; arc=none smtp.client-ip=209.85.128.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="jVnSINSI" Received: by mail-wm1-f41.google.com with SMTP id 5b1f17b1804b1-459ddb41539so5360725e9.2; Mon, 04 Aug 2025 12:57:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337455; x=1754942255; 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=uJPwKog2fKu1QVO9GrFWU3eAL+AwvpT1XJ9KMuR3DHA=; b=jVnSINSIPBfcoaDpdZeVTmSGEqw//+ZFO1dBSpO8msdp+lfAb5vVx+108SuKE5GVdN TU13HsFrRW5H8UnyfxomLKQyfbKvoDzVp7qLYi78qyn8k3xEdllzdfEgmgEut6mS/btJ Ny/wr6NlPtIfvcZ/44KLaVuXUygHrP2vNFsMeG9sxrjrxdl4ectEnoxhQXIQgF6oU+pR xQhBKvSKkCi+QSkfV/vMh4SzoPdsHp3OBA56Iwks8oQcV2+C6cZglHH3WzfVjeWGaYzq XCdvNFD4hPEtzC506MeACcqDLHb87/eFEK/hWYa3H/8B3NMJg+XtqmFYOeQBNl8j+TUl bRKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337455; x=1754942255; 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=uJPwKog2fKu1QVO9GrFWU3eAL+AwvpT1XJ9KMuR3DHA=; b=fq3nU+l2X9kh3BV8b8LT9MkINwcGGRHDx7g9kJpDQy60oLpe3DZJQjwNzW4iqadQjK oCluZDg4JGBhU0OMiJmyzDF8wlWFHOKNVtwATYeQOoOF01iecD1JW8u9KQZMFWk5C1LK alWPLieBbb6Ab9dven1Kz0m335W8JVD0azTemn14hnx8lscKZOFIzHEq9oRwETH/Ol1U JF1HI6gZJjngGaYMuFIXuqwQUXV2brx7QR2i8Olu0wgz9FhBh7hpWibq+RgAi4KQtBd7 cCWitm5iuW4S5USU1I/sbdhdUcMz7l6es3Erlapx9a6BSOaLNz61tYwCFEhm77fLjTcj FK3Q== X-Forwarded-Encrypted: i=1; AJvYcCU7J+P0ip/UnFfX/fGAmknz6vTWkPS99nvZoe8VAf0DMapePK7/oqylBDLlZKfGynGwh9xPnTpdvmqX@vger.kernel.org, AJvYcCUV9pmNL9P7+bZFBE9RjKcDicyGfeGGviwEzxTYYWJ7lY0p0O0OxGx74iAasO4udYzAP5riBncZlnxObWpG98bZQWo=@vger.kernel.org, AJvYcCXhZdPdgZzl9gUTWbj+ghzirRdjB5dWgQwdkk24AlBXqlPlZYOYrAemF3I0nHSU03S41VRP9XkmHeEMFwZA@vger.kernel.org X-Gm-Message-State: AOJu0YyMThnXCSdU2I19bGJfg74xMqJqLtst7F+g5Ly3baxSj2VOxcAm eN80TVfuGkDbwzPfM5afmC/eJgGxL0HhdkhqukMUwqadlayO4VM9CfYw X-Gm-Gg: ASbGncvry2JJ1bS708YR9e6vUJDmUebCkpBQMpeM6vHeO4YLoynERbJPuCu07wLRkiJ U/32/XWAsKsbf5/UFLAFcmJAQeqE+xHIw1p8wa2I0gqNSGR9rTKGtnEP8thbZe3s2VPNlGX7Xjd oFwA4hwstuuQFgs1n5Ukrp4H1D6cAUlE8sbI6YwHJjtR1/cOaXylegcz1Y3wSCFPelHX4NK+yzr /XmFiU2toSOokSysGwHWMiGTTDObyxQbK9hbuAqLHq71GHp1eUUrceLwbYvIED58jiVVt7bJ1R3 tFQm2cqKrKFK5cTKPzRzwRF3R/KbkOmNDhaY+DhAQuyrtUunCebgEwrZRnEXbWWNEVYFLiAgcu/ J4NjkYVxoOiS4cTi3ZLjd2Gpdwxn2yS7SXhqP7sn074z7q3iLj3MgANZaUT2ykzAropKLzcjZyg == X-Google-Smtp-Source: AGHT+IGPLEjI7VXGeSccJM+K5kKbvSy+WTVMSGFSBuRFFHctYO+znZ883QHIHYqQPct/cGOLvMy72Q== X-Received: by 2002:a05:600c:4752:b0:456:25aa:e9c0 with SMTP id 5b1f17b1804b1-458b69e3710mr94917065e9.14.1754337455087; Mon, 04 Aug 2025 12:57:35 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:34 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 5/6] watchdog: rzv2h: Add support for RZ/T2H Date: Mon, 4 Aug 2025 20:57:22 +0100 Message-ID: <20250804195723.3963524-6-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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 --- 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.50.1 From nobody Sun Oct 5 12:52:24 2025 Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 2815A23D294; Mon, 4 Aug 2025 19:57:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337459; cv=none; b=pm1EEY/1xCF/llZ4n+8Ym+BGQRZNdswp66WIhxZFr99XSI4am2S1bx/WnFUwbCf+RrwYYLJrtvIm04J8MZ0leiftrMZS7ZJjYIH60eNAPOcpqZlxLiAosJeyGFCBVyPmwqPgfWh/zNPA3Zz3JP3pB5ULJuj8GvdpgzAZ7P7TChE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754337459; c=relaxed/simple; bh=iGZD0LQ3kSDXmYoPeaYnugCI5o1eWItexWDE/LM8Q+U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XnR2Vrnq5kulFinydB7HWelITX9K6+14XlY+/XYF9NnbPDuqZLfJcKSvIRl06UaMhgbs2Tysj9tCYGfsmpazBzmAkOyCM5/CUUtMlxiVwHl4NjrIwTAcDndQVbBCp7EH9cwxNr2IuMUIZk2EOo8r31opXn+JVkLdeqozvO4k9kU= 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=WRfI9QIp; arc=none smtp.client-ip=209.85.128.49 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="WRfI9QIp" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-455b00339c8so30487485e9.3; Mon, 04 Aug 2025 12:57:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1754337456; x=1754942256; 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=8VJM1mx30IuCWN7LUhFDjSWyKbNj6VnDSykcNH8sS+0=; b=WRfI9QIpBhUnK0lGMssMEMgfhjpjPDjCHqWOELgFseJfUMz879ktSL7Qx28UON5W/c MURuUl2PwwH+H758C4ex2ikI5Ft9HYqP20RK8E55vMepBhrYFAmBNC0TNac2nSz9FV66 kPh+brN79t5xnd04D6y8KjIs8M1MSfk2UDSNe+xbwqa2e6rFswkZSPGnPHU36HSqkLES 0RK5JJ+DMLpMW7HZ45ibx29ptu1OKW1EOLFNz8QpCoAYfQ1DnQsVi8Veg5wQNTvXgrCb tu0t/JaYhatYc1/vMEB3czYL80oEzQwobZzAgv74rN4jnVqRh/VrSUTTWBWFTIgZ7546 qh3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754337456; x=1754942256; 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=8VJM1mx30IuCWN7LUhFDjSWyKbNj6VnDSykcNH8sS+0=; b=H37GosiS92yuKA0tbTkfS+71qo7IGjJtqN/PAqUom1bGJbL5yOhvaE53dZYv6lfldY KyNMpWpPgANMGdujoLiWjO3+9kNaME2ws/KhWmQJuDg8K1w8huZAUVyOU8ij2XuWua53 9Uj/hqqpRExfmPwt6WYgSf4dMPzVvnZ8JUf8mhQsAIEEEtUXSgNciUqoWc8r8NJHDidf o5odUmFwg7vNxQBaELG0M9cjZqX7nsP4kR64SmYpszztXmiZ1x3XXbTvF7lQjEyO9DN/ cXb3h0IV+1YPhPXOY3kQZxc3TAYgNyVUrYCjJcjly8EuENGH6tB2otaQc21jCE9opIE7 niaQ== X-Forwarded-Encrypted: i=1; AJvYcCUbiFnD7lYZo0reQEsFXourPEaIcSPjkF/q4JLJpnkgtABpAlc80hHLXbaWQWJy6AbV/yX57uvoGHHigHAM@vger.kernel.org, AJvYcCVr47Jr4g5asP39tD6yyoitPKUfPmEpvjGdhJ82dw+ArxjzywkBvjDX+MXaDPnaW2vlP2yCbGziV3s6vrOiqTXH8JQ=@vger.kernel.org, AJvYcCWWAH4G3KGtg0sT5Zy3fD/SuQL7z2882xVzN0VXBjjtGdoeIABnkZFTP1/RzLuiPIVj/+paRS8/62W3@vger.kernel.org X-Gm-Message-State: AOJu0YyN4Rdy0foQhyvISx4YPlYmYW5Ej9QfQQMA5vCPIY93TR5ClU/W onuF6+CvpY+DtAOb6eOgJLeYy55EYHWi+8MzbdAxbDx/WmyJYRZ/uT0Q X-Gm-Gg: ASbGnct+S31DRJkQORPXD1Hpz6GTMbvuTDVCefhEJD20A2tsk6aB5Qd7BLJXV90Ufig O+NMGDRCgrBxoIGhmR01PvZc1WnmWDltV4/Bn/Cl5iQAVtxkTDuQAfkZRRz1APEgbO9JEgAecMl lqCTVyHIwktTqNHHjfhS5TsTG0r1p6g60IaWY00pWJ+Y+Kbnn2botNWXcV4ih5NtgVmenNFrR1h ash2RuBK4lA0OofK60DgUFlFW+bgzj/WAkeXjeHoli3kGYqNqIfYBN4dFMyPWDrv8ufdidiOYFn Iz6726O1csTqIhuoE2TtV1PevaNWQRUpANnPvYSxTL45vE6M5qblEEH/qQ4OsgMuh4c4ICUYVvw nlX+ehJfhXSy3jsA5sdhbN7sDrbmXOCttnYC33DfgtR2OgYBAk9SJ7CqRN84i/qYYFmRfth9D6Q == X-Google-Smtp-Source: AGHT+IFhirFSwPDMKdw0szNtN+lgDQLs7hfhawj6V3Wl0uz6ab9RL3vLHJiWuSfsZg9QrYIu8FKcTQ== X-Received: by 2002:a05:6000:2004:b0:3b8:d16a:a4b1 with SMTP id ffacd0b85a97d-3b8d94ca58dmr7129938f8f.58.1754337456380; Mon, 04 Aug 2025 12:57:36 -0700 (PDT) Received: from iku.Home (97e54365.skybroadband.com. [151.229.67.101]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b79c3b9074sm16293840f8f.17.2025.08.04.12.57.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 04 Aug 2025 12:57:35 -0700 (PDT) From: Prabhakar X-Google-Original-From: Prabhakar To: Wim Van Sebroeck , Guenter Roeck , Geert Uytterhoeven , Wolfram Sang , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Philipp Zabel , Magnus Damm 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 v3 6/6] watchdog: rzv2h: Improve error strings and add newlines Date: Mon, 4 Aug 2025 20:57:23 +0100 Message-ID: <20250804195723.3963524-7-prabhakar.mahadev-lad.rj@bp.renesas.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250804195723.3963524-1-prabhakar.mahadev-lad.rj@bp.renesas.com> References: <20250804195723.3963524-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 --- 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.50.1