evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ARM: restart: shark: use new restart hook

Browse source 
Hook the Shark restart code into the new restart hook rather than
using arch_reset().

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2011-11-05 14:41:14 +00:00
parent d9ca5839fd
commit b95ff9fe24
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/arm/mach-shark/core.c
View file

@ -26,7 +26,7 @@
#define ROMCARD_SIZE 0x08000000 #define ROMCARD_SIZE 0x08000000
#define ROMCARD_START 0x10000000 #define ROMCARD_START 0x10000000
void arch_reset(char mode, const char *cmd) static void shark_restart(char mode, const char *cmd)
{ {
short temp; short temp;
/* Reset the Machine via pc[3] of the sequoia chipset */ /* Reset the Machine via pc[3] of the sequoia chipset */
@ -156,4 +156,5 @@ MACHINE_START(SHARK, "Shark")
.init_irq = shark_init_irq, .init_irq = shark_init_irq,
.timer = &shark_timer, .timer = &shark_timer,
.dma_zone_size = SZ_4M, .dma_zone_size = SZ_4M,
.restart = shark_restart,
MACHINE_END MACHINE_END

5
arch/arm/mach-shark/include/mach/system.h
View file

@ -6,8 +6,9 @@
#ifndef __ASM_ARCH_SYSTEM_H #ifndef __ASM_ARCH_SYSTEM_H
#define __ASM_ARCH_SYSTEM_H #define __ASM_ARCH_SYSTEM_H
/* Found in arch/mach-shark/core.c */ static inline void arch_reset(char mode, const char *cmd)
extern void arch_reset(char mode, const char *cmd); {
}
static inline void arch_idle(void) static inline void arch_idle(void)
{ {