diff options
| author | Sekhar Nori <nsekhar@ti.com> | 2014-02-26 05:59:43 +0100 |
|---|---|---|
| committer | Sekhar Nori <nsekhar@ti.com> | 2014-03-06 14:38:29 +0100 |
| commit | 1233090cf6d8a75c8dca3b37e65a6e12f79502af (patch) | |
| tree | bea49d5fd8c84fc8d00f1358a7ef72af46c12e65 /arch/arm/mach-davinci/dm365.c | |
| parent | ARM: davinci: add da8xx specific configs to davinci_all_defconfig (diff) | |
| download | linux-1233090cf6d8a75c8dca3b37e65a6e12f79502af.tar.xz linux-1233090cf6d8a75c8dca3b37e65a6e12f79502af.zip | |
ARM: davinci: da8xx: fix multiple watchdog device registration
Fix multiple watchdog device registration on da8xx devices
due to davinci_init_devices blindly registering watchdog
device.
Fix this by getting rid of the initcall and instead registering
watchdog for each soc.
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
Diffstat (limited to 'arch/arm/mach-davinci/dm365.c')
| -rw-r--r-- | arch/arm/mach-davinci/dm365.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c index b44b49e2801a..08a61b938333 100644 --- a/arch/arm/mach-davinci/dm365.c +++ b/arch/arm/mach-davinci/dm365.c @@ -1436,6 +1436,8 @@ int __init dm365_init_video(struct vpfe_config *vpfe_cfg, static int __init dm365_init_devices(void) { + int ret = 0; + if (!cpu_is_davinci_dm365()) return 0; @@ -1445,6 +1447,10 @@ static int __init dm365_init_devices(void) platform_device_register(&dm365_mdio_device); platform_device_register(&dm365_emac_device); - return 0; + ret = davinci_init_wdt(); + if (ret) + pr_warn("%s: watchdog init failed: %d\n", __func__, ret); + + return ret; } postcore_initcall(dm365_init_devices); |