From fadc27ae9925f6e6f15fb64a0adf948411929a6f Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 06:58:24 +0200 Subject: [PATCH 1/5] arm64: dts: exynos: google: zuma-husky: add the ST54L NFC controller, disabled An nfc@8 child of hsi2c_0 (the haptics' bus), status "disabled", so a normal boot is unchanged. The ST54L speaks plain NCI over I2C, so it takes the same compatible as the 9a and the zumapro-tegu node: st,st54l with nxp,nxp-nci-i2c as the fallback, for the nxp-nci driver. Pins are from the stock device tree: interrupt gpa7-6, enable (the chip's RST_N) gph1-6, power-idle gph1-3, with stock's two pin groups (power-down state only, no pin function). The enable line is the same pin the zumapro-tegu node uses. The stock node also has a PMU clock pad (CLKOUT1) as the reference clock. This commit has no clocks property, so the pad stays as the bootloader leaves it. The power-idle line has no nxp-nci property; only its pin group is kept. The eSE half of the chip is not described. I tried it on my Pixel 8 Pro: a test kernel (7.3-rc6, ...-ge98a7a38a3ef) with the node switched on by an overlay, and the pad clock from the follow-up patches either present or left out. nxp-nci binds the ST54L and registers nfc0 either way. Without the clock the NCI power-on works (the chip answers), but a sticker tag held at the phone was not found in one 25 s run. With the clock a bus card (ISO-DEP, no NDEF data on it) and the sticker tag (Type 2, one NDEF record) were both found, and neard published both as tags. The no-clock result is a single run, and I cannot read the PMU pad register from userspace, so I do not know whether the bootloader leaves the pad partly set up. The clock is in the follow-up patches. Not tested: the eSE, or s2idle with the driver bound. Signed-off-by: Lef --- .../boot/dts/exynos/google/zuma-husky.dts | 36 +++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts index 6ed1514cba..f2b68fdaa0 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts +++ b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts @@ -398,6 +398,20 @@ */ &pinctrl_hsi1 { status = "okay"; + + nfc_en: nfc-en-pins { + samsung,pins = "gph1-6"; + samsung,pin-pud = ; + samsung,pin-con-pdn = ; + samsung,pin-pud-pdn = ; + }; + + nfc_pidle: nfc-pidle-pins { + samsung,pins = "gph1-3"; + samsung,pin-pud = ; + samsung,pin-con-pdn = ; + samsung,pin-pud-pdn = ; + }; }; &usi0 { @@ -421,6 +435,28 @@ cirrus,lra-redc-micro-ohms = <13000000>; cirrus,vpbr-threshold-microvolt = <3008000>; }; + + /* + * The ST54L NFC controller at 0x08 on this bus: plain NCI over I2C, + * nxp-nci's transport, as on the 9a and the zumapro-tegu node. Pins + * from the stock DT: interrupt gpa7-6, enable (the chip's RST_N) + * gph1-6, power-idle gph1-3. The pin groups are stock's and set only + * the power-down state (and the power-idle pull-down), no pin + * function. The chip's reference clock (stock: PMU pad CLKOUT1) has no + * provider on zuma yet, so there is no clocks property and the pad + * stays as the bootloader left it. The eSE half of the chip (spi_12, + * reset gph1-5) is not described. Disabled: nothing binds to it until + * a bring-up overlay enables it. + */ + nfc: nfc@8 { + compatible = "st,st54l", "nxp,nxp-nci-i2c"; + reg = <0x08>; + interrupts-extended = <&gpa7 6 IRQ_TYPE_LEVEL_HIGH>; + enable-gpios = <&gph1 6 GPIO_ACTIVE_HIGH>; + pinctrl-0 = <&nfc_en &nfc_pidle>; + pinctrl-names = "default"; + status = "disabled"; + }; }; /* From 56ca346e1a12b773937c06d6eb6aa3270bc5e73c Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 07:04:51 +0200 Subject: [PATCH 2/5] dt-bindings: soc: samsung: exynos-pmu: NFC pad clock on Tensor G3 The Tensor G3 PMU (google,zuma-pmu) gets the same clock 0, the NFC controller's reference clock pad, that the Tensor G4 PMU has. Only the description of #clock-cells changes. Signed-off-by: Lef --- .../devicetree/bindings/soc/samsung/exynos-pmu.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml b/Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml index 9cec4a1375..63dd322735 100644 --- a/Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml +++ b/Documentation/devicetree/bindings/soc/samsung/exynos-pmu.yaml @@ -64,9 +64,9 @@ properties: '#clock-cells': const: 1 description: - On the Exynos SoCs, one clock per CLKOUT mux input. On the Tensor G4 - PMU (google,zumapro-pmu), clock 0 is the NFC controller's reference - clock pad. + On the Exynos SoCs, one clock per CLKOUT mux input. On the Tensor G3 + and G4 PMUs (google,zuma-pmu, google,zumapro-pmu), clock 0 is the NFC + controller's reference clock pad. clock-names: description: From 2c3d99ebdb065e777086e73426dcda45742aceff Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 15:58:14 +0200 Subject: [PATCH 3/5] soc: samsung: exynos-pmu: say the NFC pad register is Tensor G3's too The comment above the NFC clock pad register in the zuma PMU table says it is Tensor G4's. Stock's pmu_clk_pad is 0x3e84 on the Pixel 8 Pro too, so name both. Comment only, no change in the code. Signed-off-by: Lef --- drivers/soc/samsung/gs101-pmu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/soc/samsung/gs101-pmu.c b/drivers/soc/samsung/gs101-pmu.c index 9ee77754d0..a587089ad2 100644 --- a/drivers/soc/samsung/gs101-pmu.c +++ b/drivers/soc/samsung/gs101-pmu.c @@ -361,7 +361,7 @@ static const struct regmap_range zuma_pmu_registers[] = { regmap_reg_range(ZUMA_PHY_CTRL_UFS, ZUMA_PHY_CTRL_UFS), /* a hint TF-A reads, not a status register: see zuma_pmu_regmap_init() */ regmap_reg_range(ZUMA_PMU_INFORM0, ZUMA_PMU_INFORM0), - /* Tensor G4's NFC reference clock pad, a clock of clk-exynos-clkout */ + /* Tensor G3 and G4's NFC reference clock pad (clk-exynos-clkout) */ regmap_reg_range(ZUMA_PAD_CTRL_NFC_CLK, ZUMA_PAD_CTRL_NFC_CLK), }; From 2b3872ef33102463b2bf47d92c69d1e3440fbb9d Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 15:58:15 +0200 Subject: [PATCH 4/5] clk: samsung: exynos-clkout: add the NFC clock pad on Tensor G3 Tensor G3 (zuma) feeds the NFC controller's reference clock from the same PMU register as Tensor G4: stock's pmu_clk_pad is 0x3e84 on the Pixel 8 Pro too, and the zuma PMU's regmap already allows that register. Match google,zuma-pmu with the zumapro pad descriptor. The provider writes the register only when a consumer enables the clock. Tested on my Pixel 8 Pro: a test kernel (7.3-rc6, ...-ge98a7a38a3ef) with the NFC node switched on by an overlay. With the clock, the pad is held on while nxp-nci is bound (pmu-clkout0 enable count 1), and a bus card and a sticker tag were both found. A control boot with the same tag, the same spot and no clocks property on the node had enable count 0: the NCI power-on still worked, but no tag was found in a 25 s run. That no-clock result is a single run. I cannot read the pad register from userspace, so I do not know whether the bootloader leaves it partly set up. Not tested: s2idle with the driver bound. Signed-off-by: Lef --- drivers/clk/samsung/clk-exynos-clkout.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/clk/samsung/clk-exynos-clkout.c b/drivers/clk/samsung/clk-exynos-clkout.c index cd3d09151a..94548afcc3 100644 --- a/drivers/clk/samsung/clk-exynos-clkout.c +++ b/drivers/clk/samsung/clk-exynos-clkout.c @@ -41,12 +41,13 @@ #define GS101_CLKOUT_EN BIT(0) /* - * Tensor G4 (zumapro) feeds the NFC controller's reference clock from a PMU - * pad as well. With EXTPAD_EN set the PMU follows the controller's clock - * request line and drives the clock onto the pad, which is how Google's - * st21nfc driver runs it (pmu_clk_pad = <0x3e84>, st,extpad_control_en); - * without it the Pixel 9a's ST54L does not ACK its I2C address. Nothing - * else about this register is known, so its source field is left alone. + * Tensor G3 (zuma) and G4 (zumapro) feed the NFC controller's reference + * clock from a PMU pad as well. With EXTPAD_EN set the PMU follows the + * controller's clock request line and drives the clock onto the pad, which + * is how Google's st21nfc driver runs it (pmu_clk_pad = <0x3e84>, + * st,extpad_control_en); without it the Pixel 9a's ST54L does not ACK its + * I2C address. Nothing else about this register is known, so its source + * field is left alone. */ #define ZUMAPRO_PAD_CTRL_NFC_CLK 0x3e84 #define ZUMAPRO_CLKOUT_EXTPAD_EN BIT(16) @@ -163,6 +164,9 @@ static const struct of_device_id exynos_clkout_ids[] = { }, { .compatible = "google,gs201-pmu", .data = &exynos_clkout_gs101, + }, { + .compatible = "google,zuma-pmu", + .data = &exynos_clkout_zumapro, }, { .compatible = "google,zumapro-pmu", .data = &exynos_clkout_zumapro, @@ -264,7 +268,7 @@ static const struct clk_ops exynos_clkout_pad_ops = { }; /* - * GS101/GS201 and Tensor G4: one gate per pad, parented to mux input 0 (the + * GS101/GS201 and Tensor G3/G4: one gate per pad, parented to mux input 0 (the * TCXO, named "clkout0" in the PMU node) where the PMU node names it; a pad * whose source the node does not describe is a root clock. The pads may be * in use by devices that Linux does not describe, so leave them as the From e9c3fa348c8a18c0daaa645de7449ae9527c5c1a Mon Sep 17 00:00:00 2001 From: Lef Date: Sat, 7 Nov 2026 07:04:51 +0200 Subject: [PATCH 5/5] arm64: dts: exynos: google: zuma: give the NFC controller its clock pad Give the zuma PMU node its #clock-cells, and the Pixel 8 Pro's ST54L node clock 0, the PMU's NFC pad (stock: pmu_clk_pad 0x3e84), as on the zumapro-tegu node. The node stays disabled. The #clock-cells are in zuma.dtsi, so the clkout driver also binds on the Pixel 8a (zuma-akita). It writes nothing there: the 8a has no NFC node, so nothing enables the pad clock. Signed-off-by: Lef --- arch/arm64/boot/dts/exynos/google/zuma-husky.dts | 12 +++++++----- arch/arm64/boot/dts/exynos/google/zuma.dtsi | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts index f2b68fdaa0..d4c8467cb3 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma-husky.dts +++ b/arch/arm64/boot/dts/exynos/google/zuma-husky.dts @@ -442,15 +442,17 @@ * from the stock DT: interrupt gpa7-6, enable (the chip's RST_N) * gph1-6, power-idle gph1-3. The pin groups are stock's and set only * the power-down state (and the power-idle pull-down), no pin - * function. The chip's reference clock (stock: PMU pad CLKOUT1) has no - * provider on zuma yet, so there is no clocks property and the pad - * stays as the bootloader left it. The eSE half of the chip (spi_12, - * reset gph1-5) is not described. Disabled: nothing binds to it until - * a bring-up overlay enables it. + * function. The chip's reference clock is the PMU's NFC pad (stock: + * pmu_clk_pad 0x3e84), clock 0 of the PMU node; without it the 9a's + * ST54L does not ACK its I2C address (on the 8 Pro the chip did answer + * without the pad and only found no tag, in one run). The eSE half of + * the chip (spi_12, reset gph1-5) is not described. Disabled: nothing + * binds to it until a bring-up overlay enables it. */ nfc: nfc@8 { compatible = "st,st54l", "nxp,nxp-nci-i2c"; reg = <0x08>; + clocks = <&pmu_system_controller 0>; interrupts-extended = <&gpa7 6 IRQ_TYPE_LEVEL_HIGH>; enable-gpios = <&gph1 6 GPIO_ACTIVE_HIGH>; pinctrl-0 = <&nfc_en &nfc_pidle>; diff --git a/arch/arm64/boot/dts/exynos/google/zuma.dtsi b/arch/arm64/boot/dts/exynos/google/zuma.dtsi index 21c184ae87..08714c3eb9 100644 --- a/arch/arm64/boot/dts/exynos/google/zuma.dtsi +++ b/arch/arm64/boot/dts/exynos/google/zuma.dtsi @@ -730,6 +730,7 @@ pmu_system_controller: system-controller@15460000 { compatible = "google,zuma-pmu"; reg = <0x15460000 0x10000>; + #clock-cells = <1>; /* * The bootloader reads the reboot reason from SYSIP_DAT0,