diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 19:55:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-10-19 19:55:59 +0100 |
| commit | 3c00079b31f910309b30ed5c2fd2b7a2d86bba60 (patch) | |
| tree | fdfa1eff1ac33b9eb8081688d970d7ea04ab88f0 /arch/arm/mach-msm/io.c | |
| parent | 7f9c7e28119cf21ae1a035240da3705647d0d06a (diff) | |
| parent | 88b522771079d7ab5f2334c8271bc13e1d309a5c (diff) | |
| download | talos-obmc-linux-3c00079b31f910309b30ed5c2fd2b7a2d86bba60.tar.gz talos-obmc-linux-3c00079b31f910309b30ed5c2fd2b7a2d86bba60.zip | |
Merge branch 'msm-core' of git://codeaurora.org/quic/kernel/dwalker/linux-msm into devel-stable
Diffstat (limited to 'arch/arm/mach-msm/io.c')
| -rw-r--r-- | arch/arm/mach-msm/io.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c index 1c05060b5f3b..d36b61074146 100644 --- a/arch/arm/mach-msm/io.c +++ b/arch/arm/mach-msm/io.c @@ -100,6 +100,21 @@ void __init msm_map_qsd8x50_io(void) } #endif /* CONFIG_ARCH_QSD8X50 */ +#ifdef CONFIG_ARCH_MSM8X60 +static struct map_desc msm8x60_io_desc[] __initdata = { + MSM_DEVICE(QGIC_DIST), + MSM_DEVICE(QGIC_CPU), + MSM_DEVICE(TMR), + MSM_DEVICE(ACC), + MSM_DEVICE(GCC), +}; + +void __init msm_map_msm8x60_io(void) +{ + iotable_init(msm8x60_io_desc, ARRAY_SIZE(msm8x60_io_desc)); +} +#endif /* CONFIG_ARCH_MSM8X60 */ + #ifdef CONFIG_ARCH_MSM7X30 static struct map_desc msm7x30_io_desc[] __initdata = { MSM_DEVICE(VIC), |
