diff options
| author | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:20:40 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-10-08 10:20:40 -0700 |
| commit | bc3caae8a191c712d8ae666d0b8d18807bfe2b14 (patch) | |
| tree | 7b338ebba2f1fdbcee3785789bf9f4a74d93aa94 /arch/arm/mach-omap1 | |
| parent | 73c5ef126f40b0b872e5964ff65dbe792eeec493 (diff) | |
| parent | 69758ab7a1e2de5636a2188d5357dd03140bf1d8 (diff) | |
| download | op-kernel-dev-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.zip op-kernel-dev-bc3caae8a191c712d8ae666d0b8d18807bfe2b14.tar.gz | |
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')
| -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 2c9a030..63d68cf 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) } arch_initcall(omap1_init_devices); +#if defined(CONFIG_OMAP_WATCHDOG) || defined(CONFIG_OMAP_WATCHDOG_MODULE) + +static struct resource wdt_resources[] = { + { + .start = 0xfffeb000, + .end = 0xfffeb07F, + .flags = IORESOURCE_MEM, + }, +}; + +static struct platform_device omap_wdt_device = { + .name = "omap_wdt", + .id = -1, + .num_resources = ARRAY_SIZE(wdt_resources), + .resource = wdt_resources, +}; + +static int __init omap_init_wdt(void) +{ + if (!cpu_is_omap16xx()) + return; + + platform_device_register(&omap_wdt_device); + return 0; +} +subsys_initcall(omap_init_wdt); +#endif |
