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

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

Merge "ARM: dts: msm: Move firmware node ahead"

parents 53452e0a 0529d8ca

qcom/holi.dtsi

+175 −171
Original line number Diff line number Diff line
@@ -22,7 +22,13 @@ 


	#address-cells = <2>;

	#size-cells = <2>;



	chosen {

		bootargs = "log_buf_len=256K 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";
@@ -43,6 +49,8 @@ 
		swr1 = &swr1;

	};



	firmware: firmware {};



	cpus {

		#address-cells = <2>;

		#size-cells = <0>;
@@ -238,7 +246,49 @@ 
		};

	};



	reserved-memory {

	soc: soc { };



	sram: sram@fd04480 {

		#address-cells = <2>;

		#size-cells = <2>;

		compatible = "mmio-sram";

		reg = <0x0 0x0fd04480 0x0 0x80>;

		ranges = <0x0 0x0 0x0 0x0fd04480 0x0 0x80>;



		cpu_scp_lpri: scp-shmem@0 {

			compatible = "arm,scp-shmem";

			reg = <0x0 0x0 0x0 0x80>;

		};

	};

};



&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/4744000.sdhci/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;
@@ -406,52 +456,6 @@ 
	};

};



	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/4744000.sdhci/by-name/vendor";

					type = "ext4";

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

					fsmgr_flags = "wait,slotselect,avb";

					status = "ok";

				};

			};

		};

	};



	sram: sram@fd04480 {

		#address-cells = <2>;

		#size-cells = <2>;

		compatible = "mmio-sram";

		reg = <0x0 0x0fd04480 0x0 0x80>;

		ranges = <0x0 0x0 0x0 0x0fd04480 0x0 0x80>;



		cpu_scp_lpri: scp-shmem@0 {

			compatible = "arm,scp-shmem";

			reg = <0x0 0x0 0x0 0x80>;

		};

	};



	chosen {

		bootargs = "log_buf_len=256K rcupdate.rcu_expedited=1 rcu_nocbs=0-7 kpti=off";

	};

};



&soc {

	#address-cells = <1>;

	#size-cells = <1>;