Patched in Tegra support.

1 files changed, 23 insertions, 21 deletions

diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index 6e2ab007fe9..e67b566e7aa 100644
--- a/drivers/uio/uio_pruss.c
+++ b/drivers/uio/uio_pruss.c
@@ -25,7 +25,7 @@
 #include <linux/clk.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/genalloc.h>
+#include <mach/sram.h>
 
 #define DRV_NAME "pruss_uio"
 #define DRV_VERSION "1.0"
@@ -65,11 +65,10 @@ struct uio_pruss_dev {
         dma_addr_t sram_paddr;
         dma_addr_t ddr_paddr;
         void __iomem *prussio_vaddr;
-        unsigned long sram_vaddr;
+        void *sram_vaddr;
         void *ddr_vaddr;
         unsigned int hostirq_start;
         unsigned int pintc_base;
-        struct gen_pool *sram_pool;
 };
 
 static irqreturn_t pruss_handler(int irq, struct uio_info *info)
@@ -107,15 +106,13 @@ static void pruss_cleanup(struct platform_device *dev,
                         gdev->ddr_paddr);
         }
         if (gdev->sram_vaddr)
-                gen_pool_free(gdev->sram_pool,
-                              gdev->sram_vaddr,
-                              sram_pool_sz);
+                sram_free(gdev->sram_vaddr, sram_pool_sz);
         kfree(gdev->info);
         clk_put(gdev->pruss_clk);
         kfree(gdev);
 }
 
-static int pruss_probe(struct platform_device *dev)
+static int __devinit pruss_probe(struct platform_device *dev)
 {
         struct uio_info *p;
         struct uio_pruss_dev *gdev;
@@ -155,17 +152,10 @@ static int pruss_probe(struct platform_device *dev)
                 goto out_free;
         }
 
-        if (pdata->sram_pool) {
-                gdev->sram_pool = pdata->sram_pool;
-                gdev->sram_vaddr =
-                        gen_pool_alloc(gdev->sram_pool, sram_pool_sz);
-                if (!gdev->sram_vaddr) {
-                        dev_err(&dev->dev, "Could not allocate SRAM pool\n");
-                        goto out_free;
-                }
-                gdev->sram_paddr =
-                        gen_pool_virt_to_phys(gdev->sram_pool,
-                                              gdev->sram_vaddr);
+        gdev->sram_vaddr = sram_alloc(sram_pool_sz, &(gdev->sram_paddr));
+        if (!gdev->sram_vaddr) {
+                dev_err(&dev->dev, "Could not allocate SRAM pool\n");
+                goto out_free;
         }
 
         gdev->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz,
@@ -219,7 +209,7 @@ out_free:
         return ret;
 }
 
-static int pruss_remove(struct platform_device *dev)
+static int __devexit pruss_remove(struct platform_device *dev)
 {
         struct uio_pruss_dev *gdev = platform_get_drvdata(dev);
 
@@ -230,14 +220,26 @@ static int pruss_remove(struct platform_device *dev)
 
 static struct platform_driver pruss_driver = {
         .probe = pruss_probe,
-        .remove = pruss_remove,
+        .remove = __devexit_p(pruss_remove),
         .driver = {
                    .name = DRV_NAME,
                    .owner = THIS_MODULE,
                    },
 };
 
-module_platform_driver(pruss_driver);
+static int __init pruss_init_module(void)
+{
+        return platform_driver_register(&pruss_driver);
+}
+
+module_init(pruss_init_module);
+
+static void __exit pruss_exit_module(void)
+{
+        platform_driver_unregister(&pruss_driver);
+}
+
+module_exit(pruss_exit_module);
 
 MODULE_LICENSE("GPL v2");
 MODULE_VERSION(DRV_VERSION);