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

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

Merge "ARM: dts: msm: Enable new download/restart mode drivers for Shima"

parents cda462d6 547d8382
Loading
Loading
Loading
Loading
+8 −0
Original line number Diff line number Diff line
@@ -501,3 +501,11 @@
	io-channels = <&pmk8350_vadc PMR735B_ADC7_DIE_TEMP>;
	io-channel-names = "thermal";
};

&soc {
	reboot_reason {
		compatible = "qcom,reboot-reason";
		nvmem-cells = <&restart_reason>;
		nvmem-cell-names = "restart_reason";
	};
};
+8 −4
Original line number Diff line number Diff line
@@ -422,6 +422,7 @@
	firmware: firmware {
		scm {
			compatible = "qcom,scm";
			qcom,dload-mode = <&tcsr 0x13000>;
		};

		android {
@@ -992,6 +993,11 @@
		#hwlock-cells = <1>;
	};

	tcsr: syscon@1fc0000 {
		compatible = "syscon";
		reg = <0x1fc0000 0x30000>;
	};

	smem: qcom,smem {
		compatible = "qcom,smem";
		memory-region = <&smem_mem>;
@@ -1792,10 +1798,8 @@
				0x18040060 0x18050060 0x18060060 0x18070060>;
	};

	restart: restart@c264000 {
		compatible = "qcom,pshold";
		reg = <0xc264000 0x4>, <0x1fd3000 0x4>;
		reg-names = "pshold-base", "tcsr-boot-misc-detect";
	dload_mode {
		compatible = "qcom,dload-mode";
	};

	cache-controller@9200000 {