From patchwork Fri Feb 10 06:56:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 653669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 602CFC636D6 for ; Fri, 10 Feb 2023 06:56:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231354AbjBJG41 (ORCPT ); Fri, 10 Feb 2023 01:56:27 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40678 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231344AbjBJG40 (ORCPT ); Fri, 10 Feb 2023 01:56:26 -0500 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0E9A320064; Thu, 9 Feb 2023 22:56:26 -0800 (PST) Received: by mail-wm1-x331.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so5572847wmb.2; Thu, 09 Feb 2023 22:56:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=8W95yo1auDtSb8FRaJVq8qHTIzQlIIiJTRKxHWk0HJM=; b=LD4fiN3r8S6ZAum7n1fqQjIJL/buQFVPxgG9wjik/3OLKLw34xr/zaNZ6xnNR7PsP6 0mz/pA9CWEamB9U+5N5jqRWUMVNKRBrYwhb0GpbkdwGSViwvcC2aUedSpcc1Dcp1nInD nRxlXniEF3OtvUc+6oTvEH3zd8JmEnPQWNxTIR1MeD65ngb8m/09wiiOGd3iLIs3h0qO blnWxSvTvT57yZCc6gjZYyjcmq+8ykHCHxMUhpsmm6YY89D/nDfnInh3P9dEJKrmP4QW E49JB062CNsdgBBpbe9dBZcKAY8otUhLNIZW+dPh7HB4AXTBBJzcbHYqNGqRs+TIDTC1 5IWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=8W95yo1auDtSb8FRaJVq8qHTIzQlIIiJTRKxHWk0HJM=; b=e2gS87WdDkTQTkHA3Udbzvnq64MeVY0ccTikIGAXjEk5lePSEPO+ZWmobQCHWJVJuZ dOOKhVi0tuQNJUDY9S8si5UPX9ipftovqdnw8Y4V+okXpyoONMJ5JFHJTowfv4jr3Eb9 SNefF9cJv4P6gjI3INmNv1PuerZK3k6a4TWVrsmJjNJCY4iD8ObvWpc+78572xHBMt8B vnA9dGVOMxYSVD6yqnf6HXsXfe2BThFmA4x4zUdmiFLvk38ehmX4z95qwRN8/ZGHOgLs gXNLZGMHQGTbrC4mAwLZ15SyV7hPwgQrotEA0753R1dmFwe2YtQ1xI+CBtUiXyABJNiu Q9fg== X-Gm-Message-State: AO0yUKVbQ3BPw82s2HDPy+umB9QPFPi99/hVLkKFrlCBARSPOVFEXuqc N/6DaeQUByr/KUByULPsUEwU2nzjLyk= X-Google-Smtp-Source: AK7set9SPCvePfmmDkifOw75l2tfnd+RrGPtYmfzP0N2ukUwgB8wQFgEHT4wy1E/DEpWsUV0TiHNwg== X-Received: by 2002:a05:600c:4383:b0:3dc:d5b:5f73 with SMTP id e3-20020a05600c438300b003dc0d5b5f73mr11794204wmn.19.1676012184338; Thu, 09 Feb 2023 22:56:24 -0800 (PST) Received: from localhost.localdomain (23.red-88-10-60.dynamicip.rima-tde.net. [88.10.60.23]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003e001afa274sm4385612wmo.2.2023.02.09.22.56.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:56:23 -0800 (PST) From: Sergio Paracuellos To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, arinc.unal@arinc9.com, tsbogend@alpha.franken.de, p.zabel@pengutronix.de, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH 1/3] dt-bindings: watchdog: mt7621-wdt: add phandle to access system controller registers Date: Fri, 10 Feb 2023 07:56:19 +0100 Message-Id: <20230210065621.598120-2-sergio.paracuellos@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210065621.598120-1-sergio.paracuellos@gmail.com> References: <20230210065621.598120-1-sergio.paracuellos@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org MT7621 SoC provides a system controller node for accessing to some registers. Add a phandle to this node to avoid using MIPS related arch operations and includes in watchdog driver code. Signed-off-by: Sergio Paracuellos --- .../bindings/watchdog/mediatek,mt7621-wdt.yaml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml index b2b17fdf4..3c545065f 100644 --- a/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/mediatek,mt7621-wdt.yaml @@ -14,11 +14,18 @@ allOf: properties: compatible: - const: mediatek,mt7621-wdt + items: + - const: mediatek,mt7621-wdt + - const: syscon reg: maxItems: 1 + ralink,sysctl: + $ref: /schemas/types.yaml#/definitions/phandle + description: + phandle of syscon used to control system registers + required: - compatible - reg @@ -28,6 +35,7 @@ additionalProperties: false examples: - | watchdog@100 { - compatible = "mediatek,mt7621-wdt"; + compatible = "mediatek,mt7621-wdt", "syscon"; reg = <0x100 0x100>; + ralink,sysctl = <&sysc>; }; From patchwork Fri Feb 10 06:56:20 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 652669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id E176DC64EC6 for ; Fri, 10 Feb 2023 06:56:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231243AbjBJG43 (ORCPT ); Fri, 10 Feb 2023 01:56:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40712 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231360AbjBJG43 (ORCPT ); Fri, 10 Feb 2023 01:56:29 -0500 Received: from mail-wm1-x333.google.com (mail-wm1-x333.google.com [IPv6:2a00:1450:4864:20::333]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73AE33608D; Thu, 9 Feb 2023 22:56:27 -0800 (PST) Received: by mail-wm1-x333.google.com with SMTP id c4-20020a1c3504000000b003d9e2f72093so5585217wma.1; Thu, 09 Feb 2023 22:56:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=tQlG6AWGDGiaVCyhcczhUxKcndm2ZWR4D2LQqdn5yiE=; b=lclAAgSw/cy1PcBGDwGXVnSI8+4AWjAghaqMC/7WihzIyAuvdljcSRO0M0btrKixl8 Z8kc66wQS8RuJAQbvfhgfVeZCRDDslRuLI9kaur9i2TPs8sSAMtMIIrBwsrEAfTmRkcW 3UQ0OnMMBMX/FDg3FT5XQ0tWFmPPd8a8gmskfiMY0vuHXyVH1FWs5XCkjZ8bXyb6Xucr XtqspUZcIUJmfCnEctvpd0MeJd/OzYSEQl214iihQvuvR2FWQ1WmvYssKgT8ycmELqD8 zwtOhqnTkD/IfkPvL2t+saUXmwH9zTSKwKQq+MNyiJBwnmdw6nk8hk9YGxLp2QC3R++h JLLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=tQlG6AWGDGiaVCyhcczhUxKcndm2ZWR4D2LQqdn5yiE=; b=N1tOLmoJ9d6IrpQOui+rXM0R9C0T05v7P89wHvLjLw2nnfy49txIDEgIrsLfwbS9Hb sIvudgO3iEmhYTnUOTJwXNEtnKESVBw6GRZi+EzZV1y50p/O0z3EOLGbvzXHO7kj/C1f lM8RhoPZtUtysBDZXjBS+5OEz0QWo1DQcizqsOsu8g+F16B3xqPS4JKEZgXXNAggFvoI rKPGS5SPDDNCnF8sNJHyTU4RwK/YBRCEqZWK+iOQVgLXNkSg5EOld5BT3aeBv7l5EjMn 5Lf8nHyow7dR60o20dzvj5RXoClkBor8ldUMUse2NMs/7w6JEorhpi0cEaRTgsMJ2TYO 3fGQ== X-Gm-Message-State: AO0yUKXksa1zsUcrcU7aw1KJ506up45xDBl6i0T0ZTA4qolGb+koNJYf kNxboKN/ePl/dil27VPvXlEfROqsusM= X-Google-Smtp-Source: AK7set+D3eysAynCvcZNB0u35nPmszVJoApMTolc4ISxxZo+eUe8r08VuAj2ferIIgQZJKOYTI9OzA== X-Received: by 2002:a05:600c:3290:b0:3db:8de:6993 with SMTP id t16-20020a05600c329000b003db08de6993mr1307503wmp.4.1676012185515; Thu, 09 Feb 2023 22:56:25 -0800 (PST) Received: from localhost.localdomain (23.red-88-10-60.dynamicip.rima-tde.net. [88.10.60.23]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003e001afa274sm4385612wmo.2.2023.02.09.22.56.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:56:25 -0800 (PST) From: Sergio Paracuellos To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, arinc.unal@arinc9.com, tsbogend@alpha.franken.de, p.zabel@pengutronix.de, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH 2/3] mips: dts: ralink: mt7621: add phandle to system controller node for watchdog Date: Fri, 10 Feb 2023 07:56:20 +0100 Message-Id: <20230210065621.598120-3-sergio.paracuellos@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210065621.598120-1-sergio.paracuellos@gmail.com> References: <20230210065621.598120-1-sergio.paracuellos@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org To allow to access system controller registers from watchdog driver code add a phandle in the watchdog 'wdt' node. This avoid using arch dependent operations in driver code. Signed-off-by: Sergio Paracuellos --- arch/mips/boot/dts/ralink/mt7621.dtsi | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/mips/boot/dts/ralink/mt7621.dtsi b/arch/mips/boot/dts/ralink/mt7621.dtsi index 5ca40fd21..ebee23a2b 100644 --- a/arch/mips/boot/dts/ralink/mt7621.dtsi +++ b/arch/mips/boot/dts/ralink/mt7621.dtsi @@ -71,8 +71,9 @@ sysc: syscon@0 { }; wdt: wdt@100 { - compatible = "mediatek,mt7621-wdt"; + compatible = "mediatek,mt7621-wdt", "syscon"; reg = <0x100 0x100>; + ralink,sysctl = <&sysc>; }; gpio: gpio@600 { From patchwork Fri Feb 10 06:56:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Paracuellos X-Patchwork-Id: 653668 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7C4ACC636CD for ; Fri, 10 Feb 2023 06:56:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231388AbjBJG4h (ORCPT ); Fri, 10 Feb 2023 01:56:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40772 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231370AbjBJG4a (ORCPT ); Fri, 10 Feb 2023 01:56:30 -0500 Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85CE249036; Thu, 9 Feb 2023 22:56:28 -0800 (PST) Received: by mail-wm1-x32f.google.com with SMTP id r18so3086787wmq.5; Thu, 09 Feb 2023 22:56:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=qf+2ZhY+893e36Ug2b5UjMaC8ljMGgprsHyghDRy1Sg=; b=QFQGPb20w3YPAM0If9VYHLNWZx8fQU/Jcj32TVqWfuWNx2CwViDw+2kE7IvKAd51e6 FuUq8XLdWDwou1nrsbPiV1BzklAZ9210mnwQZrc8NKxmZ+WUn3Wk2XOaxW6ArHMAoGim Izi8pHqvGHh4qIghrClzJx9E4yPDCAD+z7Xed3DQlaBT7mCNjgSe3yyXE1pw3qNhnbWf pA0f4sGujjHSaxqpw4FV32bqAf2kuC0P3iphlxsRVzeEuW7KeGvk5W59/Dn1KmQyuAGZ hlxmyNA9g8epGTJ2pLbCq5rs9RWTPOY1derkGQj8LSnqMDVSFKiqeRFYO+LovX6TFgtb hQIw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qf+2ZhY+893e36Ug2b5UjMaC8ljMGgprsHyghDRy1Sg=; b=39VGLHlxtxsRJc1+PqBTv7c+pREVu/ZEdTNHqris9PO1Ty8WH/s/g2VxLC3XMUF8kj q5PidDWz6edwPkrkHPpf/TmBy0AE+fDc2WmrNEXgTEkB4On/w9eXTqqh2AD/QYBm8bKL QnXhswwqN6uYSjf9oPn2+CpPZNVcQElpfbMZsw7sA7OnZgs9cflhZPpBf+BMA0a92E79 VmewaR9ge9ksiBtZUPEKRuWXTNblnkMEcYOYiRSsXE/0zLInUqUFOf7bmdT37CJ+juAT jq2/7NlCGxY/dG82ii2LgG4E5Dz7lBCIBNRw1Cv182pgfXsvHuSSQiKRqCEasXdus1mN VMjA== X-Gm-Message-State: AO0yUKVbYlBHOCp6OTYHi9Rm+iUWkyrIyfblJtjN3ZKPdocyR/OpjLgO 0nXmFDFErqoo94rDBOEOzFylVDLNBWI= X-Google-Smtp-Source: AK7set8XQm8OBKzW5suIAmgWC7BkirjKJPBm2w1XqSWnY5B6w+svwYlQ1C6Ceu/dcH0hvxjvQSd/DQ== X-Received: by 2002:a05:600c:490a:b0:3d3:4007:9c88 with SMTP id f10-20020a05600c490a00b003d340079c88mr15192637wmp.18.1676012186722; Thu, 09 Feb 2023 22:56:26 -0800 (PST) Received: from localhost.localdomain (23.red-88-10-60.dynamicip.rima-tde.net. [88.10.60.23]) by smtp.gmail.com with ESMTPSA id p13-20020a05600c468d00b003e001afa274sm4385612wmo.2.2023.02.09.22.56.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Feb 2023 22:56:26 -0800 (PST) From: Sergio Paracuellos To: linux-watchdog@vger.kernel.org Cc: wim@linux-watchdog.org, linux@roeck-us.net, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, matthias.bgg@gmail.com, arinc.unal@arinc9.com, tsbogend@alpha.franken.de, p.zabel@pengutronix.de, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-mips@vger.kernel.org Subject: [PATCH 3/3] watchdog: mt7621-wdt: avoid globals and arch dependencies Date: Fri, 10 Feb 2023 07:56:21 +0100 Message-Id: <20230210065621.598120-4-sergio.paracuellos@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230210065621.598120-1-sergio.paracuellos@gmail.com> References: <20230210065621.598120-1-sergio.paracuellos@gmail.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-watchdog@vger.kernel.org MT7621 SoC has a system controller node. Watchdog need to access to reset status register. Ralink architecture and related driver are old and from the beggining they ar providing some architecture dependent operations for accessing this shared registers through 'asm/mach-ralink/ralink_regs.h' header file. However this is not ideal from a driver perspective which can just access to the system controller registers in am arch independent way using regmap syscon APIs. Hence, add a new structure for driver data and use it along the code. This way architecture dependencies and global vars are not needed anymore. Update Kconfig accordingly to select new added dependencies and allow driver to be compile tested. Signed-off-by: Sergio Paracuellos --- drivers/watchdog/Kconfig | 4 +- drivers/watchdog/mt7621_wdt.c | 121 ++++++++++++++++++++++------------ 2 files changed, 83 insertions(+), 42 deletions(-) diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index b64bc49c7..cf752ad64 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1865,7 +1865,9 @@ config GXP_WATCHDOG config MT7621_WDT tristate "Mediatek SoC watchdog" select WATCHDOG_CORE - depends on SOC_MT7620 || SOC_MT7621 + select REGMAP_MMIO + select MFD_SYSCON + depends on SOC_MT7620 || SOC_MT7621 || COMPILE_TEST help Hardware driver for the Mediatek/Ralink MT7621/8 SoC Watchdog Timer. diff --git a/drivers/watchdog/mt7621_wdt.c b/drivers/watchdog/mt7621_wdt.c index a8aa3522c..a7480fd2b 100644 --- a/drivers/watchdog/mt7621_wdt.c +++ b/drivers/watchdog/mt7621_wdt.c @@ -15,8 +15,8 @@ #include #include #include - -#include +#include +#include #define SYSC_RSTSTAT 0x38 #define WDT_RST_CAUSE BIT(1) @@ -31,8 +31,12 @@ #define TMR1CTL_RESTART BIT(9) #define TMR1CTL_PRESCALE_SHIFT 16 -static void __iomem *mt7621_wdt_base; -static struct reset_control *mt7621_wdt_reset; +struct mt7621_wdt_data { + void __iomem *base; + struct reset_control *rst; + struct regmap *sysc; + struct watchdog_device wdt; +}; static bool nowayout = WATCHDOG_NOWAYOUT; module_param(nowayout, bool, 0); @@ -40,27 +44,31 @@ MODULE_PARM_DESC(nowayout, "Watchdog cannot be stopped once started (default=" __MODULE_STRING(WATCHDOG_NOWAYOUT) ")"); -static inline void rt_wdt_w32(unsigned reg, u32 val) +static inline void rt_wdt_w32(void __iomem *base, unsigned reg, u32 val) { - iowrite32(val, mt7621_wdt_base + reg); + iowrite32(val, base + reg); } -static inline u32 rt_wdt_r32(unsigned reg) +static inline u32 rt_wdt_r32(void __iomem *base, unsigned reg) { - return ioread32(mt7621_wdt_base + reg); + return ioread32(base + reg); } static int mt7621_wdt_ping(struct watchdog_device *w) { - rt_wdt_w32(TIMER_REG_TMRSTAT, TMR1CTL_RESTART); + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + + rt_wdt_w32(drvdata->base, TIMER_REG_TMRSTAT, TMR1CTL_RESTART); return 0; } static int mt7621_wdt_set_timeout(struct watchdog_device *w, unsigned int t) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + w->timeout = t; - rt_wdt_w32(TIMER_REG_TMR1LOAD, t * 1000); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1LOAD, t * 1000); mt7621_wdt_ping(w); return 0; @@ -68,36 +76,41 @@ static int mt7621_wdt_set_timeout(struct watchdog_device *w, unsigned int t) static int mt7621_wdt_start(struct watchdog_device *w) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); u32 t; /* set the prescaler to 1ms == 1000us */ - rt_wdt_w32(TIMER_REG_TMR1CTL, 1000 << TMR1CTL_PRESCALE_SHIFT); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, 1000 << TMR1CTL_PRESCALE_SHIFT); mt7621_wdt_set_timeout(w, w->timeout); - t = rt_wdt_r32(TIMER_REG_TMR1CTL); + t = rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL); t |= TMR1CTL_ENABLE; - rt_wdt_w32(TIMER_REG_TMR1CTL, t); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, t); return 0; } static int mt7621_wdt_stop(struct watchdog_device *w) { + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); u32 t; mt7621_wdt_ping(w); - t = rt_wdt_r32(TIMER_REG_TMR1CTL); + t = rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL); t &= ~TMR1CTL_ENABLE; - rt_wdt_w32(TIMER_REG_TMR1CTL, t); + rt_wdt_w32(drvdata->base, TIMER_REG_TMR1CTL, t); return 0; } -static int mt7621_wdt_bootcause(void) +static int mt7621_wdt_bootcause(struct mt7621_wdt_data *d) { - if (rt_sysc_r32(SYSC_RSTSTAT) & WDT_RST_CAUSE) + u32 val; + + regmap_read(d->sysc, SYSC_RSTSTAT, &val); + if (val & WDT_RST_CAUSE) return WDIOF_CARDRESET; return 0; @@ -105,7 +118,9 @@ static int mt7621_wdt_bootcause(void) static int mt7621_wdt_is_running(struct watchdog_device *w) { - return !!(rt_wdt_r32(TIMER_REG_TMR1CTL) & TMR1CTL_ENABLE); + struct mt7621_wdt_data *drvdata = watchdog_get_drvdata(w); + + return !!(rt_wdt_r32(drvdata->base, TIMER_REG_TMR1CTL) & TMR1CTL_ENABLE); } static const struct watchdog_info mt7621_wdt_info = { @@ -121,30 +136,44 @@ static const struct watchdog_ops mt7621_wdt_ops = { .set_timeout = mt7621_wdt_set_timeout, }; -static struct watchdog_device mt7621_wdt_dev = { - .info = &mt7621_wdt_info, - .ops = &mt7621_wdt_ops, - .min_timeout = 1, - .max_timeout = 0xfffful / 1000, -}; - static int mt7621_wdt_probe(struct platform_device *pdev) { + struct device_node *np = pdev->dev.of_node; struct device *dev = &pdev->dev; - mt7621_wdt_base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(mt7621_wdt_base)) - return PTR_ERR(mt7621_wdt_base); + struct watchdog_device *mt7621_wdt; + struct mt7621_wdt_data *drvdata; + int err; + + drvdata = devm_kzalloc(dev, sizeof(*drvdata), GFP_KERNEL); + if (!drvdata) + return -ENOMEM; - mt7621_wdt_reset = devm_reset_control_get_exclusive(dev, NULL); - if (!IS_ERR(mt7621_wdt_reset)) - reset_control_deassert(mt7621_wdt_reset); + drvdata->sysc = syscon_regmap_lookup_by_phandle(np, "ralink,sysctl"); + if (IS_ERR(drvdata->sysc)) + return PTR_ERR(drvdata->sysc); - mt7621_wdt_dev.bootstatus = mt7621_wdt_bootcause(); + drvdata->base = devm_platform_ioremap_resource(pdev, 0); + if (IS_ERR(drvdata->base)) + return PTR_ERR(drvdata->base); - watchdog_init_timeout(&mt7621_wdt_dev, mt7621_wdt_dev.max_timeout, - dev); - watchdog_set_nowayout(&mt7621_wdt_dev, nowayout); - if (mt7621_wdt_is_running(&mt7621_wdt_dev)) { + drvdata->rst = devm_reset_control_get_exclusive(dev, NULL); + if (!IS_ERR(drvdata->rst)) + reset_control_deassert(drvdata->rst); + + mt7621_wdt = &drvdata->wdt; + mt7621_wdt->info = &mt7621_wdt_info; + mt7621_wdt->ops = &mt7621_wdt_ops; + mt7621_wdt->min_timeout = 1; + mt7621_wdt->max_timeout = 0xfffful / 1000; + mt7621_wdt->parent = dev; + + mt7621_wdt->bootstatus = mt7621_wdt_bootcause(drvdata); + + watchdog_init_timeout(mt7621_wdt, mt7621_wdt->max_timeout, dev); + watchdog_set_nowayout(mt7621_wdt, nowayout); + watchdog_set_drvdata(mt7621_wdt, drvdata); + + if (mt7621_wdt_is_running(mt7621_wdt)) { /* * Make sure to apply timeout from watchdog core, taking * the prescaler of this driver here into account (the @@ -154,17 +183,27 @@ static int mt7621_wdt_probe(struct platform_device *pdev) * we first disable the watchdog, set the new prescaler * and timeout, and then re-enable the watchdog. */ - mt7621_wdt_stop(&mt7621_wdt_dev); - mt7621_wdt_start(&mt7621_wdt_dev); - set_bit(WDOG_HW_RUNNING, &mt7621_wdt_dev.status); + mt7621_wdt_stop(mt7621_wdt); + mt7621_wdt_start(mt7621_wdt); + set_bit(WDOG_HW_RUNNING, &mt7621_wdt->status); } - return devm_watchdog_register_device(dev, &mt7621_wdt_dev); + err = devm_watchdog_register_device(dev, &drvdata->wdt); + if (err) { + dev_err(dev, "Error registering watchdog device\n"); + return err; + } + + platform_set_drvdata(pdev, drvdata); + + return 0; } static void mt7621_wdt_shutdown(struct platform_device *pdev) { - mt7621_wdt_stop(&mt7621_wdt_dev); + struct mt7621_wdt_data *drvdata = platform_get_drvdata(pdev); + + mt7621_wdt_stop(&drvdata->wdt); } static const struct of_device_id mt7621_wdt_match[] = {