[PATCH 1/2] Revert "iommu/arm-smmu: Add support for qcom, smmu-v2 variant"
Paolo Pisati
paolo.pisati at canonical.com
Thu Aug 29 12:32:13 UTC 2019
BugLink: https://bugs.launchpad.net/bugs/1841893
This reverts commit e6e581c4a4d8131e2eabeaf962d3ae5aa0c52872.
Signed-off-by: Paolo Pisati <paolo.pisati at canonical.com>
---
drivers/iommu/arm-smmu.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index 501572d..9bbbef0 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -129,7 +129,6 @@ enum arm_smmu_implementation {
GENERIC_SMMU,
ARM_MMU500,
CAVIUM_SMMUV2,
- QCOM_SMMUV2,
};
struct arm_smmu_s2cr {
@@ -2050,7 +2049,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 },
@@ -2059,7 +2057,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);
--
2.7.4
More information about the kernel-team
mailing list