ARM: OMAP: Increase VMALLOC_END to allow 256MB RAM

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Linux Kernel Mailing List
Date: Sunday, June 14, 2009 - 3:02 pm

Gitweb:     http://git.kernel.org/linus/e85c205ac1427f2405021a36f083280ff0d0a35e
Commit:     e85c205ac1427f2405021a36f083280ff0d0a35e
Parent:     00aeeffffadab39dcbd8d2360a1f2dc4469f4f1a
Author:     Mans Rullgard <mans@mansr.com>
AuthorDate: Mon May 25 11:08:41 2009 -0700
Committer:  Tony Lindgren <tony@atomide.com>
CommitDate: Mon May 25 11:08:41 2009 -0700

    ARM: OMAP: Increase VMALLOC_END to allow 256MB RAM
    
    This increases VMALLOC_END to 0x18000000, making room for 256MB
    RAM with the default 128MB vmalloc region.
    
    Note that after this patch there's no longer a hole between vmalloc
    space and the beginning of IO space on omap2 as the first virtual
    mapping starts at 0xd8000000.
    
    Also fold in a related change from Paul Walmsley <paul@pwsan.com>
    to change the OMAP2_SRAM addresses accordingly.
    
    Signed-off-by: Mans Rullgard <mans@mansr.com>
    Signed-off-by: Paul Walmsley <paul@pwsan.com>
    Acked-by: Kevin Hilman <khilman@deeprootsystems.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
---
 arch/arm/plat-omap/include/mach/vmalloc.h |    2 +-
 arch/arm/plat-omap/sram.c                 |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/plat-omap/include/mach/vmalloc.h b/arch/arm/plat-omap/include/mach/vmalloc.h
index dc104cd..b97dfaf 100644
--- a/arch/arm/plat-omap/include/mach/vmalloc.h
+++ b/arch/arm/plat-omap/include/mach/vmalloc.h
@@ -17,5 +17,5 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
-#define VMALLOC_END	  (PAGE_OFFSET + 0x10000000)
+#define VMALLOC_END	  (PAGE_OFFSET + 0x18000000)
 
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
index e1493d8..102c9f7 100644
--- a/arch/arm/plat-omap/sram.c
+++ b/arch/arm/plat-omap/sram.c
@@ -38,8 +38,8 @@
 #define OMAP1_SRAM_VA		VMALLOC_END
 #define OMAP2_SRAM_PA		0x40200000
 #define OMAP2_SRAM_PUB_PA	0x4020f800
-#define OMAP2_SRAM_VA		VMALLOC_END
-#define OMAP2_SRAM_PUB_VA	(VMALLOC_END + 0x800)
+#define OMAP2_SRAM_VA		0xe3000000
+#define OMAP2_SRAM_PUB_VA	(OMAP2_SRAM_VA + 0x800)
 #define OMAP3_SRAM_PA           0x40200000
 #define OMAP3_SRAM_VA           0xd7000000
 #define OMAP3_SRAM_PUB_PA       0x40208000
--
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
ARM: OMAP: Increase VMALLOC_END to allow 256MB RAM, Linux Kernel Mailing ..., (Sun Jun 14, 3:02 pm)