From patchwork Sat Feb 17 04:40:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13561224 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 024891CA87; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708144834; cv=none; b=c+MCCpG4v/gvY1e7KjoYQhRUM9Uh0o6I5X/SDO3bnsGT5wo3daNmMLgl17nip4EDW3OSlQsgrbFCaLzgRX4m38c9S6t7iNKYZ+tZ34+Von77q/+ZIFAhH0zftvLr1ApHnH/bvAuEebVrpBZIooO7II3HRwtYtahMuSp3RKzKh4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708144834; c=relaxed/simple; bh=O+gac3yrsv2rOFibZ4kRZ9MSQo41/MsQ6GdSbvpMomU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=QDtYNc6tu6DZk2sz1Z1aJ8wH41AAdWLy9plyKc13sLgnxi46lDnKytvdTbGBfSEmcd2THq0wl8ayHZaPwBXvkqXLSoOhnM/iYX4MqTC5ELBARtQzxzADWCgi9STJr7kK10TjxOmeKCnXnrA1uH82WjwxtZFYl42mz24JeD186DU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=CPFBz8Z+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="CPFBz8Z+" Received: by smtp.kernel.org (Postfix) with ESMTPS id 89D50C433C7; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708144833; bh=O+gac3yrsv2rOFibZ4kRZ9MSQo41/MsQ6GdSbvpMomU=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=CPFBz8Z+7+dCJodMlEdTrLsCGQw8KLcnGPAwOBzlTcMu5FBiZJZTbAwfBYv38UZIu M+reaATkaKjTLCR04My6WnGGnXvSEAEZaEUoJ3QzW2eI5sOVnd/WfRXpNSFVMGLKMp oaYfcV5HYv8Q2ToiTS8RFkqTR1iFOTdEoOTrj9K1qPNeox72pRG1QL8hD61yxHC2PJ 20IBkygJAv+GIwnNryhH7cRtH3kr2goe8CMoWniQapfuR61N8iXh4wmVKxNyen0KOf 0mOJ0tlZvjHUCfBO3xZHjPvmcW1IEMzofo7msgTQrChIvdIA1TbOpMkboxiFO5PNSd TRUnbhize5qnw== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6EEC6C48BF8; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 12:40:34 +0800 Subject: [PATCH 1/2] watchdog: sp805_wdt: deassert the reset if available Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-hisi-wdt-v1-1-cdb9ddcab968@outlook.com> References: <20240217-hisi-wdt-v1-0-cdb9ddcab968@outlook.com> In-Reply-To: <20240217-hisi-wdt-v1-0-cdb9ddcab968@outlook.com> To: Wim Van Sebroeck , Guenter Roeck , Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Viresh Kumar Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708144834; l=1680; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=Ni3PL21dVfacX58NyroZjoZbD5lmIJt2JGNnhuDX6xI=; b=qRRi4UH/YpnnK9zlhgdhzMq/aSkKISAB1wZOe9Q17jU37YPbo38JY3Un26vNgzqCE5uiWTDF+ G80t5j/g/XSB7BOUhWmO7yYDvRHKf6erMqOReBZaT0lHNN9B18LzbWB X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen According to the datasheet, the core has an WDOGRESn input signal that needs to be deasserted before being operational. Implement it in the driver. Signed-off-by: Yang Xiwen --- drivers/watchdog/sp805_wdt.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/watchdog/sp805_wdt.c b/drivers/watchdog/sp805_wdt.c index 2756ed54ca3d..b4bcfdeb39e6 100644 --- a/drivers/watchdog/sp805_wdt.c +++ b/drivers/watchdog/sp805_wdt.c @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -59,6 +60,7 @@ * @lock: spin lock protecting dev structure and io access * @base: base address of wdt * @clk: (optional) clock structure of wdt + * @rst: (optional) reset control signal of wdt * @rate: (optional) clock rate when provided via properties * @adev: amba device structure of wdt * @status: current status of wdt @@ -69,6 +71,7 @@ struct sp805_wdt { spinlock_t lock; void __iomem *base; struct clk *clk; + struct reset_control *rst; u64 rate; struct amba_device *adev; unsigned int load_val; @@ -264,6 +267,12 @@ sp805_wdt_probe(struct amba_device *adev, const struct amba_id *id) return -ENODEV; } + wdt->rst = devm_reset_control_get_optional(&adev->dev, NULL); + if (IS_ERR(wdt->rst)) + return dev_err_probe(&adev->dev, PTR_ERR(wdt->rst), "Can not get reset\n"); + + reset_control_deassert(wdt->rst); + wdt->adev = adev; wdt->wdd.info = &wdt_info; wdt->wdd.ops = &wdt_ops; From patchwork Sat Feb 17 04:40:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yang Xiwen via B4 Relay X-Patchwork-Id: 13561225 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 024AF1CA8A; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708144834; cv=none; b=XcmfGUNjdk6oyK3K4yhDHvGVICL8mlMIZgBnemhnmxORjEiplSQJMvL0hfKSYG6kpSkzCwr26+anPPf49jUza+4lXKIJ6bU9p2gIf7TN67bRuUSU03gAeuGqBqaWcPqEqgBXTrgey/ckQZHkFIoQm22H8FFpli9QsoZj0XYPdF0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708144834; c=relaxed/simple; bh=vtNbiCf8dPvo8myozP2/Im+/upL82iYWSS1O9Sy10wM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=MV2PKjeixIF64EmOqnBHtB8/aMUrNfk1y66zWGQd2V3oXW6DWvyErAv7SNWsL2Ekz45oBhU6UV7AqA1is0YDZ+Jycs/hG8nf1wHjo7z5HBwo/aDq0XrGpLGxGdOXiBy6lH7JFQcsCUbzFQn5v7cqf5eYiDP8p4iQmwi/sqMYwf0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=a6uk8iaF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="a6uk8iaF" Received: by smtp.kernel.org (Postfix) with ESMTPS id 9259AC43390; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708144833; bh=vtNbiCf8dPvo8myozP2/Im+/upL82iYWSS1O9Sy10wM=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=a6uk8iaFExqKCvG6TVaVt4kGzuYUIUGWy5M/JllferAMgwTupd78xlWRHjrUzXq5T ImTyyyPzV46AuBiZG7m+/joYYktJoH4uuViDBetorzDy/8Gp8eDkznCsJxe6jbQK3f iEWwTH3+4+AMIRmBUuSo6dyl90Of4YIUaEFEGm5i+iJgDhMDR3qh0JwQgsWUm4LRom +78oELK6XmcjRwmfWl7U92dpkygZ84/NooIRTZ/jjlioABGtKt5209LrZ5TcUeCU/M QYHQSK4Uzljs4WQvTBUDfyQC3dov5usDOFgKDK42SIIcWRAMyFTTQzuw5F8FrYRJbX 1e4lzvOvySx7A== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7A7E3C5475B; Sat, 17 Feb 2024 04:40:33 +0000 (UTC) From: Yang Xiwen via B4 Relay Date: Sat, 17 Feb 2024 12:40:35 +0800 Subject: [PATCH 2/2] dt-binding: watchdog: arm,sp805: document the reset signal Precedence: bulk X-Mailing-List: linux-watchdog@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20240217-hisi-wdt-v1-2-cdb9ddcab968@outlook.com> References: <20240217-hisi-wdt-v1-0-cdb9ddcab968@outlook.com> In-Reply-To: <20240217-hisi-wdt-v1-0-cdb9ddcab968@outlook.com> To: Wim Van Sebroeck , Guenter Roeck , Philipp Zabel , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Viresh Kumar Cc: linux-watchdog@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Yang Xiwen X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=ed25519-sha256; t=1708144834; l=1040; i=forbidden405@outlook.com; s=20230724; h=from:subject:message-id; bh=HUldbqmBl21KlfOEiljP/y3O1Exgubj2VKDOCZ4vRqw=; b=/PKUGGOnHUsZta+uz74jNQ9BXBn4YtiauYN296RUBFBiX1nUzbuQoSFRuQn1heUk1+6JtgNd6 2wcAhavXQaRAEDph8fHPc0BJADn6Dkns1GG3jF0qjNafC7XnpBEz7EC X-Developer-Key: i=forbidden405@outlook.com; a=ed25519; pk=qOD5jhp891/Xzc+H/PZ8LWVSWE3O/XCQnAg+5vdU2IU= X-Endpoint-Received: by B4 Relay for forbidden405@outlook.com/20230724 with auth_id=67 X-Original-From: Yang Xiwen Reply-To: From: Yang Xiwen The reset signal needs to be deasserted before operation of sp805 module. Document in the binding. Signed-off-by: Yang Xiwen Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/watchdog/arm,sp805.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml b/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml index 7aea255b301b..6d4f63f23f1a 100644 --- a/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml +++ b/Documentation/devicetree/bindings/watchdog/arm,sp805.yaml @@ -50,6 +50,11 @@ properties: - const: wdog_clk - const: apb_pclk + resets: + maxItems: 1 + description: | + WDOGRESn input reset signal for sp805 module. + required: - compatible - reg @@ -67,4 +72,5 @@ examples: interrupts = ; clocks = <&wdt_clk>, <&apb_pclk>; clock-names = "wdog_clk", "apb_pclk"; + resets = <&wdt_rst>; };