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

Commit 92d026fa 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 f64ac0c2 1e09bb15
Loading
Loading
Loading
Loading
+241 −237
Original line number Diff line number Diff line
@@ -32,7 +32,13 @@

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

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

	memory { device_type = "memory"; reg = <0 0 0 0>; };
	reserved_memory: reserved-memory { };

	mem-offline {
		compatible = "qcom,mem-offline";
@@ -57,6 +63,8 @@
		usb1 = &usb1;
	};

	firmware: firmware {};

	cpus {
		#address-cells = <2>;
		#size-cells = <0>;
@@ -261,9 +269,10 @@
	};

	soc: soc { };
};


	firmware: firmware {
&firmware {
	scm {
		compatible = "qcom,scm";
		qcom,dload-mode = <&tcsr 0x13000>;
@@ -290,7 +299,7 @@
	};
};

	reserved_memory: reserved-memory {
&reserved_memory {
	#address-cells = <2>;
	#size-cells = <2>;
	ranges;
@@ -545,11 +554,6 @@
	};
};

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

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