From: davidb@codeaurora.org (David Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: msm: Remove PLAT_PHYS_OFFSETS from MSM targets
Date: Thu, 28 Jul 2011 13:18:11 -0700 [thread overview]
Message-ID: <1311884291-5409-2-git-send-email-davidb@codeaurora.org> (raw)
In-Reply-To: <1311884291-5409-1-git-send-email-davidb@codeaurora.org>
Now that MSM can boot with the phys offset patching, eliminate the
definitions of the phys offsets, and instead select
ARM_PATCH_PHYS_VIRT.
Signed-off-by: David Brown <davidb@codeaurora.org>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ced9371..3a4d87c 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -618,6 +618,7 @@ config ARCH_MSM
select GENERIC_CLOCKEVENTS
select ARCH_REQUIRE_GPIOLIB
select CLKDEV_LOOKUP
+ select ARM_PATCH_PHYS_VIRT
help
Support for Qualcomm MSM/QSD based systems. This runs on the
apps processor of the MSM/QSD and depends on a shared memory
diff --git a/arch/arm/mach-msm/include/mach/memory.h b/arch/arm/mach-msm/include/mach/memory.h
index 58d5e7e..deed41a 100644
--- a/arch/arm/mach-msm/include/mach/memory.h
+++ b/arch/arm/mach-msm/include/mach/memory.h
@@ -17,19 +17,12 @@
#define __ASM_ARCH_MEMORY_H
/* physical offset of RAM */
-#if defined(CONFIG_ARCH_QSD8X50) && defined(CONFIG_MSM_SOC_REV_A)
-#define PLAT_PHYS_OFFSET UL(0x00000000)
-#elif defined(CONFIG_ARCH_QSD8X50)
-#define PLAT_PHYS_OFFSET UL(0x20000000)
-#elif defined(CONFIG_ARCH_MSM7X30)
-#define PLAT_PHYS_OFFSET UL(0x00000000)
-#elif defined(CONFIG_ARCH_MSM8X60)
-#define PLAT_PHYS_OFFSET UL(0x40000000)
-#elif defined(CONFIG_ARCH_MSM8960)
-#define PLAT_PHYS_OFFSET UL(0x40000000)
-#else
-#define PLAT_PHYS_OFFSET UL(0x10000000)
-#endif
+#define QSD8X50A_PHYS_OFFSET UL(0x00000000)
+#define QSD8X50_PHYS_OFFSET UL(0x20000000)
+#define MSM7X30_PHYS_OFFSET UL(0x00000000)
+#define MSM8X60_PHYS_OFFSET UL(0x10000000)
+#define MSM8960_PHYS_OFFSET UL(0x40000000)
+#define MSM7X01_PHYS_OFFSET UL(0x10000000)
#endif
--
Sent by an employee of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.
next prev parent reply other threads:[~2011-07-28 20:18 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-27 19:19 [PATCHv4 1/2] ARM: Set proper TEXT_OFFSET for newer MSMs Stephen Boyd
2011-07-27 19:19 ` [PATCHv4 2/2] ARM: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT Stephen Boyd
2011-07-28 20:18 ` [PATCH 1/2] ARM: msm: Remove .boot_params from MSM boardfiles David Brown
2011-07-28 20:18 ` David Brown [this message]
2011-07-28 20:49 ` [PATCH 2/2] ARM: msm: Remove PLAT_PHYS_OFFSETS from MSM targets Nicolas Pitre
2011-07-28 21:00 ` David Brown
2011-07-29 10:32 ` Russell King - ARM Linux
2011-07-29 12:42 ` Nicolas Pitre
2011-07-29 14:01 ` David Brown
2011-08-11 9:32 ` [PATCHv4 2/2] ARM: P2V: Remove ARM_PATCH_PHYS_VIRT_16BIT Russell King - ARM Linux
2011-08-11 21:11 ` [PATCHv4 1/2] ARM: Set proper TEXT_OFFSET for newer MSMs David Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311884291-5409-2-git-send-email-davidb@codeaurora.org \
--to=davidb@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).