From 94be92caece46ebb7eb67c25e50dc80475109546 Mon Sep 17 00:00:00 2001 From: Yadu MG Date: Wed, 29 Jul 2020 11:56:51 +0530 Subject: [PATCH] ARM: dts: msm: Fix wdog interrupts on pil subsystems for SM8150 On newer kernels PDC interrupt can only be requested if its actually routed through PDC HW. Update the pil subsystems interrupts to use intc interrupts when they are direct interrupts at GIC and only use PDC if it has routing to PDC HW. Also, add missing properties vdd_mx-supply and shutdown-ack to pil lpass node. Change-Id: Ie60515cd51e55ce0772d5d2c89a603b63ba44545 --- qcom/sm8150.dtsi | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/qcom/sm8150.dtsi b/qcom/sm8150.dtsi index e457858a76e5..2825173ad88c 100644 --- a/qcom/sm8150.dtsi +++ b/qcom/sm8150.dtsi @@ -1712,7 +1712,7 @@ qcom,complete-ramdump; /* Inputs from mss */ - interrupts-extended = <&pdc 0 266 1>, + interrupts-extended = <&intc GIC_SPI 266 IRQ_TYPE_LEVEL_HIGH>, <&modem_smp2p_in 0 0>, <&modem_smp2p_in 2 0>, <&modem_smp2p_in 1 0>, @@ -1740,7 +1740,9 @@ vdd_cx-supply = <&VDD_CX_LEVEL>; qcom,vdd_cx-uV-uA = ; - qcom,proxy-reg-names = "vdd_cx"; + vdd_mx-supply = <&VDD_MX_LEVEL>; + qcom,vdd_mx-uV-uA = ; + qcom,proxy-reg-names = "vdd_cx","vdd_mx"; clocks = <&rpmhcc RPMH_CXO_CLK>; clock-names = "xo"; @@ -1755,20 +1757,21 @@ memory-region = <&pil_adsp_mem>; qcom,signal-aop; qcom,complete-ramdump; - qcom,pil-force-shutdown; /* Inputs from lpass */ - interrupts-extended = <&pdc 0 162 1>, + interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>, <&adsp_smp2p_in 0 0>, <&adsp_smp2p_in 2 0>, <&adsp_smp2p_in 1 0>, - <&adsp_smp2p_in 3 0>; + <&adsp_smp2p_in 3 0>, + <&adsp_smp2p_in 7 0>; interrupt-names = "qcom,wdog", "qcom,err-fatal", "qcom,proxy-unvote", "qcom,err-ready", - "qcom,stop-ack"; + "qcom,stop-ack", + "qcom,shutdown-ack"; /* Outputs to lpass */ qcom,smem-states = <&adsp_smp2p_out 0>; @@ -1806,7 +1809,7 @@ qcom,complete-ramdump; /* Inputs from ssc */ - interrupts-extended = <&pdc 0 494 1>, + interrupts-extended = <&pdc 14 IRQ_TYPE_LEVEL_HIGH>, <&dsps_smp2p_in 0 0>, <&dsps_smp2p_in 2 0>, <&dsps_smp2p_in 1 0>,