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

Commit dffa9104 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Mount the system partition during early init"

parents 56d47f9e fa10cc3b

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

0 → 100644
+86 −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";

				};

			};

		};

	};



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

                                };

                        };

                };

        };

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ amd Advanced Micro Devices (AMD), Inc. 
amlogic	Amlogic, Inc.

ams	AMS AG

amstaos	AMS-Taos Inc.

android	Google Inc.

apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

armadeus	ARMadeus Systems SARL

arch/arm/boot/dts/qcom/msm8917.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -49,6 +49,32 @@ 
		sdhc2 = &sdhc_2; /* SDC2 for SD card */

	};



	firmware: firmware {

		android {

			compatible = "android,firmware";

			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vendor";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};

				 system {

					compatible = "android,system";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};



			};

		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

arch/arm/boot/dts/qcom/msm8937.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -25,6 +25,32 @@ 
		bootargs = "sched_enable_hmp=1";

	};



	firmware: firmware {

		android {

			compatible = "android,firmware";

			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vendor";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};

				system {

					compatible = "android,system";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};



			};

		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;

arch/arm/boot/dts/qcom/msm8953.dtsi

+26 −0
Original line number Diff line number Diff line
@@ -26,6 +26,32 @@ 
		bootargs = "sched_enable_hmp=1 sched_enable_power_aware=1";

	};



	firmware: firmware {

		android {

			compatible = "android,firmware";

			fstab {

				compatible = "android,fstab";

				vendor {

					compatible = "android,vendor";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/vendor";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};

				system {

					compatible = "android,system";

					dev = "/dev/block/platform/soc/7824900.sdhci/by-name/system";

					type = "ext4";

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

					fsmgr_flags = "wait";

					status = "ok";

				};



			};

		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;