summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Reding <treding@nvidia.com>2014-08-07 18:29:48 +0200
committerThierry Reding <treding@nvidia.com>2014-08-07 18:29:48 +0200
commit8a6eb8695620b2336fbff4c26b229b7c69f1b41a (patch)
treeb1b065fb0beeede6aaea5a7f9700234a4ec1b1d6
parentb2a0475bfff36e3cf419a2c8bf8f87e16f43b1cc (diff)
HACK: disable SDHCI IOMMU integration for nowstaging/work
The patches to support deferred probe are probably not going to be merged in this form, so we're back to relying on probe order for this to work. Signed-off-by: Thierry Reding <treding@nvidia.com>
-rw-r--r--drivers/mmc/host/sdhci-tegra.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c
index b884614fa4e6..20a30db84af8 100644
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@ -239,9 +239,11 @@ static int sdhci_tegra_probe(struct platform_device *pdev)
if (!match)
return -EINVAL;
+ /*
rc = iommu_attach(&pdev->dev);
if (rc < 0)
return rc;
+ */
soc_data = match->data;
@@ -316,7 +318,9 @@ static int sdhci_tegra_remove(struct platform_device *pdev)
clk_disable_unprepare(pltfm_host->clk);
clk_put(pltfm_host->clk);
+ /*
iommu_detach(&pdev->dev);
+ */
sdhci_pltfm_free(pdev);