diff options
Diffstat (limited to 'arch/arm/mach-versatile/core.c')
-rw-r--r-- | arch/arm/mach-versatile/core.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/arch/arm/mach-versatile/core.c b/arch/arm/mach-versatile/core.c index e340a54251df..cbcda61162d3 100644 --- a/arch/arm/mach-versatile/core.c +++ b/arch/arm/mach-versatile/core.c | |||
@@ -141,11 +141,6 @@ static struct map_desc versatile_io_desc[] __initdata = { | |||
141 | }, | 141 | }, |
142 | #ifdef CONFIG_MACH_VERSATILE_AB | 142 | #ifdef CONFIG_MACH_VERSATILE_AB |
143 | { | 143 | { |
144 | .virtual = IO_ADDRESS(VERSATILE_GPIO0_BASE), | ||
145 | .pfn = __phys_to_pfn(VERSATILE_GPIO0_BASE), | ||
146 | .length = SZ_4K, | ||
147 | .type = MT_DEVICE | ||
148 | }, { | ||
149 | .virtual = IO_ADDRESS(VERSATILE_IB2_BASE), | 144 | .virtual = IO_ADDRESS(VERSATILE_IB2_BASE), |
150 | .pfn = __phys_to_pfn(VERSATILE_IB2_BASE), | 145 | .pfn = __phys_to_pfn(VERSATILE_IB2_BASE), |
151 | .length = SZ_64M, | 146 | .length = SZ_64M, |
@@ -745,6 +740,19 @@ static void versatile_leds_event(led_event_t ledevt) | |||
745 | } | 740 | } |
746 | #endif /* CONFIG_LEDS */ | 741 | #endif /* CONFIG_LEDS */ |
747 | 742 | ||
743 | void versatile_restart(char mode, const char *cmd) | ||
744 | { | ||
745 | void __iomem *sys = __io_address(VERSATILE_SYS_BASE); | ||
746 | u32 val; | ||
747 | |||
748 | val = __raw_readl(sys + VERSATILE_SYS_RESETCTL_OFFSET); | ||
749 | val |= 0x105; | ||
750 | |||
751 | __raw_writel(0xa05f, sys + VERSATILE_SYS_LOCK_OFFSET); | ||
752 | __raw_writel(val, sys + VERSATILE_SYS_RESETCTL_OFFSET); | ||
753 | __raw_writel(0, sys + VERSATILE_SYS_LOCK_OFFSET); | ||
754 | } | ||
755 | |||
748 | /* Early initializations */ | 756 | /* Early initializations */ |
749 | void __init versatile_init_early(void) | 757 | void __init versatile_init_early(void) |
750 | { | 758 | { |