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

Commit 83a336db authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: qcom: add dt entry needed for avb"

parents 85680faa 6ba544af

bindings/arm/msm/android.txt

0 → 100644
+118 −0
Original line number Diff line number Diff line 
Android firmware



Node to specify early mount of vendor and system partition.



Required properties



-compatible: "android,firmware"



Child nodes:

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



fstab:

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



fstab entry to specify mount attributes of vendor partition.



Required properties:



-compatible: "android,fstab"



Child nodes:

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



vendor:

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



vendor partition specification.



Required properties:



-compatible: "android, vendor"

-dev: block device corresponding to vendor partition

-type: file system type of vendor partition

-mnt_flags: mount flags

-fsmgr_flags: fsmgr flags



Example:



	firmware: firmware {

		android {

			compatible = "android,firmware";

			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vendor";

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

					type = "ext4";

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

					fsmgr_flags = "wait,slotselect";

					status = "ok";

				};

			};

		};

	};



odm:

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



odm partition specification.



Required properties:



-compatible: "android, odm"

-dev: block device corresponding to odm partition

-type: file system type of odm partition

-mnt_flags: mount flags

-fsmgr_flags: fsmgr flags



Example:



       firmware: firmware {

               android {

                       compatible = "android,firmware";

                       fstab {

                               compatible = "android,fstab";

                               odm {

                                       compatible = "android,odm";

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

                                       type = "ext4";

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

                                       fsmgr_flags = "wait,slotselect";

                                       status = "ok";

                               };

                       };

               };

       };



system:

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



system partition specification.



Required properties:



-compatible: "android,system"

-dev: block device corresponding to system partition

-type: file system type of system partition

-mnt_flags: mount flags

-fsmgr_flags: fsmgr flags



Example:



        firmware: firmware {

                android {

                        compatible = "android,firmware";

                        fstab {

                                compatible = "android,fstab";

                                system {

                                        compatible = "android,system";

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

                                        type = "ext4";

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

                                        fsmgr_flags = "wait,slotselect";

                                        status = "ok";

                                };

                        };

                };

        };

bindings/firmware/qcom,scm.txt

+25 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ Required properties: 
 * "qcom,scm-sm8150"

 and:

 * "qcom,scm"

 * "android,firmware" for firmware image

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

- clocks: Specifies clocks needed by the SCM interface, if any:

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

   "qcom,scm-msm8960"
@@ -42,3 +44,26 @@ Example for MSM8916: 
			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";

				};

			};

		};

	};

bindings/vendor-prefixes.yaml

+2 −0
Original line number Diff line number Diff line
@@ -81,6 +81,8 @@ patternProperties: 
    description: Analogix Semiconductor, Inc.

  "^andestech,.*":

    description: Andes Technology Corporation

  "^android,.*":

    description: Google Inc.

  "^apm,.*":

    description: Applied Micro Circuits Corporation (APM)

  "^aptina,.*":

qcom/lahaina.dtsi

+27 −6
Original line number Diff line number Diff line
@@ -245,6 +245,33 @@ 


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

					type = "ext4";

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

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

				};

			};

		};

	};



	reserved_memory: reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;
@@ -385,12 +412,6 @@ 
	};



	chosen { };



	firmware: firmware {

		scm {

			compatible = "qcom,scm";

		};

	};

};



&soc {