aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/devices.c
diff options
context:
space:
mode:
authorSyed Mohammed, Khasim <khasim@ti.com>2008-10-09 10:51:41 -0400
committerTony Lindgren <tony@atomide.com>2008-10-09 10:51:41 -0400
commitcc26b3b01bc96a8b8c36671b0dc4898b2a152ea8 (patch)
tree8cd836cd32a38c1a849837ab295eeaa3ec104336 /arch/arm/plat-omap/devices.c
parent2e7509e5b3acc4b8653faa1966e5ac234d36ac82 (diff)
ARM: OMAP3: Add minimal omap3430 support
Add minimal omap3430 support based on earlier patches from Syed Mohammed Khasim. Also merge in omap34xx SRAM support from Karthik Dasu and use consistent naming for sram init functions. Also do following changes that make 34xx support usable: - Remove unused sram.c functions for 34xx - Rename IRQ_SIR_IRQ to INTCPS_SIR_IRQ and define it locally in entry-macro.S - Update mach-omap2/io.c to support 2420, 2430, and 34xx - Also merge in 34xx GPMC changes to add fields wr_access and wr_data_mux_bus from Adrian Hunter - Remove memory initialization call omap2_init_memory() until until more generic memory initialization patches are posted. It's OK to rely on bootloader initialization until then. Signed-off-by: Syed Mohammed, Khasim <khasim@ti.com> Signed-off-by: Karthik Dasu<karthik-dp@ti.com> Signed-off-by: Adrian Hunter <ext-adrian.hunter@nokia.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
-rw-r--r--arch/arm/plat-omap/devices.c15
1 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/plat-omap/devices.c b/arch/arm/plat-omap/devices.c
index 1c1d831a0c09..2625ce32e602 100644
--- a/arch/arm/plat-omap/devices.c
+++ b/arch/arm/plat-omap/devices.c
@@ -94,6 +94,10 @@ static inline void omap_init_dsp(void) { }
94 94
95static void omap_init_kp(void) 95static void omap_init_kp(void)
96{ 96{
97 /* 2430 and 34xx keypad is on TWL4030 */
98 if (cpu_is_omap2430() || cpu_is_omap34xx())
99 return;
100
97 if (machine_is_omap_h2() || machine_is_omap_h3()) { 101 if (machine_is_omap_h2() || machine_is_omap_h3()) {
98 omap_cfg_reg(F18_1610_KBC0); 102 omap_cfg_reg(F18_1610_KBC0);
99 omap_cfg_reg(D20_1610_KBC1); 103 omap_cfg_reg(D20_1610_KBC1);
@@ -395,8 +399,17 @@ static inline void omap_init_uwire(void) {}
395 399
396#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) 400#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE)
397 401
398#ifdef CONFIG_ARCH_OMAP24XX 402#if defined(CONFIG_ARCH_OMAP34XX)
403#define OMAP_WDT_BASE 0x48314000
404#elif defined(CONFIG_ARCH_OMAP24XX)
405
406#ifdef CONFIG_ARCH_OMAP2430
407/* WDT2 */
408#define OMAP_WDT_BASE 0x49016000
409#else
399#define OMAP_WDT_BASE 0x48022000 410#define OMAP_WDT_BASE 0x48022000
411#endif
412
400#else 413#else
401#define OMAP_WDT_BASE 0xfffeb000 414#define OMAP_WDT_BASE 0xfffeb000
402#endif 415#endif