diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-11 02:10:10 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-11 02:10:10 +0400 |
| commit | 59aaade72544ad1be4183c1066c20b5883a78717 (patch) | |
| tree | da57c3029145c21b5eae457fbd66b997b503f155 /arch/arm/plat-omap/devices.c | |
| parent | 8e5bdc44ba82d1f75c8732c2c2b64a22bb622e8f (diff) | |
| parent | 99b3075b9095c23acf8d884bdc7fe33c8c3520f0 (diff) | |
| download | linux-59aaade72544ad1be4183c1066c20b5883a78717.tar.xz | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into omap-all
Diffstat (limited to 'arch/arm/plat-omap/devices.c')
| -rw-r--r-- | arch/arm/plat-omap/devices.c | 15 |
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) { } static void omap_init_kp(void) { + /* 2430 and 34xx keypad is on TWL4030 */ + if (cpu_is_omap2430() || cpu_is_omap34xx()) + return; + if (machine_is_omap_h2() || machine_is_omap_h3()) { omap_cfg_reg(F18_1610_KBC0); omap_cfg_reg(D20_1610_KBC1); @@ -395,8 +399,17 @@ static inline void omap_init_uwire(void) {} #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) -#ifdef CONFIG_ARCH_OMAP24XX +#if defined(CONFIG_ARCH_OMAP34XX) +#define OMAP_WDT_BASE 0x48314000 +#elif defined(CONFIG_ARCH_OMAP24XX) + +#ifdef CONFIG_ARCH_OMAP2430 +/* WDT2 */ +#define OMAP_WDT_BASE 0x49016000 +#else #define OMAP_WDT_BASE 0x48022000 +#endif + #else #define OMAP_WDT_BASE 0xfffeb000 #endif |