diff options
| author | Subhasish Ghosh <subhasish@mistralsolutions.com> | 2012-10-05 13:04:42 -0400 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2012-10-27 16:28:34 +0530 |
| commit | c94472d4ad11c5b7d8cd527d136c198269d390fc (patch) | |
| tree | 464147e0fe051994440154a962410e6fdd147683 /arch/arm/mach-davinci | |
| parent | 626863a3f32f0baaf55a1d18b8d4fbb937700dda (diff) | |
| download | linux-c94472d4ad11c5b7d8cd527d136c198269d390fc.tar.bz2 | |
ARM: davinci: da850: changed SRAM allocator to shared ram.
This patch modifies the sram allocator to allocate memory
from the DA8XX shared RAM.
Regression tested suspend/resume on AM180x EVM.
Signed-off-by: Subhasish Ghosh <subhasish@mistralsolutions.com>
[rebased onto consolidated SRAM patches]
Signed-off-by: Ben Gardiner <bengardiner@nanometrics.ca>
[rebased to mainline as consolidated SRAM patches were dropped]
Signed-off-by: Matt Porter <mporter@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci')
| -rw-r--r-- | arch/arm/mach-davinci/da850.c | 4 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/da8xx.h | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index ffc84f5e1aa2..41d2cabbcf33 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -1233,8 +1233,8 @@ static struct davinci_soc_info davinci_soc_info_da850 = { .gpio_irq = IRQ_DA8XX_GPIO0, .serial_dev = &da8xx_serial_device, .emac_pdata = &da8xx_emac_pdata, - .sram_dma = DA8XX_ARM_RAM_BASE, - .sram_len = SZ_8K, + .sram_dma = DA8XX_SHARED_RAM_BASE, + .sram_len = SZ_128K, }; void __init da850_init(void) diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h index aaccdc4528fc..97bc7006bfc6 100644 --- a/arch/arm/mach-davinci/include/mach/da8xx.h +++ b/arch/arm/mach-davinci/include/mach/da8xx.h @@ -72,6 +72,7 @@ extern unsigned int da850_max_speed; #define DA8XX_AEMIF_CS2_BASE 0x60000000 #define DA8XX_AEMIF_CS3_BASE 0x62000000 #define DA8XX_AEMIF_CTL_BASE 0x68000000 +#define DA8XX_SHARED_RAM_BASE 0x80000000 #define DA8XX_ARM_RAM_BASE 0xffff0000 void __init da830_init(void); |