arm64: dts: fixes

The first patch in this series changes the IOMMU specification for the IPA node in "sc7180.dtsi" to identify two streams distinctly, rather than specifying them with a mask. This was inspired by something Bjorn did recently for IPA in "sdm845.dtsi".

The second and third just replace 0 with GIC_SPI in two IPA interrupt specifications.

(I'm sorry if I should have separated these.)

-Alex

Alex Elder (3):
arm64: dts: qcom: sc7180: limit IPA iommu streams
arm64: dts: qcom: sc7180: use GIC_SPI for IPA interrupts
arm64: dts: qcom: sdm845: use GIC_SPI for IPA interrupts

 arch/arm64/boot/dts/qcom/sc7180.dtsi | 7 ++++---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

2.20.1

Recently we learned that Android and Windows firmware don't seem to like using 3 as an iommu mask value for IPA. A simple fix was to specify exactly the streams needed explicitly, rather than implying a range with the mask. Make the same change for the SC7180 platform.

See also:
https://lore.kernel.org/linux-arm-msm/[email protected]/

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index c0efb101b0d61..eb66aadf360d7 100644
@@ -1396,7 +1396,8 @@
 		ipa: ipa@1e40000 {
 			compatible = "qcom,sc7180-ipa";
 
-			iommus = <&apps_smmu 0x440 0x3>;
+			iommus = <&apps_smmu 0x440 0x0>,
+				 <&apps_smmu 0x442 0x0>;
 			reg = <0 0x1e40000 0 0x7000>,
 			      <0 0x1e47000 0 0x2000>,
 			      <0 0x1e04000 0 0x2c000>;

2.20.1

Use GIC_SPI rather than 0 in the specifiers for the two ARM GIC interrupts used by IPA.

---
 arch/arm64/boot/dts/qcom/sc7180.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index eb66aadf360d7..fa379bfaa443a 100644
@@ -1405,8 +1405,8 @@
 				    "ipa-shared",
 				    "gsi";
 
-			interrupts-extended = <&intc 0 311 IRQ_TYPE_EDGE_RISING>,
-					      <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>,
+			interrupts-extended = <&intc GIC_SPI 311 IRQ_TYPE_EDGE_RISING>,
+					      <&intc GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH>,
 					      <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
 					      <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "ipa",

2.20.1

Use GIC_SPI rather than 0 in the specifiers for the two ARM GIC interrupts used by IPA.

---
 arch/arm64/boot/dts/qcom/sdm845.dtsi | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

index 957ee80704e74..256a698745ac2 100644
@@ -2152,8 +2152,8 @@
 				    "ipa-shared",
 				    "gsi";
 
-			interrupts-extended = <&intc 0 311 IRQ_TYPE_EDGE_RISING>,
-					      <&intc 0 432 IRQ_TYPE_LEVEL_HIGH>,
+			interrupts-extended = <&intc GIC_SPI 311 IRQ_TYPE_EDGE_RISING>,
+					      <&intc GIC_SPI 432 IRQ_TYPE_LEVEL_HIGH>,
 					      <&ipa_smp2p_in 0 IRQ_TYPE_EDGE_RISING>,
 					      <&ipa_smp2p_in 1 IRQ_TYPE_EDGE_RISING>;
 			interrupt-names = "ipa",

2.20.1