commit 6f5f8d0d10bd0ad8720b657e72177fda99fbc6af
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 19 19:55:29 2012 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Wed Sep 19 19:55:23 2012 -0700
tree 567cecbf3feb08409ac7bfe7fa56bc79bfed457c
parent 22215bfd53089f2b5cb637293346c3c372f716d4
parent b26da2d7de0bbab595294ee3fc3386d3894e42f1

Merge "msm: iomap: correct shared memory location and size for 9625"

arch/arm/mach-msm/include/mach/msm_iomap-9625.h

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-9625.h b/arch/arm/mach-msm/include/mach/msm_iomap-9625.h
index 493cf36..eecdd67 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-9625.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-9625.h
@@ -23,7 +23,7 @@
  *
  */
 
-#define MSM9625_SHARED_RAM_PHYS	0x18D00000
+#define MSM9625_SHARED_RAM_PHYS	0x00000000
 
 #define MSM9625_APCS_GCC_PHYS	0xF9011000
 #define MSM9625_APCS_GCC_SIZE	SZ_4K

arch/arm/mach-msm/include/mach/msm_iomap.h

diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 21bea4f..6f925d4 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -105,7 +105,7 @@
 
 
 #if defined(CONFIG_ARCH_MSM9615) || defined(CONFIG_ARCH_MSM7X27) \
-	|| defined(CONFIG_ARCH_MSM7X30)
+	|| defined(CONFIG_ARCH_MSM7X30) || defined(CONFIG_ARCH_MSM9625)
 #define MSM_SHARED_RAM_SIZE	SZ_1M
 #else
 #define MSM_SHARED_RAM_SIZE	SZ_2M