@@ -8,6 +8,7 @@
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*/
+#include <linux/io.h>
#include <linux/module.h>
#include <linux/init.h>
@@ -25,6 +26,7 @@ EXPORT_SYMBOL_GPL(davinci_gen_pool);
*/
static int __init sram_init(void)
{
+ void *addr;
unsigned len = davinci_soc_info.sram_len;
if (!len)
@@ -36,8 +38,12 @@ static int __init sram_init(void)
if (!davinci_gen_pool)
return -ENOMEM;
- WARN_ON(gen_pool_add_virt(davinci_gen_pool, SRAM_VIRT,
- davinci_soc_info.sram_phys, len, -1));
+ addr = ioremap(davinci_soc_info.sram_phys, len);
+ if (!addr)
+ return -ENOMEM;
+ if (WARN_ON(gen_pool_add_virt(davinci_gen_pool, addr,
+ davinci_soc_info.sram_phys, len, -1)))
+ iounmap(addr);
return 0;
}
The current davinci init sets up SRAM in iotables. There has been an observed failure to boot a da850 with 128K specified in the iotable. Make the davinci sram allocator -- now based on RMK's consolidated SRAM support -- do an ioremap of the region specified by the entries in davinci_soc_info before registering with pv_pool_create(). This commit breaks runtime of davinci boards since the regions that the sram init is now trying to ioremap have been iomapped by their iotable entries. The iotable entries will be removed in the patches to come. Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca> CC: Sekhar Nori <nsekhar@ti.com> --- Changes since v1: * return -ENOMEM if ioremap fails (Sekhar Nori) --- arch/arm/mach-davinci/sram.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-)