Patched in Tegra support.

1 files changed, 7 insertions, 28 deletions

diff --git a/drivers/iommu/tegra-gart.c b/drivers/iommu/tegra-gart.c
index 8219f1d596e..c33557ce5a6 100644
--- a/drivers/iommu/tegra-gart.c
+++ b/drivers/iommu/tegra-gart.c
@@ -29,17 +29,15 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/iommu.h>
-#include <linux/of.h>
 
 #include <asm/cacheflush.h>
 
 /* bitmap of the page sizes currently supported */
 #define GART_IOMMU_PGSIZES      (SZ_4K)
 
-#define GART_REG_BASE           0x24
-#define GART_CONFIG             (0x24 - GART_REG_BASE)
-#define GART_ENTRY_ADDR         (0x28 - GART_REG_BASE)
-#define GART_ENTRY_DATA         (0x2c - GART_REG_BASE)
+#define GART_CONFIG             0x24
+#define GART_ENTRY_ADDR         0x28
+#define GART_ENTRY_DATA         0x2c
 #define GART_ENTRY_PHYS_ADDR_VALID      (1 << 31)
 
 #define GART_PAGE_SHIFT         12
@@ -165,11 +163,6 @@ static int gart_iommu_attach_dev(struct iommu_domain *domain,
                 return -EINVAL;
         domain->priv = gart;
 
-        domain->geometry.aperture_start = gart->iovmm_base;
-        domain->geometry.aperture_end   = gart->iovmm_base +
-                                        gart->page_count * GART_PAGE_SIZE - 1;
-        domain->geometry.force_aperture = true;
-
         client = devm_kzalloc(gart->dev, sizeof(*c), GFP_KERNEL);
         if (!client)
                 return -ENOMEM;
@@ -253,7 +246,7 @@ static int gart_iommu_map(struct iommu_domain *domain, unsigned long iova,
         pfn = __phys_to_pfn(pa);
         if (!pfn_valid(pfn)) {
                 dev_err(gart->dev, "Invalid page: %08x\n", pa);
-                spin_unlock_irqrestore(&gart->pte_lock, flags);
+                spin_lock_irqsave(&gart->pte_lock, flags);
                 return -EINVAL;
         }
         gart_set_pte(gart, iova, GART_PTE(pfn));
@@ -398,7 +391,6 @@ static int tegra_gart_probe(struct platform_device *pdev)
         do_gart_setup(gart, NULL);
 
         gart_handle = gart;
-        bus_set_iommu(&platform_bus_type, &gart_iommu_ops);
         return 0;
 
 fail:
@@ -430,27 +422,19 @@ const struct dev_pm_ops tegra_gart_pm_ops = {
         .resume         = tegra_gart_resume,
 };
 
-#ifdef CONFIG_OF
-static struct of_device_id tegra_gart_of_match[] = {
-        { .compatible = "nvidia,tegra20-gart", },
-        { },
-};
-MODULE_DEVICE_TABLE(of, tegra_gart_of_match);
-#endif
-
 static struct platform_driver tegra_gart_driver = {
         .probe          = tegra_gart_probe,
         .remove         = tegra_gart_remove,
         .driver = {
                 .owner  = THIS_MODULE,
-                .name   = "tegra-gart",
+                .name   = "tegra_gart",
                 .pm     = &tegra_gart_pm_ops,
-                .of_match_table = of_match_ptr(tegra_gart_of_match),
         },
 };
 
-static int tegra_gart_init(void)
+static int __devinit tegra_gart_init(void)
 {
+        bus_set_iommu(&platform_bus_type, &gart_iommu_ops);
         return platform_driver_register(&tegra_gart_driver);
 }
 
@@ -461,8 +445,3 @@ static void __exit tegra_gart_exit(void)
 
 subsys_initcall(tegra_gart_init);
 module_exit(tegra_gart_exit);
-
-MODULE_DESCRIPTION("IOMMU API for GART in Tegra20");
-MODULE_AUTHOR("Hiroshi DOYU <hdoyu@nvidia.com>");
-MODULE_ALIAS("platform:tegra-gart");
-MODULE_LICENSE("GPL v2");