From 8ed822a57ea483728cdc61d712c55ebe2ea0b74f Mon Sep 17 00:00:00 2001
From: Amruth Naga <quic_amrunaga@quicinc.com>
Date: Fri, 17 Jan 2025 12:54:50 +0530
Subject: [PATCH] [NFC][DT]: Add DT support to ravelin target,

 - Added DT support to ravelin 4GB DDR IDP and 4GB QRD targets.
 - Added all board IDs into single file.

Change-Id: Ibc70a684c8867b184ada4f8c339d394c787ec19c
---
 Kbuild                      |  5 +----
 nxp/ravelin-nfc-atp.dts     | 17 -----------------
 nxp/ravelin-nfc-common.dtsi |  2 ++
 nxp/ravelin-nfc-idp.dts     | 17 -----------------
 nxp/ravelin-nfc-qrd.dts     | 17 -----------------
 nxp/ravelin-nfc.dts         |  6 +++---
 6 files changed, 6 insertions(+), 58 deletions(-)
 delete mode 100644 nxp/ravelin-nfc-atp.dts
 delete mode 100644 nxp/ravelin-nfc-idp.dts
 delete mode 100644 nxp/ravelin-nfc-qrd.dts

diff --git a/Kbuild b/Kbuild
index a1ea245a..1ae2f2b2 100644
--- a/Kbuild
+++ b/Kbuild
@@ -29,10 +29,7 @@ dtbo-y += nxp/parrot-nfc.dtbo \
 endif
 
 ifeq ($(CONFIG_ARCH_RAVELIN),y)
-dtbo-y += nxp/ravelin-nfc.dtbo \
-          nxp/ravelin-nfc-qrd.dtbo \
-          nxp/ravelin-nfc-idp.dtbo \
-          nxp/ravelin-nfc-atp.dtbo
+dtbo-y += nxp/ravelin-nfc.dtbo
 endif
 
 
diff --git a/nxp/ravelin-nfc-atp.dts b/nxp/ravelin-nfc-atp.dts
deleted file mode 100644
index b09bb368..00000000
--- a/nxp/ravelin-nfc-atp.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include "ravelin-nfc-common.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Ravelin ATP";
-	compatible = "qcom,ravelin-atp", "qcom,ravelin", "qcom,atp";
-	qcom,msm-id = <568 0x10000>, <602 0x10000>;
-	qcom,board-id = <33 0>;
-};
diff --git a/nxp/ravelin-nfc-common.dtsi b/nxp/ravelin-nfc-common.dtsi
index 5b476256..9cd4d439 100644
--- a/nxp/ravelin-nfc-common.dtsi
+++ b/nxp/ravelin-nfc-common.dtsi
@@ -4,6 +4,8 @@
  * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
+#include "ravelin-nfc-pinctrl.dtsi"
+
 &qupv3_se0_i2c {
 	status = "ok";
 	qcom,clk-freq-out = <1000000>;
diff --git a/nxp/ravelin-nfc-idp.dts b/nxp/ravelin-nfc-idp.dts
deleted file mode 100644
index 9e0be587..00000000
--- a/nxp/ravelin-nfc-idp.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include "ravelin-nfc-common.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Ravelin IDP";
-	compatible = "qcom,ravelin-idp", "qcom,ravelin", "qcom,idp";
-	qcom,msm-id = <568 0x10000>, <602 0x10000>;
-	qcom,board-id = <34 0>;
-};
diff --git a/nxp/ravelin-nfc-qrd.dts b/nxp/ravelin-nfc-qrd.dts
deleted file mode 100644
index fab15c32..00000000
--- a/nxp/ravelin-nfc-qrd.dts
+++ /dev/null
@@ -1,17 +0,0 @@
-// SPDX-License-Identifier: BSD-3-Clause
-
-/*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
- */
-
-/dts-v1/;
-/plugin/;
-
-#include "ravelin-nfc-common.dtsi"
-
-/ {
-	model = "Qualcomm Technologies, Inc. Ravelin QRD";
-	compatible = "qcom,ravelin-qrd", "qcom,ravelin", "qcom,qrd";
-	qcom,msm-id = <568 0x10000>, <602 0x10000>;
-	qcom,board-id = <0x1000B 0>;
-};
diff --git a/nxp/ravelin-nfc.dts b/nxp/ravelin-nfc.dts
index e9e3bfdc..5422e356 100644
--- a/nxp/ravelin-nfc.dts
+++ b/nxp/ravelin-nfc.dts
@@ -7,11 +7,11 @@
 /dts-v1/;
 /plugin/;
 
-#include "ravelin-nfc-pinctrl.dtsi"
+#include "ravelin-nfc-common.dtsi"
 / {
 	model = "Qualcomm Technologies, Inc. Ravelin SoC";
 	compatible = "qcom,ravelin";
 	qcom,msm-id = <568 0x10000>, <602 0x10000>, <581 0x10000>, <582 0x10000>, <653 0x10000>,
-                      <654 0x10000>, <663 0x10000>;
-	qcom,board-id = <0 0>;
+                      <654 0x10000>;
+	qcom,board-id = <33 0>,<34 0>, <0x1000B 0>, <34 0x601>,  <0x1000B 0x600>, <34 2>;
 };