aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/dm355.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci/dm355.c')
-rw-r--r--arch/arm/mach-davinci/dm355.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 4668c0e19767..07381d8cea62 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -1076,12 +1076,18 @@ int __init dm355_init_video(struct vpfe_config *vpfe_cfg,
1076 1076
1077static int __init dm355_init_devices(void) 1077static int __init dm355_init_devices(void)
1078{ 1078{
1079 int ret = 0;
1080
1079 if (!cpu_is_davinci_dm355()) 1081 if (!cpu_is_davinci_dm355())
1080 return 0; 1082 return 0;
1081 1083
1082 davinci_cfg_reg(DM355_INT_EDMA_CC); 1084 davinci_cfg_reg(DM355_INT_EDMA_CC);
1083 platform_device_register(&dm355_edma_device); 1085 platform_device_register(&dm355_edma_device);
1084 1086
1085 return 0; 1087 ret = davinci_init_wdt();
1088 if (ret)
1089 pr_warn("%s: watchdog init failed: %d\n", __func__, ret);
1090
1091 return ret;
1086} 1092}
1087postcore_initcall(dm355_init_devices); 1093postcore_initcall(dm355_init_devices);