From bdf376813b00a44f5ab023a8edc72d95f41f776f Mon Sep 17 00:00:00 2001
From: Laxman Dewangan <ldewangan@nvidia.com>
Date: Wed, 5 Apr 2023 01:01:27 +0000
Subject: [PATCH] concord: status-overlay: Move base nodes overlay to base
 fragment

Move the enabling of nodes pwm, padctl, usb etc from base DTSI
to the base fragment.

These nodes are moved to base from overlay.

Change-Id: I734105a48c178dcbcc11535c3db44f2f7da3021a
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/device/hardware/nvidia/platform/t23x/concord-generic-dts/+/2882653
Reviewed-by: svcacv <svcacv@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 overlay/tegra234-status-overlay.dtsi | 208 ++++++++++++++-------------
 tegra234-p3701-0000.dtsi             |   5 +
 2 files changed, 110 insertions(+), 103 deletions(-)

diff --git a/overlay/tegra234-status-overlay.dtsi b/overlay/tegra234-status-overlay.dtsi
index ac3d18d..438a1cb 100644
--- a/overlay/tegra234-status-overlay.dtsi
+++ b/overlay/tegra234-status-overlay.dtsi
@@ -23,14 +23,6 @@
 					status = "okay";
 				};
 
-				serial@31d0000 {
-					status = "okay";
-				};
-
-				mmc@3400000 {
-					status = "okay";
-				};
-
 				tachometer@39c0000 {
 					status = "okay";
 				};
@@ -75,27 +67,11 @@
 					status = "okay";
 				};
 
-				pwm@32a0000 {
-					status = "okay";
-				};
-
-				pwm@32c0000 {
-					status = "okay";
-				};
-
-				pwm@32f0000 {
-					status = "okay";
-				};
-
 				host1x@13e00000 {
 					nvjpg@15380000 {
 						status = "okay";
 					};
 
-					nvdec@15480000 {
-						status = "okay";
-					};
-
 					nvenc@154c0000 {
 						status = "okay";
 					};
@@ -172,85 +148,6 @@
 						};
 					};
 				};
-
-				padctl@3520000 {
-					status = "okay";
-					pads {
-						usb2 {
-							lanes {
-								usb2-0 {
-									status = "okay";
-								};
-
-								usb2-1 {
-									status = "okay";
-								};
-
-								usb2-2 {
-									status = "okay";
-								};
-
-								usb2-3 {
-									status = "okay";
-								};
-							};
-						};
-
-						usb3 {
-							lanes {
-								usb3-0 {
-									status = "okay";
-								};
-
-								usb3-1 {
-									status = "okay";
-								};
-
-								usb3-2 {
-									status = "okay";
-								};
-							};
-						};
-					};
-
-					ports {
-						usb2-0 {
-							status = "okay";
-						};
-
-						usb2-1 {
-							status = "okay";
-						};
-
-						usb2-2 {
-							status = "okay";
-						};
-
-						usb2-3 {
-							status = "okay";
-						};
-
-						usb3-0 {
-							status = "okay";
-						};
-
-						usb3-1 {
-							status = "okay";
-						};
-
-						usb3-2 {
-							status = "okay";
-						};
-					};
-				};
-
-				usb@3550000 {
-					status = "okay";
-				};
-
-				usb@3610000 {
-					status = "okay";
-				};
 			};
 
 			tegra-hsp@b950000 {
@@ -368,6 +265,12 @@
 					};
 				};
 
+				host1x@13e00000 {
+					nvdec@15480000 {
+						status = "okay";
+					};
+				};
+
 				i2c@3160000 {
 					status = "okay";
 				};
@@ -404,9 +307,108 @@
 					status = "okay";
 				};
 
+				serial@31d0000 {
+					status = "okay";
+				};
+
+				mmc@3400000 {
+					status = "okay";
+				};
+
+				pwm@32a0000 {
+					status = "okay";
+				};
+
+				pwm@32c0000 {
+					status = "okay";
+				};
+
+				pwm@32f0000 {
+					status = "okay";
+				};
+
 				pwm@3280000 {
 					status = "okay";
 				};
+
+				padctl@3520000 {
+					status = "okay";
+					pads {
+						usb2 {
+							lanes {
+								usb2-0 {
+									status = "okay";
+								};
+
+								usb2-1 {
+									status = "okay";
+								};
+
+								usb2-2 {
+									status = "okay";
+								};
+
+								usb2-3 {
+									status = "okay";
+								};
+							};
+						};
+
+						usb3 {
+							lanes {
+								usb3-0 {
+									status = "okay";
+								};
+
+								usb3-1 {
+									status = "okay";
+								};
+
+								usb3-2 {
+									status = "okay";
+								};
+							};
+						};
+					};
+
+					ports {
+						usb2-0 {
+							status = "okay";
+						};
+
+						usb2-1 {
+							status = "okay";
+						};
+
+						usb2-2 {
+							status = "okay";
+						};
+
+						usb2-3 {
+							status = "okay";
+						};
+
+						usb3-0 {
+							status = "okay";
+						};
+
+						usb3-1 {
+							status = "okay";
+						};
+
+						usb3-2 {
+							status = "okay";
+						};
+					};
+				};
+
+				usb@3550000 {
+					status = "okay";
+				};
+
+				usb@3610000 {
+					status = "okay";
+				};
 			};
 		};
 	};
diff --git a/tegra234-p3701-0000.dtsi b/tegra234-p3701-0000.dtsi
index 9e4d72c..b129dc0 100644
--- a/tegra234-p3701-0000.dtsi
+++ b/tegra234-p3701-0000.dtsi
@@ -55,6 +55,11 @@
 			};
 		};
 
+		mmc@3400000 {
+			cd-gpios = <&gpio TEGRA234_MAIN_GPIO(G, 7) GPIO_ACTIVE_LOW>;
+			disable-wp;
+		};
+
 		mmc@3460000 {
 			status = "okay";
 			bus-width = <8>;