| Message ID | 20230411-topic-straitlagoon_mdss-v2-13-5def73f50980@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | SM63(50|75) DPU support | expand |
On 21/04/2023 01:31, Konrad Dybcio wrote: > It got broken at some point, fix it up. > > Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> > --- > drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) This should probably come before patches 11 and 12. > > diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > index 2daaa600ac75..e64c737724c4 100644 > --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c > @@ -251,12 +251,12 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = { > { .compatible = "qcom,sc7280-mss-pil" }, > { .compatible = "qcom,sc8180x-mdss" }, > { .compatible = "qcom,sc8280xp-mdss" }, > - { .compatible = "qcom,sm8150-mdss" }, > - { .compatible = "qcom,sm8250-mdss" }, > { .compatible = "qcom,sdm845-mdss" }, > { .compatible = "qcom,sdm845-mss-pil" }, > { .compatible = "qcom,sm6350-mdss" }, > { .compatible = "qcom,sm6375-mdss" }, > + { .compatible = "qcom,sm8150-mdss" }, > + { .compatible = "qcom,sm8250-mdss" }, > { } > }; > >
diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c index 2daaa600ac75..e64c737724c4 100644 --- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c @@ -251,12 +251,12 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = { { .compatible = "qcom,sc7280-mss-pil" }, { .compatible = "qcom,sc8180x-mdss" }, { .compatible = "qcom,sc8280xp-mdss" }, - { .compatible = "qcom,sm8150-mdss" }, - { .compatible = "qcom,sm8250-mdss" }, { .compatible = "qcom,sdm845-mdss" }, { .compatible = "qcom,sdm845-mss-pil" }, { .compatible = "qcom,sm6350-mdss" }, { .compatible = "qcom,sm6375-mdss" }, + { .compatible = "qcom,sm8150-mdss" }, + { .compatible = "qcom,sm8250-mdss" }, { } };
It got broken at some point, fix it up. Signed-off-by: Konrad Dybcio <konrad.dybcio@linaro.org> --- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)