From nobody Wed Oct 8 17:34:34 2025 Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) (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 3F98B267AF2; Wed, 25 Jun 2025 14:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.234 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750862037; cv=none; b=MWA+tmJMCkThgA50FjNNalaFeFczNxEvLgYTqGJxHTW/FQkg1y6gZFW8tSnPQYfLQlVpRzo7bQpN6eeVueo362s/VjaHUJWrXGJ3RkSeks6EXGjqMH6LZiRl11wNoS2QXFuT3jMC8BTsbWb1+tRdfYbzJ6t/RFBLU3cR1aKY7ps= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750862037; c=relaxed/simple; bh=oeQkMIMFB6iyZBNWgp/vkC7G3MTX0luROzLbuvlcPVM=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=vERZjz7QfkstrtgFjccLz7SGO53VjMu5eWXZ6VkURIrVfxgjcnBNLoBIBqDN6lkAPozAQR5D6o40FspiU5gH7lmJ6cBdo4t9M9ZZkE/+SM2EXVYyLxImN9nMIweF86HR6u/a9UqxOxAaPmeN/VyEQfNERtzW6etoa0dC2ako9As= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=PSkuugfO; arc=none smtp.client-ip=198.47.23.234 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="PSkuugfO" Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55PEXdmh1479921; Wed, 25 Jun 2025 09:33:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1750862019; bh=QqPH4JN1NbqC6SS3Vqqj5iNOfWfX5mEGpHGRkw4vSh4=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=PSkuugfOntx9eXfYydKq5SN+jUA+SHsk8BB8DZ780JEiATUHqVlRgtyX+tDc4LDI+ ssZnEXXkk6uNDoNfLzam96ZmjUux/opncPQe2QtUB7t2o8knrNZGyBouMfdf3P+EpH Mt/zPqvfqTjDfq+Hi0+ZNLPJs0XFFQwj4ZqeEHLk= Received: from DFLE114.ent.ti.com (dfle114.ent.ti.com [10.64.6.35]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55PEXdPl1077387 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Wed, 25 Jun 2025 09:33:39 -0500 Received: from DFLE110.ent.ti.com (10.64.6.31) by DFLE114.ent.ti.com (10.64.6.35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Wed, 25 Jun 2025 09:33:39 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DFLE110.ent.ti.com (10.64.6.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Wed, 25 Jun 2025 09:33:39 -0500 Received: from judy-hp.dhcp.ti.com (judy-hp.dhcp.ti.com [128.247.81.105]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55PEXco23804070; Wed, 25 Jun 2025 09:33:38 -0500 From: Judith Mendez To: Judith Mendez , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Vignesh Raghavendra , Tero Kristo , , , Subject: [PATCH v2 1/2] dt-bindings: watchdog: ti,rti-wdt: Add ti,am62l-rti-wdt compatible Date: Wed, 25 Jun 2025 09:33:37 -0500 Message-ID: <20250625143338.2381726-2-jm@ti.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625143338.2381726-1-jm@ti.com> References: <20250625143338.2381726-1-jm@ti.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 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea Content-Type: text/plain; charset="utf-8" Add a new compatible ti,am62l-rti-wdt for am62l SoC [0]. [0] https://www.ti.com/product/AM62L Signed-off-by: Judith Mendez Acked-by: Krzysztof Kozlowski --- Changes since v1-resend: - Binding: order compatible alphabetically --- Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml b/D= ocumentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml index 62ddc284a524..2966e5bfb6c0 100644 --- a/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml +++ b/Documentation/devicetree/bindings/watchdog/ti,rti-wdt.yaml @@ -23,6 +23,7 @@ allOf: properties: compatible: enum: + - ti,am62l-rti-wdt - ti,j7-rti-wdt =20 reg: --=20 2.49.0 From nobody Wed Oct 8 17:34:34 2025 Received: from lelvem-ot01.ext.ti.com (lelvem-ot01.ext.ti.com [198.47.23.234]) (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 A2EBA2686A0; Wed, 25 Jun 2025 14:33:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.47.23.234 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750862038; cv=none; b=nBFUOtFJSSh4ZUu6g1hD75siOvyX+eqCPQZSBaEwGQeewLJOH4+Ng0ihE7CKZCU/13o2bc2GPtg5bBcNO68AuR+LeB3DREr/Gzh9AydgeRyIXAutHdjvY2fkG8h9uauGslGmhcXUa/6HScYtrxYmJl0b7ylfJphKr3p00W3BGnA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750862038; c=relaxed/simple; bh=kQ7HcopwAvd+1DfEiqpINyGl6QY1J0L14xhjyAXrLrA=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=u5KzzLZAZq4oMifQWWcqQPAS6SA8xm4DE3hnGc/2W/h9RXvJtcqO711+3HXZxRpeMGcHTz6xYvmpaKtNtW4siG9T90YTHmIM6rwhS9UU6ABSmAxQCaSIV+nQrlr0IlVE1zucm7o2fBuHH/J+2fzfr80Owbi+8QxvxYCYZzfbLpo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com; spf=pass smtp.mailfrom=ti.com; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b=TeQIkKdQ; arc=none smtp.client-ip=198.47.23.234 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=ti.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=ti.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=ti.com header.i=@ti.com header.b="TeQIkKdQ" Received: from fllvem-sh03.itg.ti.com ([10.64.41.86]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 55PEXdKG1479925; Wed, 25 Jun 2025 09:33:39 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1750862019; bh=qnpxRjv/UYQnJpJGafGpdC2NiDlk6JmsWkDSwjy9X9Y=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=TeQIkKdQaOr6epG/hRCorGEbCFILPdUOIH+DyraPk1us/qjlmhZjoQh9c27ZqwzcK 8grCAM6C6k0iNJ5mu74585jzoiSKvKeXytny8DPjmJ5g2l4CyziWwvWe/x+xus/6aQ AmPwQUK4gksX42lOFwnybL8nJsvoqUUzBHvD3twA= Received: from DLEE108.ent.ti.com (dlee108.ent.ti.com [157.170.170.38]) by fllvem-sh03.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 55PEXd9e1077390 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Wed, 25 Jun 2025 09:33:39 -0500 Received: from DLEE104.ent.ti.com (157.170.170.34) by DLEE108.ent.ti.com (157.170.170.38) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Wed, 25 Jun 2025 09:33:38 -0500 Received: from lelvem-mr05.itg.ti.com (10.180.75.9) by DLEE104.ent.ti.com (157.170.170.34) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55 via Frontend Transport; Wed, 25 Jun 2025 09:33:38 -0500 Received: from judy-hp.dhcp.ti.com (judy-hp.dhcp.ti.com [128.247.81.105]) by lelvem-mr05.itg.ti.com (8.18.1/8.18.1) with ESMTP id 55PEXco33804070; Wed, 25 Jun 2025 09:33:39 -0500 From: Judith Mendez To: Judith Mendez , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Vignesh Raghavendra , Tero Kristo , , , Subject: [PATCH v2 2/2] watchdog: rti_wdt: Add reaction control Date: Wed, 25 Jun 2025 09:33:38 -0500 Message-ID: <20250625143338.2381726-3-jm@ti.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250625143338.2381726-1-jm@ti.com> References: <20250625143338.2381726-1-jm@ti.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 X-C2ProcessedOrg: 333ef613-75bf-4e12-a4b1-8e3623f5dcea Content-Type: text/plain; charset="utf-8" This allows to configure reaction between NMI and reset for WWD. On K3 SoC's other than AM62L SoC [0], watchdog reset output is routed to the ESM module which can subsequently route the signal to safety master or SoC reset. On AM62L, the watchdog reset output is routed to the SoC HW reset block. So, add a new compatible for AM62l to add SoC data and configure reaction to reset instead of NMI. [0] https://www.ti.com/product/AM62L Signed-off-by: Judith Mendez --- Changes since v1-resend: - no change --- drivers/watchdog/rti_wdt.c | 31 +++++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index d1f9ce4100a8..d419884c86c4 100644 --- a/drivers/watchdog/rti_wdt.c +++ b/drivers/watchdog/rti_wdt.c @@ -35,7 +35,8 @@ #define RTIWWDRXCTRL 0xa4 #define RTIWWDSIZECTRL 0xa8 =20 -#define RTIWWDRX_NMI 0xa +#define RTIWWDRXN_RST 0x5 +#define RTIWWDRXN_NMI 0xa =20 #define RTIWWDSIZE_50P 0x50 #define RTIWWDSIZE_25P 0x500 @@ -63,22 +64,29 @@ =20 static int heartbeat; =20 +struct rti_wdt_data { + bool reset; +}; + /* * struct to hold data for each WDT device * @base - base io address of WD device * @freq - source clock frequency of WDT * @wdd - hold watchdog device as is in WDT core + * @data - hold configuration data */ struct rti_wdt_device { void __iomem *base; unsigned long freq; struct watchdog_device wdd; + const struct rti_wdt_data *data; }; =20 static int rti_wdt_start(struct watchdog_device *wdd) { u32 timer_margin; struct rti_wdt_device *wdt =3D watchdog_get_drvdata(wdd); + u8 reaction; int ret; =20 ret =3D pm_runtime_resume_and_get(wdd->parent); @@ -101,8 +109,12 @@ static int rti_wdt_start(struct watchdog_device *wdd) */ wdd->min_hw_heartbeat_ms =3D 520 * wdd->timeout + MAX_HW_ERROR; =20 - /* Generate NMI when wdt expires */ - writel_relaxed(RTIWWDRX_NMI, wdt->base + RTIWWDRXCTRL); + /* Generate reset or NMI when timer expires/serviced outside of window */ + reaction =3D RTIWWDRXN_NMI; + if (wdt->data->reset) + reaction =3D RTIWWDRXN_RST; + + writel_relaxed(reaction, wdt->base + RTIWWDRXCTRL); =20 /* Open window size 50%; this is the largest window size available */ writel_relaxed(RTIWWDSIZE_50P, wdt->base + RTIWWDSIZECTRL); @@ -255,6 +267,8 @@ static int rti_wdt_probe(struct platform_device *pdev) wdd->timeout =3D DEFAULT_HEARTBEAT; wdd->parent =3D dev; =20 + wdt->data =3D of_device_get_match_data(dev); + watchdog_set_drvdata(wdd, wdt); watchdog_set_nowayout(wdd, 1); watchdog_set_restart_priority(wdd, 128); @@ -369,8 +383,17 @@ static void rti_wdt_remove(struct platform_device *pde= v) pm_runtime_disable(&pdev->dev); } =20 +static struct rti_wdt_data j7_wdt =3D { + .reset =3D false, +}; + +static struct rti_wdt_data am62l_wdt =3D { + .reset =3D true, +}; + static const struct of_device_id rti_wdt_of_match[] =3D { - { .compatible =3D "ti,j7-rti-wdt", }, + { .compatible =3D "ti,j7-rti-wdt", .data =3D &j7_wdt }, + { .compatible =3D "ti,am62l-rti-wdt", .data =3D &am62l_wdt }, {}, }; MODULE_DEVICE_TABLE(of, rti_wdt_of_match); --=20 2.49.0