diff --git a/drivers/iommu/arm-smmu.c b/drivers/iommu/arm-smmu.c
index baa6e23e9c44..19d30e9df2a3 100644
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -221,9 +221,6 @@ static bool is_iommu_pt_coherent(struct arm_smmu_domain *smmu_domain)
 	if (test_bit(DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT,
 		     smmu_domain->attributes))
 		return true;
-	else if (test_bit(DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT,
-			  smmu_domain->attributes))
-		return false;
 	else if (smmu_domain->smmu && smmu_domain->smmu->dev)
 		return dev_is_dma_coherent(smmu_domain->smmu->dev);
 	else
@@ -2934,9 +2931,6 @@ static int arm_smmu_setup_default_domain(struct device *dev,
 	if (!strcmp(str, "coherent"))
 		__arm_smmu_domain_set_attr(domain,
 			DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT, &attr);
-	else if (!strcmp(str, "non-coherent"))
-		__arm_smmu_domain_set_attr(domain,
-			DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT, &attr);
 	else if (!strcmp(str, "LLC"))
 		__arm_smmu_domain_set_attr(domain,
 			DOMAIN_ATTR_USE_UPSTREAM_HINT, &attr);
@@ -3789,12 +3783,6 @@ static int arm_smmu_domain_get_attr(struct iommu_domain *domain,
 					  smmu_domain->attributes);
 		ret = 0;
 		break;
-	case DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT:
-		*((int *)data) =
-			test_bit(DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT,
-				 smmu_domain->attributes);
-		ret = 0;
-		break;
 	case DOMAIN_ATTR_FAULT_MODEL_NO_CFRE:
 	case DOMAIN_ATTR_FAULT_MODEL_NO_STALL:
 	case DOMAIN_ATTR_FAULT_MODEL_HUPCF:
@@ -4043,24 +4031,6 @@ static int __arm_smmu_domain_set_attr2(struct iommu_domain *domain,
 		}
 		break;
 	}
-	case DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT: {
-		int force_non_coherent = *((int *)data);
-
-		if (smmu_domain->smmu != NULL) {
-			dev_err(smmu_domain->smmu->dev,
-				"cannot change force non-coherent attribute while attached\n");
-			ret = -EBUSY;
-		} else if (force_non_coherent) {
-			set_bit(DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT,
-				smmu_domain->attributes);
-			ret = 0;
-		} else {
-			clear_bit(DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT,
-				  smmu_domain->attributes);
-			ret = 0;
-		}
-		break;
-	}
 	case DOMAIN_ATTR_SPLIT_TABLES: {
 		int split_tables = *((int *)data);
 		/* can't be changed while attached */
diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 3fb3d62ddc97..75cc2de0ac1a 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -191,13 +191,12 @@ enum iommu_attr {
 #define DOMAIN_ATTR_EARLY_MAP			(EXTENDED_ATTR_BASE + 13)
 #define DOMAIN_ATTR_PAGE_TABLE_IS_COHERENT	(EXTENDED_ATTR_BASE + 14)
 #define DOMAIN_ATTR_PAGE_TABLE_FORCE_COHERENT	(EXTENDED_ATTR_BASE + 15)
-#define DOMAIN_ATTR_PAGE_TABLE_FORCE_NON_COHERENT (EXTENDED_ATTR_BASE + 16)
-#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 17)
-#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 18)
-#define DOMAIN_ATTR_FAULT_MODEL_NO_CFRE		(EXTENDED_ATTR_BASE + 19)
-#define DOMAIN_ATTR_FAULT_MODEL_NO_STALL	(EXTENDED_ATTR_BASE + 20)
-#define DOMAIN_ATTR_FAULT_MODEL_HUPCF		(EXTENDED_ATTR_BASE + 21)
-#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 22)
+#define DOMAIN_ATTR_USE_LLC_NWA			(EXTENDED_ATTR_BASE + 16)
+#define DOMAIN_ATTR_SPLIT_TABLES		(EXTENDED_ATTR_BASE + 17)
+#define DOMAIN_ATTR_FAULT_MODEL_NO_CFRE		(EXTENDED_ATTR_BASE + 18)
+#define DOMAIN_ATTR_FAULT_MODEL_NO_STALL	(EXTENDED_ATTR_BASE + 19)
+#define DOMAIN_ATTR_FAULT_MODEL_HUPCF		(EXTENDED_ATTR_BASE + 20)
+#define DOMAIN_ATTR_EXTENDED_MAX		(EXTENDED_ATTR_BASE + 21)
 
 /* These are the possible reserved region types */
 enum iommu_resv_type {