Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b27b0727 authored by Kukjin Kim's avatar Kukjin Kim Committed by Russell King
Browse files

ARM: 7265/1: restart: S3C24XX: use new restart hook 



Hook these platforms restart code into the new restart hook rather
than using arch_reset().
And adds local header file, common.h in arch/arm/mach-s3c2410/ and
arch/arm/mach-s3c2440/ directories.

Cc: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 57538975

arch/arm/mach-s3c2410/common.h

0 → 100644
+17 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com

 *

 * Common Header for S3C2410 machines

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __ARCH_ARM_MACH_S3C2410_COMMON_H

#define __ARCH_ARM_MACH_S3C2410_COMMON_H



void s3c2410_restart(char mode, const char *cmd);



#endif /* __ARCH_ARM_MACH_S3C2410_COMMON_H */

arch/arm/mach-s3c2410/include/mach/system-reset.h

+1 −13
Original line number Diff line number Diff line
@@ -10,18 +10,6 @@ 
 * published by the Free Software Foundation.

*/



#include <mach/hardware.h>

#include <plat/watchdog-reset.h>



static void

arch_reset(char mode, const char *cmd)

static void arch_reset(char mode, const char *cmd)

{

	if (mode == 's') {

		soft_restart(0);

	}



	arch_wdt_reset();



	/* we'll take a jump through zero as a poor second */

	soft_restart(0);

}

arch/arm/mach-s3c2410/mach-amlm5900.c

+3 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
#include <linux/mtd/map.h>

#include <linux/mtd/physmap.h>



#include "common.h"



static struct resource amlm5900_nor_resource = {

		.start = 0x00000000,

		.end   = 0x01000000 - 1,
@@ -241,4 +243,5 @@ MACHINE_START(AML_M5900, "AML_M5900") 
	.init_irq	= s3c24xx_init_irq,

	.init_machine	= amlm5900_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2410_restart,

MACHINE_END

arch/arm/mach-s3c2410/mach-bast.c

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ 


#include "usb-simtec.h"

#include "nor-simtec.h"

#include "common.h"



#define COPYRIGHT ", Copyright 2004-2008 Simtec Electronics"
@@ -662,4 +663,5 @@ MACHINE_START(BAST, "Simtec-BAST") 
	.init_irq	= s3c24xx_init_irq,

	.init_machine	= bast_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2410_restart,

MACHINE_END

arch/arm/mach-s3c2410/mach-h1940.c

+3 −0
Original line number Diff line number Diff line
@@ -70,6 +70,8 @@ 


#include <sound/uda1380.h>



#include "common.h"



#define H1940_LATCH		((void __force __iomem *)0xF8000000)



#define H1940_PA_LATCH		S3C2410_CS2
@@ -751,4 +753,5 @@ MACHINE_START(H1940, "IPAQ-H1940") 
	.init_irq	= h1940_init_irq,

	.init_machine	= h1940_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2410_restart,

MACHINE_END