Merge "ARM: dts: msm: Add core-hang detect nodes to SDMSHRIKE"

This commit is contained in:
qctecmdr 2021-02-03 19:56:15 -08:00 • committed by Gerrit - the friendly Code Review server
commit 1f104999b5
2 changed files with 79 additions and 3 deletions

View file

@ -420,10 +420,12 @@
reg = <0x0 0x98900000 0x0 0x1400000>;
};
qseecom_mem: qseecom_region@0x9e400000 {
qseecom_mem: qseecom_region {
compatible = "shared-dma-pool";
no-map;
reg = <0x0 0x9e400000 0x0 0x1400000>;
alloc-ranges = <0x0 0x00000000 0x0 0xffffffff>;
reusable;
alignment = <0x0 0x400000>;
size = <0x0 0x1400000>;
};
@ -881,6 +883,18 @@
cap-based-alloc-and-pwr-collapse;
};
wdog: qcom,wdt@17c10000 {
compatible = "qcom,msm-watchdog";
reg = <0x17c10000 0x1000>;
reg-names = "wdt-base";
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
qcom,bark-time = <11000>;
qcom,pet-time = <9360>;
qcom,ipi-ping;
qcom,wakeup-enable;
};
qcom,msm-imem@146bf000 {
compatible = "qcom,msm-imem";
reg = <0x146bf000 0x1000>;
@ -935,6 +949,13 @@
&mc_virt SLAVE_EBI1>;
};
restart@c264000 {
compatible = "qcom,pshold";
reg = <0xc264000 0x4>,
<0x1fd3000 0x4>;
reg-names = "pshold-base", "tcsr-boot-misc-detect";
};
qcom,mpm2-sleep-counter@c221000 {
compatible = "qcom,mpm2-sleep-counter";
reg = <0xc221000 0x1000>;
@ -1901,6 +1922,24 @@
qcom,firmware-name = "venus";
memory-region = <&pil_video_mem>;
};
qcom,chd_silver {
compatible = "qcom,core-hang-detect";
label = "silver";
qcom,threshold-arr = <0x18000058 0x18010058
0x18020058 0x18030058>;
qcom,config-arr = <0x18000060 0x18010060
0x18020060 0x18030060>;
};
qcom,chd_gold {
compatible = "qcom,core-hang-detect";
label = "gold";
qcom,threshold-arr = <0x18040058 0x18050058
0x18060058 0x18070058>;
qcom,config-arr = <0x18040060 0x18050060
0x18060060 0x18070060>;
};
};
#include "sdmshrike-pinctrl.dtsi"

View file

@ -1002,6 +1002,13 @@
interrupts = <GIC_PPI 5 IRQ_TYPE_LEVEL_HIGH>;
};
restart@c264000 {
compatible = "qcom,pshold";
reg = <0xc264000 0x4>,
<0x1fd3000 0x4>;
reg-names = "pshold-base", "tcsr-boot-misc-detect";
};
qcom,msm-rtb {
compatible = "qcom,msm-rtb";
qcom,rtb-size = <0x100000>;
@ -2238,6 +2245,36 @@
reg-names = "llcc_base", "llcc_broadcast_base";
cap-based-alloc-and-pwr-collapse;
};
wdog: qcom,wdt@17c10000 {
compatible = "qcom,msm-watchdog";
reg = <0x17c10000 0x1000>;
reg-names = "wdt-base";
interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;
qcom,bark-time = <11000>;
qcom,pet-time = <9360>;
qcom,ipi-ping;
qcom,wakeup-enable;
};
qcom,chd_sliver {
compatible = "qcom,core-hang-detect";
label = "silver";
qcom,threshold-arr = <0x18000058 0x18010058
0x18020058 0x18030058>;
qcom,config-arr = <0x18000060 0x18010060
0x18020060 0x18030060>;
};
qcom,chd_gold {
compatible = "qcom,core-hang-detect";
label = "gold";
qcom,threshold-arr = <0x18040058 0x18050058
0x18060058 0x18070058>;
qcom,config-arr = <0x18040060 0x18050060
0x18060060 0x18070060>;
};
};
&firmware {