As per discussions with Russell King on linux-arm-kernel, it appears that both mach-s3c6400 and mach-s3c6410 are so close together that they should simply be merged into mach-s3c64xx. Note, this patch does not eliminate any of the bits that are still common, it is simply a move of the two directories together, any further common code will be eliminated or moved in further patches. Signed-off-by: Ben Dooks <ben-linux@fluff.org>
		
			
				
	
	
		
			30 lines
		
	
	
	
		
			599 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			30 lines
		
	
	
	
		
			599 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
/* linux/arch/arm/mach-s3c6400/include/mach/system.h
 | 
						|
 *
 | 
						|
 * Copyright 2008 Openmoko, Inc.
 | 
						|
 * Copyright 2008 Simtec Electronics
 | 
						|
 *      Ben Dooks <ben@simtec.co.uk>
 | 
						|
 *      http://armlinux.simtec.co.uk/
 | 
						|
 *
 | 
						|
 * S3C6400 - system implementation
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef __ASM_ARCH_SYSTEM_H
 | 
						|
#define __ASM_ARCH_SYSTEM_H __FILE__
 | 
						|
 | 
						|
#include <plat/watchdog-reset.h>
 | 
						|
 | 
						|
static void arch_idle(void)
 | 
						|
{
 | 
						|
	/* nothing here yet */
 | 
						|
}
 | 
						|
 | 
						|
static void arch_reset(char mode, const char *cmd)
 | 
						|
{
 | 
						|
	if (mode != 's')
 | 
						|
		arch_wdt_reset();
 | 
						|
 | 
						|
	/* if all else fails, or mode was for soft, jump to 0 */
 | 
						|
	cpu_reset(0);
 | 
						|
}
 | 
						|
 | 
						|
#endif /* __ASM_ARCH_IRQ_H */
 |