[PATCH] Revert "nfc: nxp-nci: remove interrupt trigger type"

Bartosz Golaszewski <[email protected]> Mon, 11 May 2026 10:26:11 +0200
Newsgroups dev.linux.lists.oe-linux-nfc,org.kernel.vger.linux-kernel,org.kernel.vger.stable
Message-ID <[email protected]>
This commit causes an infinite interrupt storm on Lenovo T14s (at least
the AMD Ryzen 7 variant) which requires blacklisting of this driver.
Neither firmware updates nor the proposed solution[1] seem to help. This
reverts the change due to an unfixed regression. The problem is present
since v6.19.6 stable kernel.

[1] https://lore.kernel.org/all/20260311-nfc-nxp-nci-i2c-restore-irq-trigger-fallback-v1-1-9e20714411d7@amd.com/

Cc: [email protected] # v6.19, v7.0
Fixes: 941270962861 ("nfc: nxp-nci: remove interrupt trigger type")
Signed-off-by: Bartosz Golaszewski <[email protected]>
---
 drivers/nfc/nxp-nci/i2c.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/nfc/nxp-nci/i2c.c b/drivers/nfc/nxp-nci/i2c.c
index b3d34433bd14..e99e1f381028 100644
--- a/drivers/nfc/nxp-nci/i2c.c
+++ b/drivers/nfc/nxp-nci/i2c.c
@@ -305,7 +305,7 @@ static int nxp_nci_i2c_probe(struct i2c_client *client)
 
 	r = request_threaded_irq(client->irq, NULL,
 				 nxp_nci_i2c_irq_thread_fn,
-				 IRQF_ONESHOT,
+				 IRQF_TRIGGER_RISING | IRQF_ONESHOT,
 				 NXP_NCI_I2C_DRIVER_NAME, phy);
 	if (r < 0)
 		nfc_err(&client->dev, "Unable to register IRQ handler\n");
-- 
2.47.3