From 01d14d7458f4b6b00d1115df86abc517220354a6 Mon Sep 17 00:00:00 2001
From: Ninad Malwade <nmalwade@nvidia.com>
Date: Tue, 12 Mar 2024 02:16:15 +0800
Subject: [PATCH] t23x: nv-public: move taylor dts to nv-platform

Since the taylor high and low sku dts files are the overlay
files, moving them to nv-platform and correct the include
dt file accordingly.

Bug 4404298

Change-Id: I8d1b221e09e89c9b89264a072204f20ee21c9247
Signed-off-by: Ninad Malwade <nmalwade@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3093888
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Yi-Wei Wang <yiweiw@nvidia.com>
Reviewed-by: Rajkumar Kasirajan <rkasirajan@nvidia.com>
Reviewed-by: Yi-Wei Wang <yiweiw@nvidia.com>
Reviewed-by: Ken Chang <kenc@nvidia.com>
---
 Makefile                                                        | 2 --
 nv-platform/Makefile                                            | 2 ++
 .../tegra234-p3768-0000+p3767-0000-nv-taylor-high.dts           | 2 +-
 .../tegra234-p3768-0000+p3767-0000-nv-taylor-low.dts            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename tegra234-p3768-0000+p3767-0000-taylor-high.dts => nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-high.dts (80%)
 rename tegra234-p3768-0000+p3767-0000-taylor-low.dts => nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-low.dts (80%)

diff --git a/Makefile b/Makefile
index 0582fd3..9f7cbbd 100644
--- a/Makefile
+++ b/Makefile
@@ -9,8 +9,6 @@ makefile-path := t23x/nv-public
 dtb-y += tegra234-p3737-0000+p3701-0000.dtb
 dtb-y += tegra234-p3740-0002+p3701-0008.dtb
 dtb-y += tegra234-p3768-0000+p3767-0000.dtb
-dtb-y += tegra234-p3768-0000+p3767-0000-taylor-high.dtb
-dtb-y += tegra234-p3768-0000+p3767-0000-taylor-low.dtb
 dtb-y += tegra234-p3768-0000+p3767-0005.dtb
 
 ifneq ($(dtb-y),)
diff --git a/nv-platform/Makefile b/nv-platform/Makefile
index a8cf12f..24e9850 100644
--- a/nv-platform/Makefile
+++ b/nv-platform/Makefile
@@ -16,6 +16,8 @@ dtb-y += tegra234-p3737-0000+p3701-0008-nv.dtb
 dtb-y += tegra234-p3740-0002+p3701-0008-nv.dtb
 dtb-y += tegra234-p3740-0002+p3701-0008-nv-safety.dtb
 dtb-y += tegra234-p3768-0000+p3767-0000-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0000-nv-taylor-high.dtb
+dtb-y += tegra234-p3768-0000+p3767-0000-nv-taylor-low.dtb
 dtb-y += tegra234-p3768-0000+p3767-0001-nv.dtb
 dtb-y += tegra234-p3768-0000+p3767-0003-nv.dtb
 dtb-y += tegra234-p3768-0000+p3767-0004-nv.dtb
diff --git a/tegra234-p3768-0000+p3767-0000-taylor-high.dts b/nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-high.dts
similarity index 80%
rename from tegra234-p3768-0000+p3767-0000-taylor-high.dts
rename to nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-high.dts
index 609e634..cc20b95 100644
--- a/tegra234-p3768-0000+p3767-0000-taylor-high.dts
+++ b/nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-high.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "tegra234-p3768-0000+p3767-0000.dts"
+#include "tegra234-p3768-0000+p3767-0000-nv.dts"
 
 / {
 	compatible = "nvidia,p3768-0000+p3767-0000-taylor-high", "nvidia,p3767-0000", "nvidia,tegra234";
diff --git a/tegra234-p3768-0000+p3767-0000-taylor-low.dts b/nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-low.dts
similarity index 80%
rename from tegra234-p3768-0000+p3767-0000-taylor-low.dts
rename to nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-low.dts
index 5c1cfff..5971e2c 100644
--- a/tegra234-p3768-0000+p3767-0000-taylor-low.dts
+++ b/nv-platform/tegra234-p3768-0000+p3767-0000-nv-taylor-low.dts
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 /dts-v1/;
 
-#include "tegra234-p3768-0000+p3767-0000.dts"
+#include "tegra234-p3768-0000+p3767-0000-nv.dts"
 
 / {
 	compatible = "nvidia,p3768-0000+p3767-0000-taylor-low", "nvidia,p3767-0000", "nvidia,tegra234";