msm: msm_iomap: Unify iomap for 7x30 with 7K & 8K
Iomap for 7x30 is combined with 8K and 7k, this will allow us to reuse
the already defined static mappings.
Change-Id: I4f26cd420012028f018611c0ac27a02951404c8f
Signed-off-by: Taniya Das <tdas@codeaurora.org>
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index bad8237..063f6bd 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -314,19 +314,19 @@
#ifdef CONFIG_ARCH_MSM7X30
static struct map_desc msm7x30_io_desc[] __initdata = {
- MSM_DEVICE(VIC),
- MSM_DEVICE(CSR),
- MSM_DEVICE(TMR),
- MSM_DEVICE(GPIO1),
- MSM_DEVICE(GPIO2),
- MSM_DEVICE(CLK_CTL),
- MSM_DEVICE(CLK_CTL_SH2),
- MSM_DEVICE(AD5),
- MSM_DEVICE(MDC),
- MSM_DEVICE(ACC),
- MSM_DEVICE(SAW),
- MSM_DEVICE(GCC),
- MSM_DEVICE(TCSR),
+ MSM_CHIP_DEVICE(VIC, MSM7X30),
+ MSM_CHIP_DEVICE(CSR, MSM7X30),
+ MSM_CHIP_DEVICE(TMR, MSM7X30),
+ MSM_CHIP_DEVICE(GPIO1, MSM7X30),
+ MSM_CHIP_DEVICE(GPIO2, MSM7X30),
+ MSM_CHIP_DEVICE(CLK_CTL, MSM7X30),
+ MSM_CHIP_DEVICE(CLK_CTL_SH2, MSM7X30),
+ MSM_CHIP_DEVICE(AD5, MSM7X30),
+ MSM_CHIP_DEVICE(MDC, MSM7X30),
+ MSM_CHIP_DEVICE(ACC0, MSM7X30),
+ MSM_CHIP_DEVICE(SAW0, MSM7X30),
+ MSM_CHIP_DEVICE(APCS_GCC, MSM7X30),
+ MSM_CHIP_DEVICE(TCSR, MSM7X30),
#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
defined(CONFIG_DEBUG_MSM_UART3)
MSM_DEVICE(DEBUG_UART),