diff options
| author | Cyril Chemparathy <cyril@ti.com> | 2012-03-13 17:51:07 -0400 |
|---|---|---|
| committer | Cyril Chemparathy <cyril@ti.com> | 2012-09-21 10:44:06 -0400 |
| commit | 54ef16d755e66621b79f605bc7661eee69fdf97b (patch) | |
| tree | 4d06dbe9bb3f45d34cf2175d63f7781cbb365781 | |
| parent | 2a32313d553a7ab713779771a441cebfd75acca9 (diff) | |
| download | linux-keystone-54ef16d755e66621b79f605bc7661eee69fdf97b.tar.gz | |
tci6614: updated reset hookups for v3.3 mainline merge
| -rw-r--r-- | arch/arm/mach-davinci/board-tci6614-evm.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/devices-tci6614.c | 5 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/include/mach/tci6614.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-davinci/tci6614.c | 2 |
4 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-davinci/board-tci6614-evm.c b/arch/arm/mach-davinci/board-tci6614-evm.c index 37c0374ab5538b..b1555a2759e729 100644 --- a/arch/arm/mach-davinci/board-tci6614-evm.c +++ b/arch/arm/mach-davinci/board-tci6614-evm.c @@ -215,4 +215,5 @@ MACHINE_START(TCI6614_EVM, "TCI6614 EVM") .timer = &davinci_timer, .init_machine = tci6614_evm_board_init, .dt_compat = tci6614_dt_board_compat, + .restart = tci6614_restart, MACHINE_END diff --git a/arch/arm/mach-davinci/devices-tci6614.c b/arch/arm/mach-davinci/devices-tci6614.c index 2fc47d312a3e19..1ab5fe379d8ca4 100644 --- a/arch/arm/mach-davinci/devices-tci6614.c +++ b/arch/arm/mach-davinci/devices-tci6614.c @@ -237,6 +237,11 @@ static int __init nand_init(int chipsel, struct davinci_nand_pdata *data) return platform_device_register(pdev); } +void tci6614_restart(char mode, const char *cmd) +{ + davinci_watchdog_reset(&tci6614_wdt_device); +} + void __init tci6614_devices_init(struct tci6614_device_info *info) { int i; diff --git a/arch/arm/mach-davinci/include/mach/tci6614.h b/arch/arm/mach-davinci/include/mach/tci6614.h index 0819692fd8da58..ce64370f5472c5 100644 --- a/arch/arm/mach-davinci/include/mach/tci6614.h +++ b/arch/arm/mach-davinci/include/mach/tci6614.h @@ -47,13 +47,13 @@ struct tci6614_device_info { }; extern void __init omap_aintc_init(void); -extern struct platform_device tci6614_wdt_device; extern struct platform_device tci6614_serial_device; extern void __init tci6614_init(void); extern void __init tci6614_devices_init(struct tci6614_device_info *); extern void __init tci6614_irq_init(void); extern void __init tci6614_intc_init(void); +extern void tci6614_restart(char mode, const char *cmd); #endif diff --git a/arch/arm/mach-davinci/tci6614.c b/arch/arm/mach-davinci/tci6614.c index 9bb670e78e5fb5..8afcc0636e6489 100644 --- a/arch/arm/mach-davinci/tci6614.c +++ b/arch/arm/mach-davinci/tci6614.c @@ -22,7 +22,6 @@ #include <asm/mach/map.h> -#include <mach/vmalloc.h> #include <mach/common.h> #include <mach/time.h> #include <mach/cputype.h> @@ -454,7 +453,6 @@ static struct davinci_soc_info tci6614_soc_info = { .gpio_irq = IRQ_TCI6614_GPINT0, .timer_info = &timer_info, .serial_dev = &tci6614_serial_device, - .reset_device = &tci6614_wdt_device, }; void __init tci6614_init(void) |