diff options
author | Tony Prisk <linux@prisktech.co.nz> | 2012-07-18 11:42:19 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-07-18 12:51:55 -0400 |
commit | 86cc0ef8abd25fab2c7c6a6a57faf5cd8503a15b (patch) | |
tree | 3eb611f52f3a75aced6915c944e03a4cf4f40850 /arch/arm/mach-vt8500/wm8505_7in.c | |
parent | c26abeb7b5ee571ff47a094ede2c84356229628a (diff) |
ARM:vt8500: Convert to use .restart and remove arch_reset()
Removed system.h as it only contained an inline for arch_reset()
Changed the existing board files to use .restart in there machine
descriptions.
Added device tree support for the restart controller.
Device tree support for mach-vt8500 is still a work-in-progress.
Signed-off-by: Tony Prisk <linux@prisktech.co.nz>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-vt8500/wm8505_7in.c')
-rw-r--r-- | arch/arm/mach-vt8500/wm8505_7in.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-vt8500/wm8505_7in.c b/arch/arm/mach-vt8500/wm8505_7in.c index cf910a956080..db19886caf7c 100644 --- a/arch/arm/mach-vt8500/wm8505_7in.c +++ b/arch/arm/mach-vt8500/wm8505_7in.c | |||
@@ -23,6 +23,7 @@ | |||
23 | 23 | ||
24 | #include <asm/mach-types.h> | 24 | #include <asm/mach-types.h> |
25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
26 | #include <mach/restart.h> | ||
26 | 27 | ||
27 | #include "devices.h" | 28 | #include "devices.h" |
28 | 29 | ||
@@ -61,7 +62,7 @@ void __init wm8505_7in_init(void) | |||
61 | pm_power_off = &vt8500_power_off; | 62 | pm_power_off = &vt8500_power_off; |
62 | else | 63 | else |
63 | printk(KERN_ERR "PMC Hibernation register could not be remapped, not enabling power off!\n"); | 64 | printk(KERN_ERR "PMC Hibernation register could not be remapped, not enabling power off!\n"); |
64 | 65 | wmt_setup_restart(); | |
65 | wm8505_set_resources(); | 66 | wm8505_set_resources(); |
66 | platform_add_devices(devices, ARRAY_SIZE(devices)); | 67 | platform_add_devices(devices, ARRAY_SIZE(devices)); |
67 | vt8500_gpio_init(); | 68 | vt8500_gpio_init(); |
@@ -69,6 +70,7 @@ void __init wm8505_7in_init(void) | |||
69 | 70 | ||
70 | MACHINE_START(WM8505_7IN_NETBOOK, "WM8505 7-inch generic netbook") | 71 | MACHINE_START(WM8505_7IN_NETBOOK, "WM8505 7-inch generic netbook") |
71 | .atag_offset = 0x100, | 72 | .atag_offset = 0x100, |
73 | .restart = wmt_restart, | ||
72 | .reserve = wm8505_reserve_mem, | 74 | .reserve = wm8505_reserve_mem, |
73 | .map_io = wm8505_map_io, | 75 | .map_io = wm8505_map_io, |
74 | .init_irq = wm8505_init_irq, | 76 | .init_irq = wm8505_init_irq, |