From: davidb@codeaurora.org (David Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 03/11] msm: Generalize QGIC registers
Date: Wed, 19 Jan 2011 12:25:39 -0800 [thread overview]
Message-ID: <1295468747-22796-4-git-send-email-davidb@codeaurora.org> (raw)
In-Reply-To: <1295468747-22796-1-git-send-email-davidb@codeaurora.org>
The QGIC registers are mapped to the same virtual addresses across
targets, only the physical address changes. Move the BASE address out
of target-specific files, and add a SOC name to the base addresses.
Signed-off-by: David Brown <davidb@codeaurora.org>
---
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 10 ++++------
arch/arm/mach-msm/include/mach/msm_iomap.h | 2 ++
arch/arm/mach-msm/io.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index d5482d6..5bd18db 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -35,13 +35,11 @@
*
*/
-#define MSM_QGIC_DIST_BASE IOMEM(0xF0000000)
-#define MSM_QGIC_DIST_PHYS 0x02080000
-#define MSM_QGIC_DIST_SIZE SZ_4K
+#define MSM8X60_QGIC_DIST_PHYS 0x02080000
+#define MSM8X60_QGIC_DIST_SIZE SZ_4K
-#define MSM_QGIC_CPU_BASE IOMEM(0xF0001000)
-#define MSM_QGIC_CPU_PHYS 0x02081000
-#define MSM_QGIC_CPU_SIZE SZ_4K
+#define MSM8X60_QGIC_CPU_PHYS 0x02081000
+#define MSM8X60_QGIC_CPU_SIZE SZ_4K
#define MSM_ACC_BASE IOMEM(0xF0002000)
#define MSM_ACC_PHYS 0x02001000
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index 0243bd0..bb42de3 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -55,6 +55,8 @@
/* Virtual addressses shared across all MSM targets. */
#define MSM_CSR_BASE IOMEM(0xE0001000)
+#define MSM_QGIC_DIST_BASE IOMEM(0xF0000000)
+#define MSM_QGIC_CPU_BASE IOMEM(0xF0001000)
#define MSM_TMR_BASE IOMEM(0xF0200000)
#define MSM_TMR0_BASE IOMEM(0xF0201000)
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 47d699f..5dd0d1b9 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -103,8 +103,8 @@ void __init msm_map_qsd8x50_io(void)
#ifdef CONFIG_ARCH_MSM8X60
static struct map_desc msm8x60_io_desc[] __initdata = {
- MSM_DEVICE(QGIC_DIST),
- MSM_DEVICE(QGIC_CPU),
+ MSM_CHIP_DEVICE(QGIC_DIST, MSM8X60),
+ MSM_CHIP_DEVICE(QGIC_CPU, MSM8X60),
MSM_CHIP_DEVICE(TMR, MSM8X60),
MSM_CHIP_DEVICE(TMR0, MSM8X60),
MSM_DEVICE(ACC),
--
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-01-19 20:25 UTC|newest]
Thread overview: 76+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-15 3:49 [PATCH 0/7] msm: Support for Qualcomm MSM8960 Stepan Moskovchenko
2010-12-15 3:49 ` [PATCH 1/7] msm: io: I/O register definitions for MSM8960 Stepan Moskovchenko
2010-12-15 15:31 ` Arnd Bergmann
2010-12-15 15:35 ` David Brown
2010-12-15 16:40 ` Arnd Bergmann
2010-12-15 22:03 ` David Brown
2010-12-15 22:37 ` Arnd Bergmann
2010-12-17 0:16 ` David Brown
2010-12-24 13:29 ` Arnd Bergmann
2010-12-25 16:04 ` Nicolas Pitre
2011-01-03 0:33 ` Russell King - ARM Linux
2011-01-03 1:04 ` Nicolas Pitre
2010-12-25 18:40 ` David Brown
2010-12-15 3:49 ` [PATCH 2/7] msm: Physical offset " Stepan Moskovchenko
2010-12-15 13:17 ` Sergei Shtylyov
2010-12-15 13:55 ` David Brown
2010-12-15 14:40 ` Daniel Walker
2010-12-15 15:38 ` David Brown
2010-12-15 17:53 ` Steve Muckle
2010-12-15 17:55 ` Daniel Walker
2010-12-15 18:07 ` Steve Muckle
2010-12-15 18:21 ` Daniel Walker
2010-12-15 3:49 ` [PATCH 3/7] msm: irqs-8960: Interrupt map " Stepan Moskovchenko
2010-12-15 3:49 ` [PATCH 4/7] msm: Board file for MSM8960 simulator Stepan Moskovchenko
2010-12-15 15:36 ` Arnd Bergmann
2010-12-15 3:49 ` [PATCH 5/7] msm: timer: Timer support for MSM8960 Stepan Moskovchenko
2010-12-15 3:49 ` [PATCH 6/7] msm: Makefile cleanup Stepan Moskovchenko
2010-12-15 3:49 ` [PATCH 7/7] msm: Build support for the MSM8960 target Stepan Moskovchenko
2010-12-15 15:34 ` Arnd Bergmann
[not found] ` <1295468747-22796-1-git-send-email-davidb@codeaurora.org>
2011-01-19 20:25 ` [PATCH v2 01/11] msm: Add CPU queries David Brown
2011-01-25 0:09 ` Daniel Walker
2011-01-25 0:20 ` David Brown
2011-01-25 0:23 ` Daniel Walker
2011-01-25 0:57 ` David Brown
2011-01-25 17:35 ` Daniel Walker
2011-01-25 19:17 ` David Brown
2011-01-25 19:25 ` Daniel Walker
2011-01-25 19:45 ` David Brown
2011-01-25 20:06 ` Daniel Walker
2011-01-26 4:29 ` Zhaohui Wang
2011-01-26 6:19 ` David Brown
2011-01-26 6:32 ` Stepan Moskovchenko
2011-01-26 6:52 ` David Brown
2011-01-19 20:25 ` [PATCH v2 02/11] msm: Generalize timer register mappings David Brown
2011-01-24 22:36 ` Daniel Walker
2011-01-24 22:44 ` David Brown
2011-01-24 22:57 ` Daniel Walker
2011-01-24 23:19 ` David Brown
2011-01-26 22:12 ` Dima Zavin
2011-01-26 22:41 ` David Brown
2011-01-26 22:50 ` Dima Zavin
2011-01-26 22:46 ` Russell King - ARM Linux
2011-01-25 18:12 ` Carl Vanderlip
2011-01-25 19:18 ` David Brown
2011-01-19 20:25 ` David Brown [this message]
2011-01-19 20:25 ` [PATCH v2 04/11] msm: io: I/O register definitions for MSM8960 David Brown
2011-01-24 20:49 ` Daniel Walker
2011-01-24 21:31 ` David Brown
2011-01-24 21:36 ` Daniel Walker
2011-01-19 20:25 ` [PATCH v2 05/11] msm: Physical offset " David Brown
2011-01-24 23:31 ` Russell King - ARM Linux
2011-01-19 20:25 ` [PATCH v2 06/11] msm: irqs-8960: Interrupt map " David Brown
2011-01-24 22:45 ` Daniel Walker
2011-01-24 22:49 ` David Brown
2011-01-19 20:25 ` [PATCH v2 07/11] msm: Add MSM 8960 cpu_is check David Brown
2011-01-24 20:46 ` Daniel Walker
2011-01-24 21:30 ` David Brown
2011-01-24 21:35 ` Daniel Walker
2011-01-24 22:13 ` David Brown
2011-01-24 22:16 ` Daniel Walker
2011-01-19 20:25 ` [PATCH v2 08/11] msm: timer: Timer support for MSM8960 David Brown
2011-01-19 20:25 ` [PATCH v2 09/11] msm: Makefile cleanup David Brown
2011-01-19 20:25 ` [PATCH v2 10/11] msm: Support for the MSM8960 Simulator target David Brown
2011-01-19 20:25 ` [PATCH v2 11/11] msm: Support for the MSM8960 RUMI3 target David Brown
2011-01-24 23:28 ` Russell King - ARM Linux
2011-01-19 22:40 ` [PATCH v2 00/11] msm: Add initial support for MSM8960 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=1295468747-22796-4-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).