diff options
| author | David Brown <[email protected]> | 2011-01-26 13:29:22 -0800 |
|---|---|---|
| committer | David Brown <[email protected]> | 2011-01-26 13:29:22 -0800 |
| commit | 851492c6585ac10367df7880fb0001f529fa8d5c (patch) | |
| tree | bedf5360cab2314e0d9e13be7cff386841695bb3 /arch/arm/mach-msm/include/mach/msm_iomap.h | |
| parent | ba5499ebfb7bc7859039d782099c75d92c394016 (diff) | |
| parent | 50ede4e39aa5b61685ca87f58422478b1a538ca8 (diff) | |
Merge branch 'msm-8960' into msm-core
* msm-8960:
msm: Support for the MSM8960 RUMI3 target
msm: Support for the MSM8960 Simulator target
msm: Makefile cleanup
msm: timer: Timer support for MSM8960
msm: Add MSM 8960 cpu_is check
msm: irqs-8960: Interrupt map for MSM8960
msm: Physical offset for MSM8960
msm: io: I/O register definitions for MSM8960
msm: Generalize QGIC registers
msm: Generalize timer register mappings
msm: Add CPU queries
Diffstat (limited to 'arch/arm/mach-msm/include/mach/msm_iomap.h')
| -rw-r--r-- | arch/arm/mach-msm/include/mach/msm_iomap.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h index 8e24dd812139..c98c7591f3b8 100644 --- a/arch/arm/mach-msm/include/mach/msm_iomap.h +++ b/arch/arm/mach-msm/include/mach/msm_iomap.h @@ -1,6 +1,6 @@ /* * Copyright (C) 2007 Google, Inc. - * Copyright (c) 2008-2010, Code Aurora Forum. All rights reserved. + * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved. * Author: Brian Swetland <[email protected]> * * This software is licensed under the terms of the GNU General Public @@ -53,6 +53,13 @@ #include "msm_iomap-7x00.h" #endif +#include "msm_iomap-8960.h" +/* 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) #endif |