Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e29840c authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add vm-linux as chain partition for sm8150"

parents 81671c6b 6f8566f0

Documentation/devicetree/bindings/arm/msm/android.txt

+32 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,38 @@ Example: 
		};

		};

	};

	};





vm-linux:

-----------------



vm-linux partition specification.



Required properties:



-compatible: "android, vm-linux"

-dev: block device corresponding to vm-linux partition

-type: file system type of vm-linux partition

-mnt_flags: mount flags

-fsmgr_flags: fsmgr flags



Example:



	firmware: firmware {

		android {

			compatible = "android,firmware";

			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vm-linux";

					dev = "/dev/block/platform/soc/1da4000.ufshc/by-name/vm-linux";

					type = "emmc";

					mnt_flags = "ro";

					fsmgr_flags = "wait,slotselect";

					status = "";

				};

			};

		};

	};



system:

system:

-----------------

-----------------

Documentation/devicetree/bindings/firmware/qcom,scm.txt

+31 −0
Original line number Original line Diff line number Diff line
@@ -53,3 +53,34 @@ firmware: firmware { 
			};

			};

		};

		};

	};

	};



Example for SM8150:



firmware: firmware {

		android {

			compatible = "android,firmware";

			vbmeta {

				compatible = "android,vbmeta";

				parts = "vbmeta,boot,system,vendor,dtbo,vm-linux";

			};

			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";

				};

				vm-linux {

					compatible = "android,vm-linux";

					dev = "/dev/block/platform/soc/1d84000.ufshc/by-name/vm-linux";

					type = "emmc";

					mnt_flags = "ro";

					fsmgr_flags = "wait,slotselect";

					status = "";

				};

			};

		};

	};

arch/arm64/boot/dts/qcom/sm8150.dtsi

+9 −1
Original line number Original line Diff line number Diff line
@@ -576,7 +576,7 @@ 
			compatible = "android,firmware";

			compatible = "android,firmware";

			vbmeta {

			vbmeta {

				compatible = "android,vbmeta";

				compatible = "android,vbmeta";

				parts = "vbmeta,boot,system,vendor,dtbo";

				parts = "vbmeta,boot,system,vendor,dtbo,vm-linux";

			};

			};

			fstab {

			fstab {

				compatible = "android,fstab";

				compatible = "android,fstab";
@@ -588,6 +588,14 @@ 
					fsmgr_flags = "wait,slotselect,avb";

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

					status = "ok";

				};

				};

				vm-linux {

					compatible = "android,vm-linux";

					dev = "/dev/block/platform/soc/8804000.sdhci/by-name/vm-linux";

					type = "emmc";

					mnt_flags = "ro";

					fsmgr_flags = "wait,slotselect";

					status = "";

				};

			};

			};

		};

		};

	};

	};