From fccf69cfa101c9b37fef9f51c6cd1f229f2341c3 Mon Sep 17 00:00:00 2001
From: Amruth Naga <quic_amrunaga@quicinc.com>
Date: Mon, 8 Apr 2024 10:13:36 +0530
Subject: [PATCH 1/4] [NFC][ARM]: new MSM-ID to support for different
 packagings

Add new MSM-ID for SUN target

Change-Id: If0a014d98008e64678d62c4a4a171fdaf69a5a41
---
 nxp/sun-nfc-cdp.dts        | 4 +++-
 nxp/sun-nfc-mtp.dts        | 4 +++-
 st/sun-nfc-atp.dts         | 3 ++-
 st/sun-nfc-cdp.dts         | 4 +++-
 st/sun-nfc-mtp.dts         | 4 +++-
 st/sun-nfc-qrd-sku1-v8.dts | 3 ++-
 st/sun-nfc-qrd-sku1.dts    | 3 ++-
 st/sun-nfc-qrd-sku2-v8.dts | 3 ++-
 st/sun-nfc-rcm.dts         | 3 ++-
 st/sun-nfc.dts             | 4 +++-
 10 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/nxp/sun-nfc-cdp.dts b/nxp/sun-nfc-cdp.dts
index 3a93ef7f..62d78a3c 100644
--- a/nxp/sun-nfc-cdp.dts
+++ b/nxp/sun-nfc-cdp.dts
@@ -12,6 +12,8 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun CDP";
         compatible = "qcom,sun-cdp", "qcom,sun", "qcom,sunp-cdp", "qcom,sunp", "qcom,cdp";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+		      <0x100027f 0x10000>, <0x100027f 0x20000>;
         qcom,board-id = <0x40001 0>;
 };
diff --git a/nxp/sun-nfc-mtp.dts b/nxp/sun-nfc-mtp.dts
index 2af0da47..4f0abc24 100644
--- a/nxp/sun-nfc-mtp.dts
+++ b/nxp/sun-nfc-mtp.dts
@@ -12,6 +12,8 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun MTP";
         compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp", "qcom,mtp";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+		      <0x100027f 0x10000>, <0x100027f 0x20000>;
         qcom,board-id = <0x30008 0>;
 };
diff --git a/st/sun-nfc-atp.dts b/st/sun-nfc-atp.dts
index 3226e9ca..1665e712 100644
--- a/st/sun-nfc-atp.dts
+++ b/st/sun-nfc-atp.dts
@@ -12,6 +12,7 @@
 	model = "Qualcomm Technologies, Inc. Sun ATP";
 	compatible = "qcom,sun-atp", "qcom,sun", "qcom,sunp-atp", "qcom,sunp",
 			   "qcom,atp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>;
 	qcom,board-id = <0x10021 0>;
 };
diff --git a/st/sun-nfc-cdp.dts b/st/sun-nfc-cdp.dts
index e138c38b..16e36c9c 100644
--- a/st/sun-nfc-cdp.dts
+++ b/st/sun-nfc-cdp.dts
@@ -11,6 +11,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun CDP";
 	compatible = "qcom, sun-cdp", "qcom,sun", "qcom,cdp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+		      <0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0x1 0>, <0x20001 0>, <0x50001 0>;
 };
diff --git a/st/sun-nfc-mtp.dts b/st/sun-nfc-mtp.dts
index b0f68a6b..f8a9d90d 100644
--- a/st/sun-nfc-mtp.dts
+++ b/st/sun-nfc-mtp.dts
@@ -11,6 +11,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun MTP";
 	compatible = "qcom, sun-mtp", "qcom,sun", "qcom,mtp";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	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>;
 };
diff --git a/st/sun-nfc-qrd-sku1-v8.dts b/st/sun-nfc-qrd-sku1-v8.dts
index b0bc48df..4d0ac8a9 100644
--- a/st/sun-nfc-qrd-sku1-v8.dts
+++ b/st/sun-nfc-qrd-sku1-v8.dts
@@ -11,6 +11,7 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid";
         compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp","qcom,qrd";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>;
+        qcom,msm-id = <618 0x10000>, <618 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>;
         qcom,board-id = <0x3000B 0>;
 };
diff --git a/st/sun-nfc-qrd-sku1.dts b/st/sun-nfc-qrd-sku1.dts
index f19198e3..9975dc4c 100644
--- a/st/sun-nfc-qrd-sku1.dts
+++ b/st/sun-nfc-qrd-sku1.dts
@@ -11,6 +11,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun QRD SKU1";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>;
 	qcom,board-id = <0x1000B 0>;
 };
diff --git a/st/sun-nfc-qrd-sku2-v8.dts b/st/sun-nfc-qrd-sku2-v8.dts
index 1b14a5ec..8f8fe9a5 100644
--- a/st/sun-nfc-qrd-sku2-v8.dts
+++ b/st/sun-nfc-qrd-sku2-v8.dts
@@ -11,6 +11,7 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun QRD SKU2 V8 Power Grid";
         compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp","qcom,qrd";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>;
+        qcom,msm-id = <618 0x10000>, <618 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>;
         qcom,board-id = <0x2000B 0>;
 };
diff --git a/st/sun-nfc-rcm.dts b/st/sun-nfc-rcm.dts
index 5bc5d3ec..72053c83 100644
--- a/st/sun-nfc-rcm.dts
+++ b/st/sun-nfc-rcm.dts
@@ -11,6 +11,7 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun RCM";
 	compatible = "qcom,sun-rcm", "qcom,sun", "qcom,sunp", "qcom,rcm";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>;
 	qcom,board-id = <0x15 0>;
 };
diff --git a/st/sun-nfc.dts b/st/sun-nfc.dts
index 246b0014..9fd98552 100644
--- a/st/sun-nfc.dts
+++ b/st/sun-nfc.dts
@@ -11,6 +11,8 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun";
 	compatible = "qcom,sun";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+		      <0x100027f 0x10000>, <0x100027f 0x20000>;
 	qcom,board-id = <0 0>;
 };

From 9c4a64a2d07f1b2c115fafec3cd316759fc0cf80 Mon Sep 17 00:00:00 2001
From: Amruth Naga <quic_amrunaga@quicinc.com>
Date: Thu, 25 Apr 2024 09:15:30 +0530
Subject: [PATCH 2/4] [NFC][DT]: Add new MSM-ID to support SKU2 platform

- Added new MSM-ID to support SKU2 platform.

Change-Id: Ie42e179a5084f22277e9ed52e79179c948db2d3b
---
 st/sun-nfc-qrd-sku2-v8.dts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/st/sun-nfc-qrd-sku2-v8.dts b/st/sun-nfc-qrd-sku2-v8.dts
index 8f8fe9a5..eee84f27 100644
--- a/st/sun-nfc-qrd-sku2-v8.dts
+++ b/st/sun-nfc-qrd-sku2-v8.dts
@@ -11,7 +11,8 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun QRD SKU2 V8 Power Grid";
         compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp","qcom,qrd";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>,
-		      <0x100026a 0x10000>, <0x100026a 0x20000>;
+        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
+		      <0x100026a 0x10000>, <0x100026a 0x20000>,
+                      <0x100027f 0x10000>, <0x100027f 0x20000>;
         qcom,board-id = <0x2000B 0>;
 };

From 24c5144faae98492c9e4018e47e2622403848489 Mon Sep 17 00:00:00 2001
From: Amruth Naga <quic_amrunaga@quicinc.com>
Date: Thu, 25 Apr 2024 10:23:24 +0530
Subject: [PATCH 3/4] Add NFC device Node for MTP_kiwi platform

- Added NFC device Node to support MTP_kiwi platform
- Updated new MSM-ID to SKU1 and SKU1_V8 platforms

Change-Id: Ieba5c1bcbd6de1bd29540566ccc3fd952ff84575
---
 Kbuild                     |  1 +
 st/sun-mtp-kiwi-v8.dts     | 18 ++++++++++++++++++
 st/sun-nfc-qrd-sku1-v8.dts |  2 +-
 st/sun-nfc-qrd-sku1.dts    |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 st/sun-mtp-kiwi-v8.dts

diff --git a/Kbuild b/Kbuild
index 30c9ad8e..0d856c20 100644
--- a/Kbuild
+++ b/Kbuild
@@ -10,6 +10,7 @@ dtbo-y += st/sun-nfc.dtbo \
           st/sun-nfc-qrd-sku1-v8.dtbo \
           st/sun-nfc-qrd-sku2-v8.dtbo \
           st/sun-nfc-atp.dtbo \
+          st/sun-mtp-kiwi-v8.dtbo \
           st/sun-nfc-rcm.dtbo
 endif
 
diff --git a/st/sun-mtp-kiwi-v8.dts b/st/sun-mtp-kiwi-v8.dts
new file mode 100644
index 00000000..ce72b368
--- /dev/null
+++ b/st/sun-mtp-kiwi-v8.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+/*
+ * Copyright (c) 2023 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "sun-nfc-common.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Sun MTP Kiwi WLAN V8 Power Grid";
+	compatible = "qcom,sun-mtp", "qcom,sun", "qcom,sunp-mtp", "qcom,sunp",
+			   "qcom,mtp";
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>;
+	qcom,board-id = <0x50008 0>;
+};
+
diff --git a/st/sun-nfc-qrd-sku1-v8.dts b/st/sun-nfc-qrd-sku1-v8.dts
index 4d0ac8a9..6408dc86 100644
--- a/st/sun-nfc-qrd-sku1-v8.dts
+++ b/st/sun-nfc-qrd-sku1-v8.dts
@@ -11,7 +11,7 @@
 / {
         model = "Qualcomm Technologies, Inc. Sun QRD SKU1 V8 Power Grid";
         compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp","qcom,qrd";
-        qcom,msm-id = <618 0x10000>, <618 0x20000>,
+        qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
 		      <0x100026a 0x10000>, <0x100026a 0x20000>;
         qcom,board-id = <0x3000B 0>;
 };
diff --git a/st/sun-nfc-qrd-sku1.dts b/st/sun-nfc-qrd-sku1.dts
index 9975dc4c..b1252f14 100644
--- a/st/sun-nfc-qrd-sku1.dts
+++ b/st/sun-nfc-qrd-sku1.dts
@@ -11,7 +11,7 @@
 / {
 	model = "Qualcomm Technologies, Inc. Sun QRD SKU1";
 	compatible = "qcom,sun-qrd", "qcom,sun", "qcom,sunp-qrd", "qcom,sunp", "qcom,qrd";
-	qcom,msm-id = <618 0x10000>, <618 0x20000>,
+	qcom,msm-id = <618 0x10000>, <618 0x20000>, <639 0x10000>, <639 0x20000>,
 		      <0x100026a 0x10000>, <0x100026a 0x20000>;
 	qcom,board-id = <0x1000B 0>;
 };

From e84f4bd12f9fc6be1ff652cf5323647667e32abf Mon Sep 17 00:00:00 2001
From: Amruth Naga <quic_amrunaga@quicinc.com>
Date: Fri, 12 Apr 2024 17:02:09 +0530
Subject: [PATCH 4/4] ARM: dts: msm: Add NFC device node for parrot

Device node changes required on parrot,
describing the GPIO configuration for
Nfc controller chip.

Modified corresponding Nfc device node
for ATP, IDP & QRD platforms

Change-Id: I822edc9d0babbe6607897ae0fa8cd4146292bcd3
---
 Kbuild                      |  7 ++++
 nxp/parrot-nfc-atp.dts      | 17 ++++++++++
 nxp/parrot-nfc-common.dtsi  | 28 ++++++++++++++++
 nxp/parrot-nfc-idp.dts      | 17 ++++++++++
 nxp/parrot-nfc-pinctrl.dtsi | 66 +++++++++++++++++++++++++++++++++++++
 nxp/parrot-nfc-qrd.dts      | 18 ++++++++++
 nxp/parrot-nfc.dts          | 16 +++++++++
 7 files changed, 169 insertions(+)
 create mode 100644 nxp/parrot-nfc-atp.dts
 create mode 100644 nxp/parrot-nfc-common.dtsi
 create mode 100644 nxp/parrot-nfc-idp.dts
 create mode 100644 nxp/parrot-nfc-pinctrl.dtsi
 create mode 100644 nxp/parrot-nfc-qrd.dts
 create mode 100644 nxp/parrot-nfc.dts

diff --git a/Kbuild b/Kbuild
index 30c9ad8e..3efff8ae 100644
--- a/Kbuild
+++ b/Kbuild
@@ -13,6 +13,13 @@ dtbo-y += st/sun-nfc.dtbo \
           st/sun-nfc-rcm.dtbo
 endif
 
+ifeq ($(CONFIG_ARCH_PARROT),y)
+dtbo-y += nxp/parrot-nfc.dtbo \
+          nxp/parrot-nfc-qrd.dtbo \
+          nxp/parrot-nfc-idp.dtbo \
+          nxp/parrot-nfc-atp.dtbo
+endif
+
 always-y        := $(dtb-y) $(dtbo-y)
 subdir-y        := $(dts-dirs)
 clean-files     := *.dtb *.dtbo
diff --git a/nxp/parrot-nfc-atp.dts b/nxp/parrot-nfc-atp.dts
new file mode 100644
index 00000000..51ca0813
--- /dev/null
+++ b/nxp/parrot-nfc-atp.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "parrot-nfc-common.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Parrot ATP";
+	compatible = "qcom,parrot-atp", "qcom,parrot", "qcom,atp";
+	qcom,msm-id = <663 0x10000>;
+	qcom,board-id = <33 0>;
+};
diff --git a/nxp/parrot-nfc-common.dtsi b/nxp/parrot-nfc-common.dtsi
new file mode 100644
index 00000000..5080a9f7
--- /dev/null
+++ b/nxp/parrot-nfc-common.dtsi
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+&qupv3_se6_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 9 0x00>;
+		qcom,sn-ven = <&tlmm 6 0x00>;
+		qcom,sn-clkreq = <&tlmm 7 0x00>;
+		qcom,sn-vdd-1p8-supply = <&L21B>;
+		qcom,sn-vdd-1p8-voltage = <1800000 1800000>;
+		qcom,sn-vdd-1p8-current = <157000>;
+		interrupt-parent = <&tlmm>;
+		interrupts = <9 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>;
+	};
+};
diff --git a/nxp/parrot-nfc-idp.dts b/nxp/parrot-nfc-idp.dts
new file mode 100644
index 00000000..dacd8178
--- /dev/null
+++ b/nxp/parrot-nfc-idp.dts
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "parrot-nfc-common.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Parrot IDP";
+	compatible = "qcom,parrot-idp", "qcom,parrot", "qcom,idp";
+	qcom,msm-id = <663 0x10000>;
+	qcom,board-id = <34 0>;
+};
diff --git a/nxp/parrot-nfc-pinctrl.dtsi b/nxp/parrot-nfc-pinctrl.dtsi
new file mode 100644
index 00000000..90ddf11e
--- /dev/null
+++ b/nxp/parrot-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 = "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio9";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_int_suspend: nfc_int_suspend {
+			/* sleep state */
+			mux {
+				/* NFC Read Interrupt */
+				pins = "gpio9";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio9";
+				drive-strength = <2>; /* 2 MA */
+				bias-pull-down;
+			};
+		};
+
+		nfc_enable_active: nfc_enable_active {
+			mux {
+				/* Enable and Clock request gpios */
+				pins = "gpio6", "gpio7";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio6", "gpio7";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+
+		nfc_enable_suspend: nfc_enable_suspend {
+			mux {
+				pins = "gpio6", "gpio7";
+				function = "gpio";
+			};
+
+			config {
+				pins = "gpio6", "gpio7";
+				drive-strength = <2>; /* 2 MA */
+				bias-disable;
+			};
+		};
+	}; //nfc
+}; //tlmm
diff --git a/nxp/parrot-nfc-qrd.dts b/nxp/parrot-nfc-qrd.dts
new file mode 100644
index 00000000..4f0c3fd4
--- /dev/null
+++ b/nxp/parrot-nfc-qrd.dts
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: BSD-3-Clause
+
+/*
+ * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ */
+
+/dts-v1/;
+/plugin/;
+
+#include "parrot-nfc-common.dtsi"
+
+/ {
+	model = "Qualcomm Technologies, Inc. Parrot QRD";
+	compatible = "qcom,parrot-qrd", "qcom,parrot", "qcom,qrd";
+	qcom,msm-id = <663 0x10000>;
+	qcom,board-id = <0x1000B 0>;
+};
+
diff --git a/nxp/parrot-nfc.dts b/nxp/parrot-nfc.dts
new file mode 100644
index 00000000..132ee52d
--- /dev/null
+++ b/nxp/parrot-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 "parrot-nfc-pinctrl.dtsi"
+/ {
+	model = "Qualcomm Technologies, Inc. Parrot SoC";
+	compatible = "qcom,parrot";
+	qcom,msm-id = <663 0x10000>;
+	qcom,board-id = <0 0>;
+};