sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'restart' into for-linus

Browse Source 
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
This commit is contained in:
Russell King
2012-01-05 13:25:15 +00:00
parent 2e0e943436 0575fb754d
commit 7b9dd47136
592 changed files with 3091 additions and 5517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ep93xx/include/mach/platform.h
View File

@@ -66,4 +66,6 @@ void ep93xx_register_ac97(void);
void ep93xx_init_devices(void);
extern struct sys_timer ep93xx_timer;
void ep93xx_restart(char, const char *);
#endif

15
arch/arm/mach-ep93xx/include/mach/system.h
View File

@@ -1,22 +1,7 @@
/*
* arch/arm/mach-ep93xx/include/mach/system.h
*/
#include <mach/hardware.h>
static inline void arch_idle(void)
{
cpu_do_idle();
}
static inline void arch_reset(char mode, const char *cmd)
{
/*
* Set then clear the SWRST bit to initiate a software reset
*/
ep93xx_devcfg_set_bits(EP93XX_SYSCON_DEVCFG_SWRST);
ep93xx_devcfg_clear_bits(EP93XX_SYSCON_DEVCFG_SWRST);
while (1)
;
}