diff options
author | Tony Lindgren <tony@atomide.com> | 2010-10-08 13:20:40 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 13:20:40 -0400 |
commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/mach-omap1/devices.c | |
parent | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff) | |
parent | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff) |
Merge branch 'pm-hwmods' of ssh://master.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/devices.c')
-rw-r--r-- | arch/arm/mach-omap1/devices.c | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c index 2c9a030c5595..63d68cf908af 100644 --- a/arch/arm/mach-omap1/devices.c +++ b/arch/arm/mach-omap1/devices.c | |||
@@ -275,3 +275,30 @@ static int __init omap1_init_devices(void) | |||
275 | } | 275 | } |
276 | arch_initcall(omap1_init_devices); | 276 | arch_initcall(omap1_init_devices); |
277 | 277 | ||
278 | #if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) | ||
279 | |||
280 | static struct resource wdt_resources[] = { | ||
281 | { | ||
282 | .start = 0xfffeb000, | ||
283 | .end = 0xfffeb07F, | ||
284 | .flags = IORESOURCE_MEM, | ||
285 | }, | ||
286 | }; | ||
287 | |||
288 | static struct platform_device omap_wdt_device = { | ||
289 | .name = "omap_wdt", | ||
290 | .id = -1, | ||
291 | .num_resources = ARRAY_SIZE(wdt_resources), | ||
292 | .resource = wdt_resources, | ||
293 | }; | ||
294 | |||
295 | static int __init omap_init_wdt(void) | ||
296 | { | ||
297 | if (!cpu_is_omap16xx()) | ||
298 | return; | ||
299 | |||
300 | platform_device_register(&omap_wdt_device); | ||
301 | return 0; | ||
302 | } | ||
303 | subsys_initcall(omap_init_wdt); | ||
304 | #endif | ||