Skip to content

Commit f011688

Browse files
lweiss-fairphoneandersson
authored andcommitted
arm64: dts: qcom: Fix type of "wdog" IRQs for remoteprocs
The code in qcom_q6v5_init() requests the "wdog" IRQ as IRQF_TRIGGER_RISING. If dt defines the interrupt type as LEVEL_HIGH then the driver will have issues getting the IRQ again after probe deferral with an error like: irq: type mismatch, failed to map hwirq-14 for interrupt-controller@b220000! Fix that by updating the devicetrees to use IRQ_TYPE_EDGE_RISING for these interrupts, as is already used in most dt's. Also the driver was already using the interrupts with that type. Fixes: 3658e41 ("arm64: dts: qcom: sc7280: Add ADSP node") Fixes: df62402 ("arm64: dts: qcom: sc7280: Add CDSP node") Fixes: 152d1fa ("arm64: dts: qcom: add SC8280XP platform") Fixes: 8eb5287 ("arm64: dts: qcom: sm6350: Add CDSP nodes") Fixes: efc33c9 ("arm64: dts: qcom: sm6350: Add ADSP nodes") Fixes: fe6fd26 ("arm64: dts: qcom: sm6375: Add ADSP&CDSP") Fixes: 23a8903 ("arm64: dts: qcom: sm8250: Add remoteprocs") Signed-off-by: Luca Weiss <[email protected]> Link: https://lore.kernel.org/r/[email protected] [bjorn: Added fixes references] Signed-off-by: Bjorn Andersson <[email protected]>
1 parent 4cece76 commit f011688

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

arch/arm64/boot/dts/qcom/sc7280.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3707,7 +3707,7 @@
37073707
compatible = "qcom,sc7280-adsp-pas";
37083708
reg = <0 0x03700000 0 0x100>;
37093709

3710-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
3710+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
37113711
<&adsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
37123712
<&adsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
37133713
<&adsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -3944,7 +3944,7 @@
39443944
compatible = "qcom,sc7280-cdsp-pas";
39453945
reg = <0 0x0a300000 0 0x10000>;
39463946

3947-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
3947+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
39483948
<&cdsp_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
39493949
<&cdsp_smp2p_in 1 IRQ_TYPE_EDGE_RISING>,
39503950
<&cdsp_smp2p_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sc8280xp.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,7 +2641,7 @@
26412641
compatible = "qcom,sc8280xp-adsp-pas";
26422642
reg = <0 0x03000000 0 0x100>;
26432643

2644-
interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_LEVEL_HIGH>,
2644+
interrupts-extended = <&intc GIC_SPI 162 IRQ_TYPE_EDGE_RISING>,
26452645
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
26462646
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
26472647
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -4977,7 +4977,7 @@
49774977
compatible = "qcom,sc8280xp-nsp0-pas";
49784978
reg = <0 0x1b300000 0 0x100>;
49794979

4980-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
4980+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
49814981
<&smp2p_nsp0_in 0 IRQ_TYPE_EDGE_RISING>,
49824982
<&smp2p_nsp0_in 1 IRQ_TYPE_EDGE_RISING>,
49834983
<&smp2p_nsp0_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -5108,7 +5108,7 @@
51085108
compatible = "qcom,sc8280xp-nsp1-pas";
51095109
reg = <0 0x21300000 0 0x100>;
51105110

5111-
interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_LEVEL_HIGH>,
5111+
interrupts-extended = <&intc GIC_SPI 887 IRQ_TYPE_EDGE_RISING>,
51125112
<&smp2p_nsp1_in 0 IRQ_TYPE_EDGE_RISING>,
51135113
<&smp2p_nsp1_in 1 IRQ_TYPE_EDGE_RISING>,
51145114
<&smp2p_nsp1_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm6350.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@
12521252
compatible = "qcom,sm6350-adsp-pas";
12531253
reg = <0 0x03000000 0 0x100>;
12541254

1255-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
1255+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
12561256
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
12571257
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
12581258
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -1511,7 +1511,7 @@
15111511
compatible = "qcom,sm6350-cdsp-pas";
15121512
reg = <0 0x08300000 0 0x10000>;
15131513

1514-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
1514+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
15151515
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
15161516
<&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
15171517
<&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm6375.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1561,7 +1561,7 @@
15611561
compatible = "qcom,sm6375-adsp-pas";
15621562
reg = <0 0x0a400000 0 0x100>;
15631563

1564-
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_LEVEL_HIGH>,
1564+
interrupts-extended = <&intc GIC_SPI 282 IRQ_TYPE_EDGE_RISING>,
15651565
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
15661566
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
15671567
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,

arch/arm64/boot/dts/qcom/sm8250.dtsi

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3062,7 +3062,7 @@
30623062
compatible = "qcom,sm8250-slpi-pas";
30633063
reg = <0 0x05c00000 0 0x4000>;
30643064

3065-
interrupts-extended = <&pdc 9 IRQ_TYPE_LEVEL_HIGH>,
3065+
interrupts-extended = <&pdc 9 IRQ_TYPE_EDGE_RISING>,
30663066
<&smp2p_slpi_in 0 IRQ_TYPE_EDGE_RISING>,
30673067
<&smp2p_slpi_in 1 IRQ_TYPE_EDGE_RISING>,
30683068
<&smp2p_slpi_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -3766,7 +3766,7 @@
37663766
compatible = "qcom,sm8250-cdsp-pas";
37673767
reg = <0 0x08300000 0 0x10000>;
37683768

3769-
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_LEVEL_HIGH>,
3769+
interrupts-extended = <&intc GIC_SPI 578 IRQ_TYPE_EDGE_RISING>,
37703770
<&smp2p_cdsp_in 0 IRQ_TYPE_EDGE_RISING>,
37713771
<&smp2p_cdsp_in 1 IRQ_TYPE_EDGE_RISING>,
37723772
<&smp2p_cdsp_in 2 IRQ_TYPE_EDGE_RISING>,
@@ -5928,7 +5928,7 @@
59285928
compatible = "qcom,sm8250-adsp-pas";
59295929
reg = <0 0x17300000 0 0x100>;
59305930

5931-
interrupts-extended = <&pdc 6 IRQ_TYPE_LEVEL_HIGH>,
5931+
interrupts-extended = <&pdc 6 IRQ_TYPE_EDGE_RISING>,
59325932
<&smp2p_adsp_in 0 IRQ_TYPE_EDGE_RISING>,
59335933
<&smp2p_adsp_in 1 IRQ_TYPE_EDGE_RISING>,
59345934
<&smp2p_adsp_in 2 IRQ_TYPE_EDGE_RISING>,

0 commit comments

Comments
 (0)