[PATCH 0/3] NFC fixes for Pixel 3 / 3 XL and support for Pixel 3a / 3a XL

[PATCH 0/3] NFC fixes for Pixel 3 / 3 XL and support for Pixel 3a / 3a XL

[David Heidelberg via B4 Relay]

Increase i2c bus frequency on Pixel 3 to match Android kernel, cleanup
the device-tree and introduce NFC node for Pixel 3a.

Changes to sdm670-google-common compared to sdm670-mainline:
 - rising edge (same as for Pixel 3)
 - split pins of the nfc-default-state
 - removed comments and used right compatible
 - dropped eSE gpio as it's irrelevant for the NFC part for now

Signed-off-by: David Heidelberg <david@ixit.cz>
---
David Heidelberg (2):
      arm64: dts: qcom: sdm845-google: Set i2c3 frequency to 400 kHz
      arm64: dts: qcom: sdm845-google: Improve NFC pins description

Richard Acayan (1):
      arm64: dts: qcom: sdm670-google: Add NFC support

 arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 42 ++++++++++++++++++++++
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 36 ++++++++++++-------
 2 files changed, 66 insertions(+), 12 deletions(-)
---
base-commit: 7079a12d7506b07fb53b54a664bfad5fa9b16d70
change-id: 20260829-sdm670-sargo-nfc-b59fb3e764c1

Best regards,
--  
David Heidelberg <david@ixit.cz>

[PATCH 1/3] arm64: dts: qcom: sdm845-google: Set i2c3 frequency to 400 kHz

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

When downstream value is undefined, it fallback to 400 kHz. Set it in
mainline too.

Cc: stable@vger.kernel.org
Fixes: 10f91b0dfaf6 ("arm64: dts: qcom: sdm845-google-common: Enable NFC")
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
index 9e952f9862f24..f73d4ea57705f 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
@@ -387,16 +387,18 @@ &gpu {
 	status = "okay";
 };
 
 &gpu_zap_shader {
 	firmware-name = "qcom/sdm845/Google/blueline/a630_zap.mbn";
 };
 
 &i2c3 {
+	clock-frequency = <400000>;
+
 	status = "okay";
 
 	nfc@28 {
 		compatible = "nxp,pn557", "nxp,nxp-nci-i2c";
 		reg = <0x28>;
 
 		interrupts-extended = <&tlmm 63 IRQ_TYPE_EDGE_RISING>;
 

-- 
2.55.0

[PATCH 2/3] arm64: dts: qcom: sdm845-google: Improve NFC pins description

[David Heidelberg via B4 Relay]

From: David Heidelberg <david@ixit.cz>

Be more clear with pin description and group all of them into one state.

No functional changes.

Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 34 ++++++++++++++--------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
index f73d4ea57705f..f1379857e2742 100644
--- a/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi
@@ -400,17 +400,17 @@ nfc@28 {
 		compatible = "nxp,pn557", "nxp,nxp-nci-i2c";
 		reg = <0x28>;
 
 		interrupts-extended = <&tlmm 63 IRQ_TYPE_EDGE_RISING>;
 
 		enable-gpios = <&tlmm 25 GPIO_ACTIVE_HIGH>;
 		firmware-gpios = <&tlmm 79 GPIO_ACTIVE_HIGH>;
 
-		pinctrl-0 = <&nfc_int_default &nfc_enable_default>;
+		pinctrl-0 = <&nfc_default>;
 		pinctrl-names = "default";
 	};
 };
 
 &i2c12 {
 	/* Bottom spkr (right) CS35L36 @ 40 */
 
 	/* Top spkr (left) CS35L36 @ 41 */
@@ -473,28 +473,38 @@ &qup_uart9_tx {
 	drive-strength = <2>;
 	bias-disable;
 };
 
 &tlmm {
 	gpio-reserved-ranges = < 0 4>, /* SPI (Intel MNH Pixel Visual Core) */
 			       <81 4>; /* SPI (most likely Fingerprint Cards FPC1075) */
 
-	nfc_int_default: nfc-int-default-state {
-		pins = "gpio63";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-pull-down;
-	};
+	nfc_default: nfc-default-state {
+		enable-pins {
+			pins = "gpio25";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+
+		irq-pins {
+			pins = "gpio63";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+
+		firmware-pins {
+			pins = "gpio79";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
 
-	nfc_enable_default: nfc-enable-default-state {
-		pins = "gpio25", "gpio79";
-		function = "gpio";
-		drive-strength = <2>;
-		bias-pull-down;
 	};
 
 	touchscreen_reset: ts-reset-state {
 		pins = "gpio99";
 		function = "gpio";
 		drive-strength = <8>;
 		bias-pull-up;
 	};

-- 
2.55.0

[PATCH 3/3] arm64: dts: qcom: sdm670-google: Add NFC support

[David Heidelberg via B4 Relay]

From: Richard Acayan <mailingradian@gmail.com>

The NFC driver can detect and read an NFC tag.

Signed-off-by: Richard Acayan <mailingradian@gmail.com>
Co-developed-by: David Heidelberg <david@ixit.cz>
Signed-off-by: David Heidelberg <david@ixit.cz>
---
 arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 42 ++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi b/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
index b4854801a5f5e..5c2613e53679c 100644
--- a/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
+++ b/arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi
@@ -485,16 +485,35 @@ &gpi_dma1 {
 &gpu {
 	status = "okay";
 };
 
 &gpu_zap_shader {
 	firmware-name = "qcom/sdm670/sargo/a615_zap.mbn";
 };
 
+&i2c3 {
+	clock-frequency = <400000>;
+
+	status = "okay";
+
+	nfc@28 {
+		compatible = "nxp,pn557", "nxp,nxp-nci-i2c";
+		reg = <0x28>;
+
+		interrupts-extended = <&tlmm 44 IRQ_TYPE_EDGE_RISING>;
+
+		enable-gpios = <&tlmm 12 GPIO_ACTIVE_HIGH>;
+		firmware-gpios = <&tlmm 43 GPIO_ACTIVE_HIGH>;
+
+		pinctrl-0 = <&nfc_default>;
+		pinctrl-names = "default";
+	};
+};
+
 &i2c9 {
 	clock-frequency = <100000>;
 	status = "okay";
 
 	synaptics-rmi4-i2c@20 {
 		compatible = "syna,rmi4-i2c";
 		reg = <0x20>;
 		interrupts-extended = <&tlmm 125 IRQ_TYPE_EDGE_FALLING>;
@@ -686,16 +705,39 @@ ts-irq-pins {
 		ts-switch-pins {
 			pins = "gpio135";
 			function = "gpio";
 			drive-strength = <2>;
 			bias-disable;
 			output-low;
 		};
 	};
+
+	nfc_default: nfc-default-state {
+		enable-pins {
+			pins = "gpio12";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+
+		firmware-pins {
+			pins = "gpio43";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+
+		irq-pins {
+			pins = "gpio44";
+			function = "gpio";
+			drive-strength = <2>;
+			bias-pull-down;
+		};
+	};
 };
 
 &usb_1_hsphy {
 	vdd-supply = <&vreg_l1b_0p925>;
 	vdda-pll-supply = <&vreg_l10a_1p8>;
 	vdda-phy-dpdm-supply = <&vreg_l7b_3p125>;
 
 	status = "okay";

-- 
2.55.0

Re: [PATCH 1/3] arm64: dts: qcom: sdm845-google: Set i2c3 frequency to 400 kHz

[Konrad Dybcio]

On 9/2/26 10:59 PM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
> 
> When downstream value is undefined, it fallback to 400 kHz. Set it in
> mainline too.

"The Device Tree found in the downstream kernel for this device doesn't
explicitly set a bus frequency, resulting in 400 kHz being chosen.

This upstream DT also lacks it, however that results in a different
default value of 100 kHz. Set it to 400 explicitly to match the
downstream kernel."

Konrad

Re: [PATCH 2/3] arm64: dts: qcom: sdm845-google: Improve NFC pins description

[Konrad Dybcio]

On 9/2/26 10:59 PM, David Heidelberg via B4 Relay wrote:
> From: David Heidelberg <david@ixit.cz>
> 
> Be more clear with pin description and group all of them into one state.
> 
> No functional changes.
> 
> Signed-off-by: David Heidelberg <david@ixit.cz>
> ---

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: [PATCH 3/3] arm64: dts: qcom: sdm670-google: Add NFC support

[Konrad Dybcio]

On 9/2/26 10:59 PM, David Heidelberg via B4 Relay wrote:
> From: Richard Acayan <mailingradian@gmail.com>
> 
> The NFC driver can detect and read an NFC tag.

We would hope so..

Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>

Konrad

Re: (subset) [PATCH 0/3] NFC fixes for Pixel 3 / 3 XL and support for Pixel 3a / 3a XL

[Bjorn Andersson]

On Wed, 02 Sep 2026 22:59:11 +0200, David Heidelberg wrote:
> Increase i2c bus frequency on Pixel 3 to match Android kernel, cleanup
> the device-tree and introduce NFC node for Pixel 3a.
> 
> Changes to sdm670-google-common compared to sdm670-mainline:
>  - rising edge (same as for Pixel 3)
>  - split pins of the nfc-default-state
>  - removed comments and used right compatible
>  - dropped eSE gpio as it's irrelevant for the NFC part for now
> 
> [...]

Applied, thanks!

[3/3] arm64: dts: qcom: sdm670-google: Add NFC support
      commit: fdade6ed0b9e5b9f84de63c14fd747b820110b36

Best regards,
-- 
Bjorn Andersson <andersson@kernel.org>