aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap2/common.h
diff options
context:
space:
mode:
authorHemant Pedanekar <hemantp@ti.com>2011-12-13 13:46:44 -0500
committerTony Lindgren <tony@atomide.com>2011-12-13 13:46:44 -0500
commita920360f038e976e7a86b002e209402da20e9147 (patch)
treea48a1b7a2c7efaab8e585cafdf0268a468858cb3 /arch/arm/mach-omap2/common.h
parentec023e46f7e86acb04fef5bdd1e9465f5fc39894 (diff)
ARM: OMAP: TI81XX: Prepare for addition of TI814X support
This patch updates existing macros, functions used for TI816X, to enable addition of other SoCs belonging to TI81XX family (e.g., TI814X). The approach taken is to use TI81XX/ti81xx for code/data going to be common across all TI81XX devices. cpu_is_ti81xx() is introduced to handle code common across TI81XX devices. In addition, ti8168_evm_map_io() is now replaced with ti81xx_map_io() and moved in mach-omap2/common.c as same will be used for TI814X and is not board specific. Signed-off-by: Hemant Pedanekar <hemantp@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/common.h')
-rw-r--r--arch/arm/mach-omap2/common.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index 9b733e343bf5..4b2b416fafe1 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -52,10 +52,10 @@ static inline void omap34xx_map_common_io(void)
52} 52}
53#endif 53#endif
54 54
55#ifdef CONFIG_SOC_OMAPTI816X 55#ifdef CONFIG_SOC_OMAPTI81XX
56extern void omapti816x_map_common_io(void); 56extern void omapti81xx_map_common_io(void);
57#else 57#else
58static inline void omapti816x_map_common_io(void) 58static inline void omapti81xx_map_common_io(void)
59{ 59{
60} 60}
61#endif 61#endif
@@ -90,7 +90,7 @@ void omap35xx_init_early(void);
90void omap3630_init_early(void); 90void omap3630_init_early(void);
91void omap3_init_early(void); /* Do not use this one */ 91void omap3_init_early(void); /* Do not use this one */
92void am35xx_init_early(void); 92void am35xx_init_early(void);
93void ti816x_init_early(void); 93void ti81xx_init_early(void);
94void omap4430_init_early(void); 94void omap4430_init_early(void);
95 95
96/* 96/*
@@ -114,7 +114,7 @@ void omap2_set_globals_242x(void);
114void omap2_set_globals_243x(void); 114void omap2_set_globals_243x(void);
115void omap2_set_globals_3xxx(void); 115void omap2_set_globals_3xxx(void);
116void omap2_set_globals_443x(void); 116void omap2_set_globals_443x(void);
117void omap2_set_globals_ti816x(void); 117void omap2_set_globals_ti81xx(void);
118void omap2_set_globals_am33xx(void); 118void omap2_set_globals_am33xx(void);
119 119
120/* These get called from omap2_set_globals_xxxx(), do not call these */ 120/* These get called from omap2_set_globals_xxxx(), do not call these */
@@ -128,6 +128,7 @@ void omap243x_map_io(void);
128void omap3_map_io(void); 128void omap3_map_io(void);
129void am33xx_map_io(void); 129void am33xx_map_io(void);
130void omap4_map_io(void); 130void omap4_map_io(void);
131void ti81xx_map_io(void);
131 132
132/** 133/**
133 * omap_test_timeout - busy-loop, testing a condition 134 * omap_test_timeout - busy-loop, testing a condition
@@ -156,7 +157,7 @@ extern struct device *omap4_get_dsp_device(void);
156 157
157void omap2_init_irq(void); 158void omap2_init_irq(void);
158void omap3_init_irq(void); 159void omap3_init_irq(void);
159void ti816x_init_irq(void); 160void ti81xx_init_irq(void);
160extern int omap_irq_pending(void); 161extern int omap_irq_pending(void);
161void omap_intc_save_context(void); 162void omap_intc_save_context(void);
162void omap_intc_restore_context(void); 163void omap_intc_restore_context(void);