aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm646x.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/dm646x.c')
-rw-r--r--arch/arm/mach-davinci/dm646x.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index 81768dd47096..332d00d24dc2 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -955,12 +955,18 @@ void __init dm646x_init(void)
955 955
956static int __init dm646x_init_devices(void) 956static int __init dm646x_init_devices(void)
957{ 957{
958 int ret = 0;
959
958 if (!cpu_is_davinci_dm646x()) 960 if (!cpu_is_davinci_dm646x())
959 return 0; 961 return 0;
960 962
961 platform_device_register(&dm646x_mdio_device); 963 platform_device_register(&dm646x_mdio_device);
962 platform_device_register(&dm646x_emac_device); 964 platform_device_register(&dm646x_emac_device);
963 965
964 return 0; 966 ret = davinci_init_wdt();
967 if (ret)
968 pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
969
970 return ret;
965} 971}
966postcore_initcall(dm646x_init_devices); 972postcore_initcall(dm646x_init_devices);