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

Commit f05aab07 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: add vwatchdog and memdump for gvm on msm8996"

parents 12c0bc48 7632bd7e
Loading
Loading
Loading
Loading
+16 −0
Original line number Diff line number Diff line
@@ -73,6 +73,11 @@
			compatible = "qcom,msm-imem-boot_stats";
			reg = <0x6b0 32>;
		};

		mem_dump_table@10 {
			compatible = "qcom,msm-imem-mem_dump_table";
			reg = <0x10 8>;
		};
	};

	sdhc_2: sdhci@74a4900 {
@@ -869,4 +874,15 @@
		regulator-min-microvolt = <1800000>;
		regulator-max-microvolt = <2950000>;
	};

	wdog: qcom,wdt@9830000 {
		compatible = "qcom,msm-watchdog";
		reg = <0x9830000 0x1000>;
		reg-names = "wdt-base";
		interrupts = <0 28 0>, <0 29 0>;
		qcom,bark-time = <11000>;
		qcom,pet-time = <10000>;
		qcom,ipi-ping;
		qcom,wakeup-enable;
	};
};