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

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

Merge "ARM: dts: msm: enable vbmeta"

parents 89476a58 b8fe407b

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

+25 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,8 @@ Required properties: 
 * "qcom,scm-msm8996" for MSM8996 platforms

 * "qcom,scm-msm8996" for MSM8996 platforms

 * "qcom,scm-ipq4019" for IPQ4019 platforms

 * "qcom,scm-ipq4019" for IPQ4019 platforms

 * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc)

 * "qcom,scm" for later processors (MSM8916, APQ8084, MSM8974, etc)

 * "android,firmware" for firmware image

 * "android,vbmeta" for setting system properties for verified boot.

- clocks: One to three clocks may be required based on compatible.

- clocks: One to three clocks may be required based on compatible.

 * No clock required for "qcom,scm-msm8996", "qcom,scm-ipq4019"

 * No clock required for "qcom,scm-msm8996", "qcom,scm-ipq4019"

 * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960"

 * Only core clock required for "qcom,scm-apq8064", "qcom,scm-msm8660", and "qcom,scm-msm8960"
@@ -31,3 +33,26 @@ Example for MSM8916: 
			clock-names = "core", "bus", "iface";

			clock-names = "core", "bus", "iface";

		};

		};

	};

	};



Example for SM6150:



firmware: firmware {

		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/1d84000.ufshc/by-name/vendor";

					type = "ext4";

					mnt_flags = "ro,barrier=1,discard";

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

				};

			};

		};

	};

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

+5 −0
Original line number Original line Diff line number Diff line
@@ -419,6 +419,11 @@ 
	firmware: firmware {

	firmware: firmware {

		android {

		android {

			compatible = "android,firmware";

			compatible = "android,firmware";

			vbmeta {

				compatible = "android,vbmeta";

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

			};



			fstab {

			fstab {

				compatible = "android,fstab";

				compatible = "android,fstab";

				vendor {

				vendor {