ARM64: dts: qcom: xiaomi: Move all devices to second stage init

Change-Id: Ia7642d730b0a68e045f19c6a3fd00ce3c8844379
NewtoPhone · Mar 3, 2024 · 96dfba3 · 96dfba3
1 parent 2fe803a
commit 96dfba3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 18 deletions.
diff --git a/arch/arm64/boot/dts/qcom/sdmmagpie.dtsi b/arch/arm64/boot/dts/qcom/sdmmagpie.dtsi
@@ -466,6 +466,7 @@
 
 	firmware: firmware {
 		android {
+			boot_devices = "soc/7c4000.sdhci";
 			compatible = "android,firmware";
 			vbmeta {
 				compatible = "android,vbmeta";
@@ -474,12 +475,7 @@
 			fstab {
 				compatible = "android,fstab";
 				vendor {
-					compatible = "android,vendor";
-					dev = "/dev/block/platform/soc/1d84000.ufshc/by-name/vendor";
-					type = "ext4";
-					mnt_flags = "ro,barrier=1,discard";
-					fsmgr_flags = "wait,slotselect,avb";
-					status = "ok";
+                        status = "disabled";
 				};
 			};
 		};

diff --git a/arch/arm64/boot/dts/xiaomi/violet/violet-sm6150.dtsi b/arch/arm64/boot/dts/xiaomi/violet/violet-sm6150.dtsi
@@ -22,24 +22,14 @@
 
 &firmware {
     android {
+        boot_devices = "soc/7c4000.sdhci";
         vbmeta {
             parts = "vbmeta,boot,recovery,system,vendor,dtbo";
         };
         fstab {
             vendor {
-		dev = "/dev/block/platform/soc/7c4000.sdhci/by-name/vendor";
-                fsmgr_flags = "wait,avb";
+                status = "disabled";
             };
-            persist {
-		compatible = "android,persist";
-		dev = "/dev/block/platform/soc/7c4000.sdhci/by-name/persist";
-		type = "ext4";
-		mnt_point = "/mnt/vendor/persist";
-		mnt_flags = "nosuid,nodev,noatime,barrier=1";
-		fsmgr_flags = "wait";
-		status = "ok";
-	    };
-
         };
     };
 };