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

Commit 57538975 authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Russell King
Browse files

ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 



S3C2412/S3C2416/S3C2443 use a special register to signal the reset to
the processor and used therefore the s3c24xx_reset_hook mechanism in the
s3c24xx-specific arch reset.

This patch introduces restart functions for these architectures,
moves the board files to them and removes the s3c24xx_reset_hook
infrastructure, as all users are gone.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent e11e909d

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

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
/* arch/arm/mach-s3c2410/include/mach/reset.h

 *

 * Copyright (c) 2007 Simtec Electronics

 *	Ben Dooks <ben@simtec.co.uk>

 *	http://armlinux.simtec.co.uk/

 *

 * 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.

 *

 * S3C2410 CPU reset controls

*/



#ifndef __ASM_ARCH_RESET_H

#define __ASM_ARCH_RESET_H __FILE__



/* This allows the over-ride of the default reset code

*/



extern void (*s3c24xx_reset_hook)(void);



#endif /* __ASM_ARCH_RESET_H */

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

+0 −5
Original line number Diff line number Diff line
@@ -13,8 +13,6 @@ 
#include <mach/hardware.h>

#include <plat/watchdog-reset.h>



extern void (*s3c24xx_reset_hook)(void);



static void

arch_reset(char mode, const char *cmd)

{
@@ -22,9 +20,6 @@ arch_reset(char mode, const char *cmd) 
		soft_restart(0);

	}



	if (s3c24xx_reset_hook)

		s3c24xx_reset_hook();



	arch_wdt_reset();



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

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

+0 −2
Original line number Diff line number Diff line
@@ -15,12 +15,10 @@ 


#include <mach/map.h>

#include <mach/idle.h>

#include <mach/reset.h>



#include <mach/regs-clock.h>



void (*s3c24xx_idle)(void);

void (*s3c24xx_reset_hook)(void);



void s3c24xx_default_idle(void)

{

arch/arm/mach-s3c2412/mach-jive.c

+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ 
#include <linux/mtd/nand_ecc.h>

#include <linux/mtd/partitions.h>



#include <plat/s3c2412.h>

#include <plat/gpio-cfg.h>

#include <plat/clock.h>

#include <plat/devs.h>
@@ -661,4 +662,5 @@ MACHINE_START(JIVE, "JIVE") 
	.map_io		= jive_map_io,

	.init_machine	= jive_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2412_restart,

MACHINE_END

arch/arm/mach-s3c2412/mach-smdk2413.c

+3 −0
Original line number Diff line number Diff line
@@ -134,6 +134,7 @@ MACHINE_START(S3C2413, "S3C2413") 
	.map_io		= smdk2413_map_io,

	.init_machine	= smdk2413_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2412_restart,

MACHINE_END



MACHINE_START(SMDK2412, "SMDK2412")
@@ -145,6 +146,7 @@ MACHINE_START(SMDK2412, "SMDK2412") 
	.map_io		= smdk2413_map_io,

	.init_machine	= smdk2413_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2412_restart,

MACHINE_END



MACHINE_START(SMDK2413, "SMDK2413")
@@ -156,4 +158,5 @@ MACHINE_START(SMDK2413, "SMDK2413") 
	.map_io		= smdk2413_map_io,

	.init_machine	= smdk2413_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2412_restart,

MACHINE_END