diff options
| author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:59:47 +0530 |
|---|---|---|
| committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2009-11-07 06:59:47 +0530 |
| commit | 9e034c986287a3338c393836f27e838b8f87539e (patch) | |
| tree | 2a7cdc1384ad5f3ce230310e275cf17aa35db735 /arch/arm/plat-omap/devices.c | |
| parent | 8aa5e79648ce7b16943456f2578b9b68573aac9c (diff) | |
| parent | 3d8b36e8e6725484d6a5d7fc258afaf37ca2db96 (diff) | |
Merge branch 'tesla-dev-v2.6.31_wakeup' of git://dev.omapzoom.org/pub/scm/tisyslink/kernel-syslink into L24x-20091106
Conflicts:
arch/arm/Kconfig
arch/arm/plat-omap/include/mach/irqs.h
drivers/Makefile
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rwxr-xr-x[-rw-r--r--] | arch/arm/plat-omap/devices.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c index 97a5a7e410fe..2ab6077dd4f8 100644..100755 --- a/arch/arm/plat-omap/devices.c +++ b/arch/arm/plat-omap/devices.c @@ -14,6 +14,7 @@ #include <linux/init.h> #include <linux/platform_device.h> #include <linux/io.h> +#include <linux/bootmem.h> #include <mach/hardware.h> #include <asm/mach-types.h> @@ -90,6 +91,32 @@ EXPORT_SYMBOL(dsp_kfunc_device_register); static inline void omap_init_dsp(void) { } #endif /* CONFIG_OMAP_DSP */ +#if defined(CONFIG_MPU_BRIDGE) || defined(CONFIG_MPU_BRIDGE_MODULE) +static unsigned long dspbridge_phys_mempool_base; +void dspbridge_reserve_sdram(void) +{ + void *va; + unsigned long size = CONFIG_BRIDGE_MEMPOOL_SIZE; + + if (!size) + return; + + va = __alloc_bootmem_nopanic(size, SZ_1M, 0); + if (!va) { + pr_err("%s: Failed to bootmem allocation(%lu bytes)\n", + __func__, size); + return; + } + dspbridge_phys_mempool_base = virt_to_phys(va); +} + +unsigned long dspbridge_get_mempool_base(void) +{ + return dspbridge_phys_mempool_base; +} +EXPORT_SYMBOL(dspbridge_get_mempool_base); +#endif + /*-------------------------------------------------------------------------*/ #if defined(CONFIG_KEYBOARD_OMAP) || defined(CONFIG_KEYBOARD_OMAP_MODULE) |