]> git.itanic.dy.fi Git - linux-stable/commitdiff
ARM: dts: qcom: sdx55: Add Qcom SMMU-500 as the fallback for IOMMU node
authorManivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Mon, 23 Jan 2023 13:19:30 +0000 (18:49 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 10 Mar 2023 08:29:45 +0000 (09:29 +0100)
commit af4ab377543853b690cc85b4c46cf976ab560dc2 upstream.

SDX55 uses the Qcom version of the SMMU-500 IP. So use "qcom,smmu-500"
compatible as the fallback to the SoC specific compatible.

Cc: <stable@vger.kernel.org> # 5.12
Fixes: a2bdfdfba2af ("ARM: dts: qcom: sdx55: Enable ARM SMMU")
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
Link: https://lore.kernel.org/r/20230123131931.263024-3-manivannan.sadhasivam@linaro.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm/boot/dts/qcom-sdx55.dtsi

index f1c0dab409922ead9a41026946fa1b5c274bff90..93d71aff3fab79f069d7924b2d4e541a84048fd9 100644 (file)
@@ -578,7 +578,7 @@ pil-reloc@94c {
                };
 
                apps_smmu: iommu@15000000 {
-                       compatible = "qcom,sdx55-smmu-500", "arm,mmu-500";
+                       compatible = "qcom,sdx55-smmu-500", "qcom,smmu-500", "arm,mmu-500";
                        reg = <0x15000000 0x20000>;
                        #iommu-cells = <2>;
                        #global-interrupts = <1>;