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

Commit f6361c6b authored by Heiko Stuebner's avatar Heiko Stuebner Committed by Kukjin Kim
Browse files

ARM: S3C24XX: remove separate restart code 



The restart-handler series from Guenter Roeck got accepted recently and
implements among other things also the restart handler in the samsung
watchdog driver and where applicable in the clock drivers. So there is
no need for having the restart callbacks in s3c24xx boards anymore.

Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 68ba947c

arch/arm/mach-s3c24xx/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ config CPU_S3C2410 
	select S3C2410_DMA if S3C24XX_DMA

	select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ

	select S3C2410_PM if PM

	select SAMSUNG_WDT_RESET

	help

	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.
@@ -76,7 +75,6 @@ config CPU_S3C2442 
config CPU_S3C244X

	def_bool y

	depends on CPU_S3C2440 || CPU_S3C2442

	select SAMSUNG_WDT_RESET



config CPU_S3C2443

	bool "SAMSUNG S3C2443"

arch/arm/mach-s3c24xx/common.c

+0 −4
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ 
#include <plat/devs.h>

#include <plat/cpu-freq.h>

#include <plat/pwm-core.h>

#include <plat/watchdog-reset.h>



#include "common.h"
@@ -513,7 +512,6 @@ struct platform_device s3c2443_device_dma = { 
void __init s3c2410_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 0, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif
@@ -535,7 +533,6 @@ void __init s3c2416_init_clocks(int xtal) 
void __init s3c2440_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 1, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif
@@ -543,7 +540,6 @@ void __init s3c2440_init_clocks(int xtal) 
void __init s3c2442_init_clocks(int xtal)

{

	s3c2410_common_clk_init(NULL, xtal, 2, S3C24XX_VA_CLKPWR);

	samsung_wdt_reset_init(S3C24XX_VA_WATCHDOG);

}

#endif

arch/arm/mach-s3c24xx/common.h

+0 −5
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ extern int s3c2410a_init(void); 
extern void s3c2410_map_io(void);

extern void s3c2410_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2410_init_clocks(int xtal);

extern void s3c2410_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2410_init_irq(void);

#else

#define s3c2410_init_clocks NULL
@@ -38,7 +37,6 @@ extern void s3c2412_map_io(void); 
extern void s3c2412_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2412_init_clocks(int xtal);

extern  int s3c2412_baseclk_add(void);

extern void s3c2412_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2412_init_irq(void);

#else

#define s3c2412_init_clocks NULL
@@ -53,7 +51,6 @@ extern void s3c2416_map_io(void); 
extern void s3c2416_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2416_init_clocks(int xtal);

extern  int s3c2416_baseclk_add(void);

extern void s3c2416_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2416_init_irq(void);



extern struct syscore_ops s3c2416_irq_syscore_ops;
@@ -67,7 +64,6 @@ extern struct syscore_ops s3c2416_irq_syscore_ops; 
#if defined(CONFIG_CPU_S3C2440) || defined(CONFIG_CPU_S3C2442)

extern void s3c244x_map_io(void);

extern void s3c244x_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c244x_restart(enum reboot_mode mode, const char *cmd);

#else

#define s3c244x_init_uarts NULL

#endif
@@ -98,7 +94,6 @@ extern void s3c2443_map_io(void); 
extern void s3c2443_init_uarts(struct s3c2410_uartcfg *cfg, int no);

extern void s3c2443_init_clocks(int xtal);

extern  int s3c2443_baseclk_add(void);

extern void s3c2443_restart(enum reboot_mode mode, const char *cmd);

extern void s3c2443_init_irq(void);

#else

#define s3c2443_init_clocks NULL

arch/arm/mach-s3c24xx/include/mach/regs-s3c2443-clock.h

+0 −2
Original line number Diff line number Diff line
@@ -42,8 +42,6 @@ 
#define S3C2443_URSTCON			S3C2443_CLKREG(0x88)

#define S3C2443_UCLKCON			S3C2443_CLKREG(0x8C)



#define S3C2443_SWRST_RESET		(0x533c2443)



#define S3C2443_PLLCON_OFF		(1<<24)



#define S3C2443_CLKSRC_EPLLREF_XTAL	(2<<7)

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

+0 −1
Original line number Diff line number Diff line
@@ -247,5 +247,4 @@ MACHINE_START(AML_M5900, "AML_M5900") 
	.init_irq	= s3c2410_init_irq,

	.init_machine	= amlm5900_init,

	.init_time	= amlm5900_init_time,

	.restart	= s3c2410_restart,

MACHINE_END