summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitchel Humpherys <mitchelh@codeaurora.org>2016-06-07 16:57:46 -0700
committerLiam Mark <lmark@codeaurora.org>2016-09-26 17:42:54 -0700
commit6d8633dc8ac07ed74f287f07e6aaadd2fcb667f2 (patch)
treee43b86d4e3b6fcccb13f7b9e4367aff21a5d0628
parentd26998e8f44902620e0b956346fbc52dd8c2d928 (diff)
icnss: Remove obsolete IOMMU domain attribute
The DOMAIN_ATTR_COHERENT_HTW_DISABLE IOMMU domain attribute is being removed. SMMU coherency will be configured through the SMMU device tree nodes moving forward. Remove the obsolete option. Change-Id: I1ec7126144c41fa4215405e632d1d7b61de057bc Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>
-rw-r--r--drivers/soc/qcom/icnss.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/soc/qcom/icnss.c b/drivers/soc/qcom/icnss.c
index 232ee28318e7..fb37063a7a7f 100644
--- a/drivers/soc/qcom/icnss.c
+++ b/drivers/soc/qcom/icnss.c
@@ -3343,7 +3343,6 @@ static void icnss_bw_deinit(struct icnss_priv *priv)
static int icnss_smmu_init(struct icnss_priv *priv)
{
struct dma_iommu_mapping *mapping;
- int disable_htw = 1;
int atomic_ctx = 1;
int s1_bypass = 1;
int ret = 0;
@@ -3360,15 +3359,6 @@ static int icnss_smmu_init(struct icnss_priv *priv)
}
ret = iommu_domain_set_attr(mapping->domain,
- DOMAIN_ATTR_COHERENT_HTW_DISABLE,
- &disable_htw);
- if (ret < 0) {
- icnss_pr_err("Set disable_htw attribute failed, err = %d\n",
- ret);
- goto set_attr_fail;
- }
-
- ret = iommu_domain_set_attr(mapping->domain,
DOMAIN_ATTR_ATOMIC,
&atomic_ctx);
if (ret < 0) {