From 323d1fd8b66926c73f18fe1737a803b94a1363b3 Mon Sep 17 00:00:00 2001
From: Brad Griffis <bgriffis@nvidia.com>
Date: Thu, 12 Oct 2023 19:21:35 +0000
Subject: [PATCH] overlay: move camera-related files to dynamic overlay

Cameras are optional and so they should be part of the dynamic overlay.
Keep the soc-related camera file in the static overlay.

Bug 4290389

Change-Id: I216f271d39fb9e1e1585ede14d3ca28e5d49fd6c
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/t23x-public-dts/+/2996299
Reviewed-by: Gautham Srinivasan <gauthams@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts | 2 ++
 overlay/tegra234-p3737-0000+p3701-0000.dts         | 3 +--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts b/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
index 2d7792d..ab8f440 100644
--- a/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000-dynamic.dts
@@ -6,6 +6,8 @@
 
 #include <dt-bindings/gpio/tegra234-gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include "tegra234-p3737-0000-camera-imx274-dual.dtsi"
+#include "tegra234-p3737-camera-modules.dtsi"
 
 / {
 	overlay-name = "Tegra234 p3737-0000+p3701-xxxx Dynamic Overlay";
diff --git a/overlay/tegra234-p3737-0000+p3701-0000.dts b/overlay/tegra234-p3737-0000+p3701-0000.dts
index d24856b..5ca6cdf 100644
--- a/overlay/tegra234-p3737-0000+p3701-0000.dts
+++ b/overlay/tegra234-p3737-0000+p3701-0000.dts
@@ -12,10 +12,9 @@
 #include "tegra234-soc-audio-dai-links.dtsi"
 #include "tegra234-soc-camera.dtsi"
 #include "tegra234-p3737-0000.dtsi"
-#include "tegra234-p3737-0000-camera-imx274-dual.dtsi"
 #include "tegra234-p3701-0000.dtsi"
 #include "tegra234-dcb-p3737-0000-p3701-0000.dtsi"
-#include "tegra234-p3737-camera-modules.dtsi"
+
 / {
 	compatible = "nvidia,p3737-0000+p3701-0000";