diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-12-19 02:33:31 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-12-19 02:33:31 -0800 |
| commit | f05aab07b714d98cf39abb4fd9b89b3ee178dbcb (patch) | |
| tree | c937f65f6ad4a995b60acb796ee574bf61a5f145 | |
| parent | 12c0bc48ce59c99f70b1ff971105180016435342 (diff) | |
| parent | 7632bd7e037bd69ed79aa57117efcaf57752e241 (diff) | |
Merge "ARM: dts: msm: add vwatchdog and memdump for gvm on msm8996"
| -rw-r--r-- | arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi index aa20c781175c..24ac570b0374 100644 --- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi +++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996.dtsi @@ -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; + }; }; |