From 36898e18225af4494d20814ddc19b656f5dd8918 Mon Sep 17 00:00:00 2001 From: W4HO <87742609+W4HO-ham@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:34:05 -0647 Subject: [PATCH 1/2] dt-bindings: net: nfc: nxp,nci: Add the ST ST54L The ST54L in the Google Pixel 9a speaks plain NCI over I2C with an enable line and an interrupt, the transport the nxp-nci driver implements, rather than the NDLC framing of ST's ST21NFCB family (st,st21nfcb-i2c), whose initialisation timed out on it. Add it as a compatible with nxp,nxp-nci-i2c as the fallback. Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com> --- Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml b/Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml index 4f3847f649..fbf2b14f69 100644 --- a/Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml +++ b/Documentation/devicetree/bindings/net/nfc/nxp,nci.yaml @@ -6,6 +6,10 @@ $schema: http://devicetree.org/meta-schemas/core.yaml# title: NXP Semiconductors NCI NFC controller +description: + NFC controllers that speak plain NCI over I2C, with an enable line and an + interrupt. Besides NXP's, ST's ST54L uses the same transport. + maintainers: - Krzysztof Kozlowski @@ -19,6 +23,7 @@ properties: - nxp,pn547 - nxp,pn553 - nxp,pn557 + - st,st54l - const: nxp,nxp-nci-i2c enable-gpios: From 1b8fd3ee92aa4fe490c674d9149c9417c00be4e2 Mon Sep 17 00:00:00 2001 From: W4HO <87742609+W4HO-ham@users.noreply.github.com> Date: Tue, 27 Oct 2026 16:34:05 -0647 Subject: [PATCH 2/2] nfc: nxp-nci: Send the ST54L its configuration after init The ST54L answers NCI on nxp-nci's transport and polls, but never reports a target: in 25 s of discovery with a contactless card held on the Pixel 9a, no RF_INTF_ACTIVATED_NTF came. ST's HAL sends a CORE_SET_CONFIG after CORE_INIT (proprietary parameters 0xa1, 0xa2 and 0x80, and TOTAL_DURATION 500 ms, as the 9a's own HAL configuration sets them). Send the same from post_setup when the device is st,st54l. Tested on the Pixel 9a (7.3.0-rc6-omamobile-tegu-s2mpg15-m1, with the same command behind a module parameter in a debug build): the set-config answers status 0, and the held card activates (ISO-DEP over NFC-A, 15 activations in 45 s) and neard lists it as a tag. Signed-off-by: W4HO <87742609+W4HO-ham@users.noreply.github.com> --- drivers/nfc/nxp-nci/core.c | 27 +++++++++++++++++++++++++++ drivers/nfc/nxp-nci/nxp-nci.h | 3 +++ 2 files changed, 30 insertions(+) diff --git a/drivers/nfc/nxp-nci/core.c b/drivers/nfc/nxp-nci/core.c index 386dcd4ff7..72f22eba50 100644 --- a/drivers/nfc/nxp-nci/core.c +++ b/drivers/nfc/nxp-nci/core.c @@ -13,6 +13,7 @@ #include #include #include +#include #include @@ -123,11 +124,36 @@ static const struct nci_driver_ops nxp_nci_core_ops[] = { }, }; +/* + * The ST54L speaks the same plain NCI over I2C, but finds no card until it + * gets the configuration ST's HAL sends after init: its proprietary 0xa1 + * (0x1e), 0xa2 (0x19) and 0x80 (0x01), and TOTAL_DURATION 500 ms. Without + * it the controller polls and never reports a target. + */ +static int nxp_nci_post_setup(struct nci_dev *ndev) +{ + static const u8 st54l_conf[] = { + 0x04, /* number of parameters */ + 0xa1, 0x01, 0x1e, + 0xa2, 0x01, 0x19, + 0x80, 0x01, 0x01, + 0x00, 0x02, 0xf4, 0x01, /* TOTAL_DURATION: 500 ms */ + }; + struct nxp_nci_info *info = nci_get_drvdata(ndev); + + if (!info->st54l) + return 0; + + return nci_core_cmd(ndev, NCI_OP_CORE_SET_CONFIG_CMD, + sizeof(st54l_conf), st54l_conf); +} + static const struct nci_ops nxp_nci_ops = { .open = nxp_nci_open, .close = nxp_nci_close, .send = nxp_nci_send, .fw_download = nxp_nci_fw_download, + .post_setup = nxp_nci_post_setup, .core_ops = nxp_nci_core_ops, .n_core_ops = ARRAY_SIZE(nxp_nci_core_ops), }; @@ -148,6 +174,7 @@ int nxp_nci_probe(void *phy_id, struct device *pdev, info->pdev = pdev; info->phy_ops = phy_ops; info->max_payload = max_payload; + info->st54l = device_is_compatible(pdev, "st,st54l"); INIT_WORK(&info->fw_info.work, nxp_nci_fw_work); init_completion(&info->fw_info.cmd_completion); mutex_init(&info->info_lock); diff --git a/drivers/nfc/nxp-nci/nxp-nci.h b/drivers/nfc/nxp-nci/nxp-nci.h index ae3fb2735a..68b0f53d6f 100644 --- a/drivers/nfc/nxp-nci/nxp-nci.h +++ b/drivers/nfc/nxp-nci/nxp-nci.h @@ -62,6 +62,9 @@ struct nxp_nci_info { struct mutex info_lock; struct nxp_nci_fw_info fw_info; + + /* an ST ST54L: needs its configuration after init */ + bool st54l; }; int nxp_nci_fw_download(struct nci_dev *ndev, const char *firmware_name);