From 0529d8ca2f1c8310cd54f1aa6c33c0cd11cc3e24 Mon Sep 17 00:00:00 2001
From: Mayank Grover <groverm@qti.qualcomm.com>
Date: Mon, 9 Nov 2020 16:35:19 +0530
Subject: [PATCH] ARM: dts: msm: Move firmware node ahead

Bootloader need to update property in firmware,
so move firmware node ahead can improve the
bootloader search dt and update property time.

Change-Id: Iae35be08cae1e514d6b6ad051e5e42137f99db8b
---
 qcom/holi.dtsi | 55 +++++++++++++++++++++++++-------------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/qcom/holi.dtsi b/qcom/holi.dtsi
index 9487018bbdad..8053abd609dd 100644
--- a/qcom/holi.dtsi
+++ b/qcom/holi.dtsi
@@ -49,6 +49,8 @@
 		swr1 = &swr1;
 	};
 
+	firmware: firmware {};
+
 	cpus {
 		#address-cells = <2>;
 		#size-cells = <0>;
@@ -244,35 +246,8 @@
 		};
 	};
 
-
 	soc: soc { };
 
-	firmware: firmware {
-		scm {
-			compatible = "qcom,scm";
-		};
-
-		android {
-			compatible = "android,firmware";
-			vbmeta {
-				compatible = "android,vbmeta";
-				parts = "vbmeta,boot,system,vendor,dtbo";
-			};
-
-			fstab {
-				compatible = "android,fstab";
-				vendor {
-					compatible = "android,vendor";
-					dev = "/dev/block/platform/soc/4744000.sdhci/by-name/vendor";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,discard";
-					fsmgr_flags = "wait,slotselect,avb";
-					status = "ok";
-				};
-			};
-		};
-	};
-
 	sram: sram@fd04480 {
 		#address-cells = <2>;
 		#size-cells = <2>;
@@ -287,6 +262,32 @@
 	};
 };
 
+&firmware {
+	scm {
+		compatible = "qcom,scm";
+	};
+
+	android {
+		compatible = "android,firmware";
+		vbmeta {
+			compatible = "android,vbmeta";
+			parts = "vbmeta,boot,system,vendor,dtbo";
+		};
+
+		fstab {
+			compatible = "android,fstab";
+			vendor {
+				compatible = "android,vendor";
+				dev = "/dev/block/platform/soc/4744000.sdhci/by-name/vendor";
+				type = "ext4";
+				mnt_flags = "ro,barrier=1,discard";
+				fsmgr_flags = "wait,slotselect,avb";
+				status = "ok";
+			};
+		};
+	};
+};
+
 &reserved_memory {
 	#address-cells = <2>;
 	#size-cells = <2>;