Merge 84e96845d0 on remote branch

Change-Id: I875c1328b6b94d43dcab34e2e3bc7b054cb56481

Kbuild

@@ -2,6 +2,8 @@ ifeq ($(CONFIG_ARCH_SUN),y)
 dtbo-y += nxp/sun-nfc.dtbo \
           nxp/sun-nfc-cdp.dtbo \
           nxp/sun-nfc-mtp.dtbo \
+          nxp/sun-nfc-qrd.dtbo \
+          nxp/tuna-nfc.dtbo \
 
 dtbo-y += st/sun-nfc.dtbo \
           st/sun-nfc-mtp.dtbo \
@@ -11,7 +13,8 @@ dtbo-y += st/sun-nfc.dtbo \
           st/sun-nfc-qrd-sku2-v8.dtbo \
           st/sun-nfc-atp.dtbo \
           st/sun-mtp-kiwi-v8.dtbo \
-          st/sun-nfc-rcm.dtbo
+          st/sun-nfc-rcm.dtbo \
+          st/tuna-nfc.dtbo
 endif
 
 ifeq ($(CONFIG_ARCH_PARROT),y)
@@ -30,6 +33,7 @@ dtbo-y += nxp/ravelin-nfc.dtbo \
           nxp/ravelin-nfc-atp.dtbo
 endif
 
+
 always-y        := $(dtb-y) $(dtbo-y)
 subdir-y        := $(dts-dirs)
 clean-files     := *.dtb *.dtbo

nxp/sun-nfc-mtp.dts

@@ -15,5 +15,5 @@
         qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
 		      <0x100026a 0x10000>, <0x100026a 0x20000>,
 		      <0x100027f 0x10000>, <0x100027f 0x20000>;
-        qcom,board-id = <0x30008 0>;
+        qcom,board-id = <0x30008 0>, <0x70008 0>;
 };

nxp/sun-nfc-qrd.dts

@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-nfc-common.dtsi"
+
+/ {
+        model = "Qualcomm Technologies, Inc. Sun QRD";
+	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp",
+			   "qcom,qrd";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+		      <0x100027f 0x10000>, <0x100027f 0x20000>;
+	qcom,board-id = <0x4000B 0>;
+};

nxp/tuna-nfc-common.dtsi

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+#include "tuna-nfc-pinctrl.dtsi"
+
+&qupv3_se0_i2c {
+	status = "ok";
+	qcom,clk-freq-out = <1000000>;
+	#address-cells = <1>;
+	#size-cells = <0>;
+	nq@28 {
+		compatible = "qcom,sn-nci";
+		reg = <0x28>;
+		qcom,sn-irq = <&tlmm 55 0x00>;
+		qcom,sn-ven = <&tlmm 114 0x00>;
+		qcom,sn-clkreq = <&tlmm 115 0x00>;
+		qcom,sn-szone = "enable";
+		interrupt-parent = <&tlmm>;
+		interrupts = <55 0>;
+		interrupt-names = "nfc_irq";
+		pinctrl-names = "nfc_active", "nfc_suspend";
+		pinctrl-0 = <&nfc_int_active &nfc_enable_active>;
+		pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
+	};
+};

nxp/tuna-nfc-pinctrl.dtsi

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+&tlmm {
+	nfc {
+		nfc_int_active: nfc_int_active {
+			/* active state */
+			mux {
+				/* NFC Read Interrupt */
+				pins = "gpio55";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio55";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_int_suspend: nfc_int_suspend {
+			/* sleep state */
+			mux {
+				/* NFC Read Interrupt */
+				pins = "gpio55";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio55";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_enable_active: nfc_enable_active {
+			mux {
+				/* Enable, and Clock request gpios */
+				pins = "gpio114", "gpio115";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio114", "gpio115";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_enable_suspend: nfc_enable_suspend {
+			mux {
+				pins = "gpio114", "gpio115";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio114", "gpio115";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+	}; //nfc
+}; //tlmm

nxp/tuna-nfc.dts

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "tuna-nfc-common.dtsi"
+/ {
+        model = "Qualcomm Technologies, Inc. Tuna SoC";
+        compatible = "qcom,tuna";
+        qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>;
+        qcom,board-id = <8 4>;
+};

st/sun-nfc-mtp.dts

@@ -14,5 +14,5 @@
 	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
 		      <0x100026a 0x10000>, <0x100026a 0x20000>,
 		      <0x100027f 0x10000>, <0x100027f 0x20000>;
-	qcom,board-id = <0x8 0>, <0x20008 0>, <0x40008 0>, <0x50008 0>;
+	qcom,board-id = <0x8 0>, <0x20008 0>, <0x40008 0>, <0x50008 0>, <0x60008 0>;
 };

st/tuna-nfc-common.dtsi

@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+#include "tuna-nfc-pinctrl.dtsi"
+
+&qupv3_se0_i2c {
+        status = "ok";
+        qcom,clk-freq-out = <1000000>;
+        #address-cells = <1>;
+        #size-cells = <0>;
+        st21nfc: st21nfc@08 {
+                compatible = "st,st21nfc";
+                reg = <0x08>;
+                irq-gpios = <&tlmm 55 0x00>;
+                reset-gpios = <&tlmm 114 0x00>;
+                clkreq-gpios = <&tlmm 115 0x00>;
+                interrupt-parent = <&tlmm>;
+                interrupts = <55 0>;
+                interrupt-names = "nfc_irq";
+                pinctrl-names = "nfc_active", "nfc_suspend";
+                pinctrl-0 = <&nfc_int_active &nfc_enable_active>;
+                pinctrl-1 = <&nfc_int_suspend &nfc_enable_suspend>;
+        };
+};

st/tuna-nfc-pinctrl.dtsi

@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+&tlmm {
+	nfc {
+		nfc_int_active: nfc_int_active {
+			/* active state */
+			mux {
+				/* NFC Read Interrupt */
+				pins = "gpio55";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio55";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_int_suspend: nfc_int_suspend {
+			/* sleep state */
+			mux {
+				/* NFC Read Interrupt */
+				pins = "gpio55";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio55";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_enable_active: nfc_enable_active {
+			mux {
+				/* Enable, and Clock request gpios */
+				pins = "gpio114", "gpio115";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio114", "gpio115";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_enable_suspend: nfc_enable_suspend {
+			mux {
+				pins = "gpio114", "gpio115";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio114", "gpio115";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+	}; //nfc
+}; //tlmm

st/tuna-nfc.dts

@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "tuna-nfc-common.dtsi"
+/ {
+        model = "Qualcomm Technologies, Inc. Tuna SoC";
+        compatible = "qcom,tuna";
+        qcom,msm-id = <681 0x10000>, <655 0x10000>, <694 0x10000>;
+        qcom,board-id = <33 0>, <1 0>, <8 0>, <11 0>, <21 0>;
+};