aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@codeaurora.org>2010-05-04 18:26:13 -0400
committerDaniel Walker <dwalker@codeaurora.org>2010-05-13 19:08:49 -0400
commitc83b2bf66a40cd9bb3af3f6e28d36babb6748d73 (patch)
tree76ee8991c0660765b0ee8aee4785ef6a86b4a080 /arch/arm
parent1ed8d58fcba4cda3e492f085d217c76ba6e8cb14 (diff)
msm: io: add io support for 7x30
Signed-off-by: Daniel Walker <dwalker@codeaurora.org> Signed-off-by: David Brown <davidb@codeaurora.org> Signed-off-by: Gregory Bean <gbean@codeaurora.org> Signed-off-by: Abhijeet Dharmapurikar <adharmap@codeaurora.org> Signed-off-by: Stepan Moskovchenko <stepanm@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-msm/include/mach/io.h2
-rw-r--r--arch/arm/mach-msm/io.c33
2 files changed, 35 insertions, 0 deletions
diff --git a/arch/arm/mach-msm/include/mach/io.h b/arch/arm/mach-msm/include/mach/io.h
index dbfb01304c82..c35b29f9ac0f 100644
--- a/arch/arm/mach-msm/include/mach/io.h
+++ b/arch/arm/mach-msm/include/mach/io.h
@@ -27,6 +27,8 @@ void __iomem *__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int m
27#define __mem_pci(a) (a) 27#define __mem_pci(a) (a)
28 28
29void msm_map_qsd8x50_io(void); 29void msm_map_qsd8x50_io(void);
30void msm_map_msm7x30_io(void);
31
30extern unsigned int msm_shared_ram_phys; 32extern unsigned int msm_shared_ram_phys;
31 33
32#endif 34#endif
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index c94ba336c7fd..1c05060b5f3b 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -100,6 +100,39 @@ void __init msm_map_qsd8x50_io(void)
100} 100}
101#endif /* CONFIG_ARCH_QSD8X50 */ 101#endif /* CONFIG_ARCH_QSD8X50 */
102 102
103#ifdef CONFIG_ARCH_MSM7X30
104static struct map_desc msm7x30_io_desc[] __initdata = {
105 MSM_DEVICE(VIC),
106 MSM_DEVICE(CSR),
107 MSM_DEVICE(TMR),
108 MSM_DEVICE(DMOV),
109 MSM_DEVICE(GPIO1),
110 MSM_DEVICE(GPIO2),
111 MSM_DEVICE(CLK_CTL),
112 MSM_DEVICE(CLK_CTL_SH2),
113 MSM_DEVICE(AD5),
114 MSM_DEVICE(MDC),
115 MSM_DEVICE(ACC),
116 MSM_DEVICE(SAW),
117 MSM_DEVICE(GCC),
118 MSM_DEVICE(TCSR),
119#ifdef CONFIG_MSM_DEBUG_UART
120 MSM_DEVICE(DEBUG_UART),
121#endif
122 {
123 .virtual = (unsigned long) MSM_SHARED_RAM_BASE,
124 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
125 .length = MSM_SHARED_RAM_SIZE,
126 .type = MT_DEVICE,
127 },
128};
129
130void __init msm_map_msm7x30_io(void)
131{
132 iotable_init(msm7x30_io_desc, ARRAY_SIZE(msm7x30_io_desc));
133}
134#endif /* CONFIG_ARCH_MSM7X30 */
135
103void __iomem * 136void __iomem *
104__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype) 137__msm_ioremap(unsigned long phys_addr, size_t size, unsigned int mtype)
105{ 138{