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/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index 89c8aaf..e0c23fa 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -96,8 +96,8 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = MSM_UART1_PHYS,
- .end = MSM_UART1_PHYS + MSM_UART1_SIZE - 1,
+ .start = MSM7X30_UART1_PHYS,
+ .end = MSM7X30_UART1_PHYS + MSM7X30_UART1_SIZE - 1,
.flags = IORESOURCE_MEM,
},
};
@@ -109,8 +109,8 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = MSM_UART2_PHYS,
- .end = MSM_UART2_PHYS + MSM_UART2_SIZE - 1,
+ .start = MSM7X30_UART2_PHYS,
+ .end = MSM7X30_UART2_PHYS + MSM7X30_UART2_SIZE - 1,
.flags = IORESOURCE_MEM,
.name = "uart_resource"
},
@@ -123,8 +123,8 @@
.flags = IORESOURCE_IRQ,
},
{
- .start = MSM_UART3_PHYS,
- .end = MSM_UART3_PHYS + MSM_UART3_SIZE - 1,
+ .start = MSM7X30_UART3_PHYS,
+ .end = MSM7X30_UART3_PHYS + MSM7X30_UART3_SIZE - 1,
.flags = IORESOURCE_MEM,
},
};
@@ -626,7 +626,7 @@
.smd_int.dev_id = 0,
.smd_int.out_bit_pos = 1 << 0,
- .smd_int.out_base = (void __iomem *)MSM_GCC_BASE,
+ .smd_int.out_base = (void __iomem *)MSM_APCS_GCC_BASE,
.smd_int.out_offset = 0x8,
.smsm_int.irq_name = "a9_m2a_5",
@@ -636,7 +636,7 @@
.smsm_int.dev_id = 0,
.smsm_int.out_bit_pos = 1 << 5,
- .smsm_int.out_base = (void __iomem *)MSM_GCC_BASE,
+ .smsm_int.out_base = (void __iomem *)MSM_APCS_GCC_BASE,
.smsm_int.out_offset = 0x8,
}