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

Commit 60b43a06 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: Early mount of vendor partition for SDM845"

parents 644503f2 cce5d0be
Loading
Loading
Loading
Loading
+6 −1
Original line number Diff line number Diff line
@@ -13,8 +13,13 @@
/dts-v1/;
/plugin/;

#include "sdm845.dtsi"
#include <dt-bindings/clock/qcom,gcc-sdm845.h>
#include <dt-bindings/clock/qcom,camcc-sdm845.h>
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm845-cdp.dtsi"
#include "sdm845-qupv3.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDM845 v1 CDP";
+6 −1
Original line number Diff line number Diff line
@@ -13,8 +13,13 @@
/dts-v1/;
/plugin/;

#include "sdm845.dtsi"
#include <dt-bindings/clock/qcom,gcc-sdm845.h>
#include <dt-bindings/clock/qcom,camcc-sdm845.h>
#include <dt-bindings/clock/qcom,rpmh.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>

#include "sdm845-mtp.dtsi"
#include "sdm845-qupv3.dtsi"

/ {
	model = "Qualcomm Technologies, Inc. SDM845 v1 MTP";
+16 −0
Original line number Diff line number Diff line
@@ -459,6 +459,22 @@
		compatible = "simple-bus";
	};

	firmware: firmware {
		android {
			compatible = "android,firmware";
			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";
				};
			};
		};
	};

	reserved-memory {
		#address-cells = <2>;
		#size-cells = <2>;