From bd93fad1e8e65a37930f1c67d04f69a1d55f997d Mon Sep 17 00:00:00 2001
From: Matt Porter <mporter@ti.com>
Date: Fri, 5 Oct 2012 13:04:40 -0400
Subject: [PATCH] --- yaml --- r: 340021 b: refs/heads/master c:
 2eb2478d471e45e1d0c8bb3defbf82bf7204e13d h: refs/heads/master i:   340019:
 61567c83ef68f1188fcecf0bd4c8f5535bdd398d v: v3

---
 [refs]                                        |  2 +-
 trunk/drivers/uio/Kconfig                     |  1 +
 trunk/drivers/uio/uio_pruss.c                 | 24 +++++++++++++------
 trunk/include/linux/platform_data/uio_pruss.h |  3 ++-
 4 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e28ca61d9be6..863eb16da543 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76d57ce6ef6060f611c14675249b7300a3c96368
+refs/heads/master: 2eb2478d471e45e1d0c8bb3defbf82bf7204e13d
diff --git a/trunk/drivers/uio/Kconfig b/trunk/drivers/uio/Kconfig
index 6f3ea9bbc818..c48b93813fc1 100644
--- a/trunk/drivers/uio/Kconfig
+++ b/trunk/drivers/uio/Kconfig
@@ -97,6 +97,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/trunk/drivers/uio/uio_pruss.c b/trunk/drivers/uio/uio_pruss.c
index 33a7a273b453..f8738de342be 100644
--- a/trunk/drivers/uio/uio_pruss.c
+++ b/trunk/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 __devinit 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,
diff --git a/trunk/include/linux/platform_data/uio_pruss.h b/trunk/include/linux/platform_data/uio_pruss.h
index f39140aabc6f..3d47d219827f 100644
--- a/trunk/include/linux/platform_data/uio_pruss.h
+++ b/trunk/include/linux/platform_data/uio_pruss.h
@@ -20,6 +20,7 @@
 
 /* To configure the PRUSS INTC base offset for UIO driver */
 struct uio_pruss_pdata {
-	u32	pintc_base;
+	u32		pintc_base;
+	struct gen_pool *sram_pool;
 };
 #endif /* _UIO_PRUSS_H_ */