aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSubhasish Ghosh <subhasish@mistralsolutions.com>2012-10-05 13:04:42 -0400
committerSekhar Nori <nsekhar@ti.com>2012-10-27 06:58:34 -0400
commitc94472d4ad11c5b7d8cd527d136c198269d390fc (patch)
tree464147e0fe051994440154a962410e6fdd147683
parent626863a3f32f0baaf55a1d18b8d4fbb937700dda (diff)
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>
-rw-r--r--arch/arm/mach-davinci/da850.c4
-rw-r--r--arch/arm/mach-davinci/include/mach/da8xx.h1
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 = {
1233 .gpio_irq = IRQ_DA8XX_GPIO0, 1233 .gpio_irq = IRQ_DA8XX_GPIO0,
1234 .serial_dev = &da8xx_serial_device, 1234 .serial_dev = &da8xx_serial_device,
1235 .emac_pdata = &da8xx_emac_pdata, 1235 .emac_pdata = &da8xx_emac_pdata,
1236 .sram_dma = DA8XX_ARM_RAM_BASE, 1236 .sram_dma = DA8XX_SHARED_RAM_BASE,
1237 .sram_len = SZ_8K, 1237 .sram_len = SZ_128K,
1238}; 1238};
1239 1239
1240void __init da850_init(void) 1240void __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;
72#define DA8XX_AEMIF_CS2_BASE 0x60000000 72#define DA8XX_AEMIF_CS2_BASE 0x60000000
73#define DA8XX_AEMIF_CS3_BASE 0x62000000 73#define DA8XX_AEMIF_CS3_BASE 0x62000000
74#define DA8XX_AEMIF_CTL_BASE 0x68000000 74#define DA8XX_AEMIF_CTL_BASE 0x68000000
75#define DA8XX_SHARED_RAM_BASE 0x80000000
75#define DA8XX_ARM_RAM_BASE 0xffff0000 76#define DA8XX_ARM_RAM_BASE 0xffff0000
76 77
77void __init da830_init(void); 78void __init da830_init(void);