nv-public: add new nv dtb files

In this commit:

1. The large platform overlays are being directly built into
   a new base "nv" dtb. The names of these new dtbs directly tracks the
   name of the upstream dtb that it extends. For an upstream dtb named
   <base>.dtb the new corresponding new file is named <base>-nv.dtb.

2. The source files for <base>-nv.dtb are located in the nv-soc/ and
   nv-platform/ files.  Those files originated in the overlay/
   directory but are moved to reflect that they are no longer part of
   an overlay.

This new layout seeks to simplify building and handling of dtb files
while retaining close compatibility with the upstream dts sources.

Bug 4290389

Change-Id: Ic812e8e16c5515bb3e17b99a23815a99f67c42a2
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2996468
(cherry picked from commit ee6247a701)
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/3002840
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>

nv-platform/Makefile

@@ -0,0 +1,33 @@
+# SPDX-License-Identifier: GPL-2.0-only
+# SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+DTC_FLAGS += -@
+
+old-dtb := $(dtb-y)
+old-dtbo := $(dtbo-y)
+dtb-y :=
+dtbo-y :=
+makefile-path := t23x/nv-public/nv-platform
+
+dtb-y += tegra234-p3737-0000+p3701-0000-nv.dtb
+dtb-y += tegra234-p3737-0000+p3701-0004-nv.dtb
+dtb-y += tegra234-p3737-0000+p3701-0005-nv.dtb
+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-0001-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0003-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0004-nv.dtb
+dtb-y += tegra234-p3768-0000+p3767-0005-nv.dtb
+
+ifneq ($(dtb-y),)
+dtb-y := $(addprefix $(makefile-path)/,$(dtb-y))
+endif
+ifneq ($(dtbo-y),)
+dtbo-y := $(addprefix $(makefile-path)/,$(dtbo-y))
+endif
+
+dtb-y += $(old-dtb)
+dtbo-y += $(old-dtbo)
+

nv-platform/tegra234-p3737-0000+p3701-0000-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3737-0000+p3701-0000.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3737-0000+p3701-0004-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0004.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3737-0000+p3701-0005-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0005.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3737-0000+p3701-0008-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3737-0000+p3701-0008.dts"
+#include "tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3737-0000+p3701-xxxx-nv-common.dtsi

@@ -1,16 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-
+#include "nv-soc/tegra234-overlay.dtsi"
-/dts-v1/;
+#include "nv-soc/tegra234-soc-thermal.dtsi"
-/plugin/;
+#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi"
-
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
-#include "tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
-#include "tegra234-soc-thermal-slowdown-cluster.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-audio-dai-links.dtsi"
-#include "tegra234-soc-camera.dtsi"
 #include "tegra234-p3737-0000.dtsi"
 #include "tegra234-p3701-0000.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"

nv-platform/tegra234-p3740-0002+p3701-0008-nv-common.dtsi

@@ -1,14 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
+#include "nv-soc/tegra234-overlay.dtsi"
-/plugin/;
+#include "nv-soc/tegra234-soc-thermal.dtsi"
-
+#include "nv-soc/tegra234-soc-thermal-slowdown-cluster.dtsi"
-#include "tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
-#include "tegra234-soc-thermal-slowdown-cluster.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-camera.dtsi"
 #include "tegra234-camera-p3785.dtsi"
 #include "tegra234-p3740-0002.dtsi"
 #include "tegra234-p3701-0008.dtsi"

nv-platform/tegra234-p3740-0002+p3701-0008-nv-safety.dts

@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3740-0002+p3701-0008.dts"
+#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"
+#include "tegra234-p3740-0002+p3701-0008-safety.dtsi"

nv-platform/tegra234-p3740-0002+p3701-0008-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3740-0002+p3701-0008.dts"
+#include "tegra234-p3740-0002+p3701-0008-nv-common.dtsi"

nv-platform/tegra234-p3740-0002+p3701-0008-safety.dtsi

@@ -1,10 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
+#include "nv-soc/tegra234-soc-safetyservice-fsicom.dtsi"
-/plugin/;
-
-#include "tegra234-soc-safetyservice-fsicom.dtsi"
 
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX

nv-platform/tegra234-p3740-0002.dtsi

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-#include "tegra234-soc-audio-dai-links.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
 
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX

nv-platform/tegra234-p3768-0000+p3767-0000-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3768-0000+p3767-0000.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3768-0000+p3767-0001-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0001.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3768-0000+p3767-0003-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0003.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3768-0000+p3767-0004-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "staging/tegra234-p3768-0000+p3767-0004.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3768-0000+p3767-0005-nv.dts

@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-only
+// SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+
+/dts-v1/;
+
+#define REMOVE_FRAGMENT_SYNTAX 1
+#include "tegra234-p3768-0000+p3767-0005.dts"
+#include "tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi"

nv-platform/tegra234-p3768-0000+p3767-xxxx-nv-common.dtsi

@@ -1,17 +1,14 @@
 // SPDX-License-Identifier: GPL-2.0-only
 // SPDX-FileCopyrightText: Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
-/dts-v1/;
+#include "nv-soc/tegra234-overlay.dtsi"
-/plugin/;
+#include "nv-soc/tegra234-soc-thermal.dtsi"
-
+#include "nv-soc/tegra234-soc-thermal-slowdown-corepair.dtsi"
-#include "tegra234-overlay.dtsi"
+#include "nv-soc/tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-thermal.dtsi"
+#include "nv-soc/tegra234-soc-audio-dai-links.dtsi"
-#include "tegra234-soc-thermal-slowdown-corepair.dtsi"
-#include "tegra234-soc-thermal-shutdown.dtsi"
-#include "tegra234-soc-audio-dai-links.dtsi"
 #include "tegra234-p3768-0000.dtsi"
 #include "tegra234-p3767-0000.dtsi"
-#include "tegra234-soc-camera.dtsi"
+#include "nv-soc/tegra234-soc-camera.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 / {
 #ifndef REMOVE_FRAGMENT_SYNTAX

overlay/Makefile

@@ -14,12 +14,8 @@ dtbo-y += tegra234-android.dtbo
 dtbo-y += tegra234-audio-overlay.dtbo
 dtbo-y += tegra234-carveouts.dtbo
 dtbo-y += tegra234-jetson.dtbo
-dtbo-y += tegra234-p3737-0000+p3701-0000.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-pcie-no-tra.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-dynamic.dtbo
-dtbo-y += tegra234-p3740-0002+p3701-0008.dtbo
-dtbo-y += tegra234-p3740-0002+p3701-0008-safety.dtbo
-dtbo-y += tegra234-p3768-0000+p3767-0000.dtbo
 dtbo-y += tegra234-p3768-0000+p3767-0000-dynamic.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-audio-adafruit-uda1334a.dtbo
 dtbo-y += tegra234-p3737-0000+p3701-0000-audio-adafruit-sph0645lm4h.dtbo

overlay/tegra234-jetson.dts

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
+// SPDX-FileCopyrightText: Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES.  All rights reserved.
 
 /dts-v1/;
 /plugin/;
@@ -11,8 +11,8 @@
 #include <dt-bindings/memory/tegra234-mc.h>
 #include <dt-bindings/power/tegra234-powergate.h>
 #include <dt-bindings/reset/tegra234-reset.h>
-#include "tegra234-soc-display-overlay.dtsi"
+#include "nv-soc/tegra234-soc-display-overlay.dtsi"
-#include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
+#include "nv-platform/tegra234-dcb-p3737-0000-p3701-0000.dtsi"
 
 / {
 	overlay-name = "Tegra234 Jetson Overlay";