aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci/davinci.h
diff options
context:
space:
mode:
authorSekhar Nori <nsekhar@ti.com>2014-02-25 23:59:43 -0500
committerSekhar Nori <nsekhar@ti.com>2014-03-06 08:38:29 -0500
commit1233090cf6d8a75c8dca3b37e65a6e12f79502af (patch)
treebea49d5fd8c84fc8d00f1358a7ef72af46c12e65 /arch/arm/mach-davinci/davinci.h
parentf26a9968e2eedb3cb7eb46c2d1fbe09f3b8fcf15 (diff)
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/davinci.h')
-rw-r--r--arch/arm/mach-davinci/davinci.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index 2eebc4338802..4ffc37accce0 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -79,6 +79,8 @@ int davinci_gpio_register(struct resource *res, int size, void *pdata);
79#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000 79#define DM646X_ASYNC_EMIF_CONTROL_BASE 0x20008000
80#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000 80#define DM646X_ASYNC_EMIF_CS2_SPACE_BASE 0x42000000
81 81
82int davinci_init_wdt(void);
83
82/* DM355 function declarations */ 84/* DM355 function declarations */
83void dm355_init(void); 85void dm355_init(void);
84void dm355_init_spi0(unsigned chipselect_mask, 86void dm355_init_spi0(unsigned chipselect_mask,