From nobody Tue Oct 7 18:26:07 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 D947717A2E3; Mon, 7 Jul 2025 18:00:24 +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=1751911226; cv=none; b=hWptrk7G90LqsJbffN0T7/eF7iFUe+waFARYi4jWRmI7wajSP/sTcEfCq6GPj1o7XgULdAwMSep7s3AKnjk4GRVRSlNNCuSNc0u5kdkaXFmBQEwrcI5Zu8B7LpUWtl3H6LzWlOLV8K6elKBzryplzECe/fvqg+KqAWco5m/FGoo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751911226; c=relaxed/simple; bh=0RZSxgaRH6ptwJRNYfINYVrQgkykInNIGuqXOsjInU4=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=UXPfAGQhJrfpq5YAXlKvIn/B0+VaAGmxndfD4t5JV6y4oyrDqj9QEJWx+apNzFmE1XKkhJCho19jBkfzKLnF+oLy75KwKgnltTV1W/VJrsAj/pohzYuSsj3spB9MCkNsArwf8kKiTBEtqGAz6jT0GBFV3CJ+z2kuIodYz2CbsEQ= 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=XTCgqTIt; 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="XTCgqTIt" Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 567I044V284451; Mon, 7 Jul 2025 13:00:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751911204; bh=vk6uXfUch8/WvTlVfXXqhMpCGzMmlK9vi+JQlL/veso=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=XTCgqTItBvV5EFuKUk11y0qy73NtL4amwbTq/eBCIA9PBq5r7K9kpvireUXL+mT/C +Y9aByX5F39aK86Bv0OToM5Mvd35rFovE1AT6RqUUjuspon+D9c45mrbaPFWYQ/gAR WBeMpvXe0SOqk/ai+hypxZgyzoEVwRUOsZHXSPYc= Received: from DFLE115.ent.ti.com (dfle115.ent.ti.com [10.64.6.36]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 567I0287664632 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Mon, 7 Jul 2025 13:00:04 -0500 Received: from DFLE112.ent.ti.com (10.64.6.33) by DFLE115.ent.ti.com (10.64.6.36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Mon, 7 Jul 2025 13:00:02 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DFLE112.ent.ti.com (10.64.6.33) 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; Mon, 7 Jul 2025 13:00:02 -0500 Received: from judy-hp.dhcp.ti.com (judy-hp.dhcp.ti.com [128.247.81.105]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 567I02QM345700; Mon, 7 Jul 2025 13:00:02 -0500 From: Judith Mendez To: Judith Mendez , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Vignesh Raghavendra , Tero Kristo , , , , Andrew Davis Subject: [PATCH v3 1/2] dt-bindings: watchdog: ti,rti-wdt: Add ti,am62l-rti-wdt compatible Date: Mon, 7 Jul 2025 13:00:01 -0500 Message-ID: <20250707180002.3918865-2-jm@ti.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250707180002.3918865-1-jm@ti.com> References: <20250707180002.3918865-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 --- 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 Tue Oct 7 18:26:07 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 2B463170826; Mon, 7 Jul 2025 18:00:23 +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=1751911225; cv=none; b=E3h/Trgp8zTatZlCz0xmeWcRtIyeEDvqrXPjVaZpzHcoDzUkYPTNpGmdQG1bHHw0pdLTKQyUbQDUQEeCNof6ZSzdXK0Zq8NpKTNJXvkAFnmOjlYIgtXJGJPNwvFWBfcThFqt0jQwmeet06PXH4lCdxux4OlnnwQG2HN/UE+j3jI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751911225; c=relaxed/simple; bh=hGtJ1R7HLtE8p08O+9gD/uPYwFRTpks+W/+pvkhHCkI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VeyleAh4H4yuned6G9GUF4yXdwjAkGeJHYcGYoory9E/s6KgXiruc1WUFWx27rR1ZW8R6gevgjk1oSjipSkMLQndt5g99ryrYzxJUYyuVg9ItIlZDJykYh/epWVd4qlovcn7Fde4eB45ld0o7iJIUgdZWXhkbl8AUuSQetDYn+A= 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=M8NwVFoD; 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="M8NwVFoD" Received: from fllvem-sh04.itg.ti.com ([10.64.41.54]) by lelvem-ot01.ext.ti.com (8.15.2/8.15.2) with ESMTP id 567I04VD284455; Mon, 7 Jul 2025 13:00:04 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ti.com; s=ti-com-17Q1; t=1751911204; bh=k+/xOJl1eIR6B1liVsGidKI00SXYIx6BSAs3amVSspo=; h=From:To:CC:Subject:Date:In-Reply-To:References; b=M8NwVFoDUoviGytEp/2NAyruyiX18W6murp6TUDLw5cCM3uGrOis+L87KcihRY5Qr xyoCYPPL+ir+Zw1MMaML/0xLCJVT9Pui7Dsl71V7O0I2gnz4bFrRdCB1ip6lCwVfIB rPLBA1QRkTsVSJzQcaEGis41G9Y0NrbSJ4mXDDMM= Received: from DLEE114.ent.ti.com (dlee114.ent.ti.com [157.170.170.25]) by fllvem-sh04.itg.ti.com (8.18.1/8.18.1) with ESMTPS id 567I03qS664693 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA256 bits=128 verify=FAIL); Mon, 7 Jul 2025 13:00:04 -0500 Received: from DLEE107.ent.ti.com (157.170.170.37) by DLEE114.ent.ti.com (157.170.170.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.2507.55; Mon, 7 Jul 2025 13:00:02 -0500 Received: from lelvem-mr06.itg.ti.com (10.180.75.8) by DLEE107.ent.ti.com (157.170.170.37) 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; Mon, 7 Jul 2025 13:00:02 -0500 Received: from judy-hp.dhcp.ti.com (judy-hp.dhcp.ti.com [128.247.81.105]) by lelvem-mr06.itg.ti.com (8.18.1/8.18.1) with ESMTP id 567I02QN345700; Mon, 7 Jul 2025 13:00:02 -0500 From: Judith Mendez To: Judith Mendez , Wim Van Sebroeck , Guenter Roeck , Rob Herring , Krzysztof Kozlowski , Conor Dooley CC: Vignesh Raghavendra , Tero Kristo , , , , Andrew Davis Subject: [PATCH v3 2/2] watchdog: rti_wdt: Add reaction control Date: Mon, 7 Jul 2025 13:00:02 -0500 Message-ID: <20250707180002.3918865-3-jm@ti.com> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250707180002.3918865-1-jm@ti.com> References: <20250707180002.3918865-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 --- drivers/watchdog/rti_wdt.c | 32 ++++++++++++++++++++++++++++---- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/drivers/watchdog/rti_wdt.c b/drivers/watchdog/rti_wdt.c index d1f9ce4100a8..c9ee443c70af 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,13 @@ 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); + /* Reset device if wdt serviced outside of window or generate NMI if avai= lable */ + if (wdt->data->reset) + reaction =3D RTIWWDRXN_RST; + else + reaction =3D RTIWWDRXN_NMI; + + 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 +268,8 @@ static int rti_wdt_probe(struct platform_device *pdev) wdd->timeout =3D DEFAULT_HEARTBEAT; wdd->parent =3D dev; =20 + wdt->data =3D device_get_match_data(dev); + watchdog_set_drvdata(wdd, wdt); watchdog_set_nowayout(wdd, 1); watchdog_set_restart_priority(wdd, 128); @@ -369,8 +384,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