2 files changed, 18 insertions, 7 deletions

diff --git a/drivers/uio/Kconfig b/drivers/uio/Kconfig
index 82e2b89d4480..f56d185790ea 100644
--- a/drivers/uio/Kconfig
+++ b/drivers/uio/Kconfig
@@ -113,6 +113,7 @@ config UIO_NETX
 config UIO_PRUSS
         tristate "Texas Instruments PRUSS driver"
         depends on ARCH_DAVINCI_DA850
+        select GENERIC_ALLOCATOR
         help
           PRUSS driver for OMAPL138/DA850/AM18XX devices
           PRUSS driver requires user space components, examples and user space
diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c
index cce0f78341cc..6e2ab007fe9c 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 <mach/sram.h>
+#include <linux/genalloc.h>
 
 #define DRV_NAME "pruss_uio"
 #define DRV_VERSION "1.0"
@@ -65,10 +65,11 @@ struct uio_pruss_dev {
         dma_addr_t sram_paddr;
         dma_addr_t ddr_paddr;
         void __iomem *prussio_vaddr;
-        void *sram_vaddr;
+        unsigned long 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)
@@ -106,7 +107,9 @@ static void pruss_cleanup(struct platform_device *dev,
                         gdev->ddr_paddr);
         }
         if (gdev->sram_vaddr)
-                sram_free(gdev->sram_vaddr, sram_pool_sz);
+                gen_pool_free(gdev->sram_pool,
+                              gdev->sram_vaddr,
+                              sram_pool_sz);
         kfree(gdev->info);
         clk_put(gdev->pruss_clk);
         kfree(gdev);
@@ -152,10 +155,17 @@ static int pruss_probe(struct platform_device *dev)
                 goto out_free;
         }
 
-        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;
+        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->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz,