Merge "ARM: dts: msm: Change the node location for optimization for Yupik" (3d4f5982) · Commits · e / devices / android_kernel_fairphone_FP5

qcom/yupik.dtsi

+196 −189

Original line number	Diff line number	Diff line
		@@ -32,8 +32,15 @@

		#address-cells = <2>;
		#size-cells = <2>;

		chosen {
		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";
		};

		memory { device_type = "memory"; reg = <0 0 0 0>; };

		reserved_memory: reserved-memory { };

		mem-offline {
		compatible = "qcom,mem-offline";
		offline-sizes = <0x1 0x40000000 0x0 0x40000000>,
		@@ -54,32 +61,7 @@
		swr2 = &swr2;
		};

		firmware: firmware {
		scm {
		compatible = "qcom,scm";
		qcom,dload-mode = <&tcsr 0x13000>;
		};
		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";
		};
		};
		};
		};
		firmware: firmware {};

		cpus {
		#address-cells = <2>;
		@@ -268,7 +250,39 @@
		};
		};

		reserved-memory {
		soc: soc { };

		};

		&firmware {
		scm {
		compatible = "qcom,scm";
		qcom,dload-mode = <&tcsr 0x13000>;
		};

		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 {
		#address-cells = <2>;
		#size-cells = <2>;
		ranges;
		@@ -465,13 +479,6 @@
		};
		};

		soc: soc { };

		chosen {
		bootargs = "log_buf_len=256K earlycon=msm_geni_serial,0x994000 rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";
		};
		};

		&soc {
		#address-cells = <1>;
		#size-cells = <1>;