Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7b9cbeda authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "iommu/arm-smmu: Add support for qcom,smmu-v2 variant" 



This reverts commit 4e8ca0d4.

This is a preparation change for merging android-4.14-p.99 into
msm-4.14 branch.

The reverted change is part of msm-4.9 commit [1], which is imported
into msm-4.14 with [2]:

[1] f0d4e21 iommu/arm-smmu: program ACTLR register for qcom SMMUs
[2] 74fe5bb4 iommu/arm-smmu: Merge of iommu changes from msm-4.9 into msm-next

Change-Id: Ib16aaf93878e4d9517abdbfa197a11a64506dad6
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent b952da4f

drivers/iommu/arm-smmu.c

+0 −3
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ enum arm_smmu_implementation { 
	GENERIC_SMMU,

	ARM_MMU500,

	CAVIUM_SMMUV2,

	QCOM_SMMUV2,

};



/* Until ACPICA headers cover IORT rev. C */
@@ -1911,7 +1910,6 @@ ARM_SMMU_MATCH_DATA(smmu_generic_v2, ARM_SMMU_V2, GENERIC_SMMU); 
ARM_SMMU_MATCH_DATA(arm_mmu401, ARM_SMMU_V1_64K, GENERIC_SMMU);

ARM_SMMU_MATCH_DATA(arm_mmu500, ARM_SMMU_V2, ARM_MMU500);

ARM_SMMU_MATCH_DATA(cavium_smmuv2, ARM_SMMU_V2, CAVIUM_SMMUV2);

ARM_SMMU_MATCH_DATA(qcom_smmuv2, ARM_SMMU_V2, QCOM_SMMUV2);



static const struct of_device_id arm_smmu_of_match[] = {

	{ .compatible = "arm,smmu-v1", .data = &smmu_generic_v1 },
@@ -1920,7 +1918,6 @@ static const struct of_device_id arm_smmu_of_match[] = { 
	{ .compatible = "arm,mmu-401", .data = &arm_mmu401 },

	{ .compatible = "arm,mmu-500", .data = &arm_mmu500 },

	{ .compatible = "cavium,smmu-v2", .data = &cavium_smmuv2 },

	{ .compatible = "qcom,smmu-v2", .data = &qcom_smmuv2 },

	{ },

};

MODULE_DEVICE_TABLE(of, arm_smmu_of_match);