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

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

ARM: S3C24XX: Fix restart on S3C2442 



Commit b27b0727 (ARM: 7265/1: restart: S3C24XX: use new restart hook)
introduced the new restart hook also for the S3C244x cpus, but it
was only defined in the S3C2440 scope, i.e. when CPU_S3C2440 was
selected. Devices using the S3C2442 like the GTA02 normally don't select
this CPU which leads to compilation errors like:
    LD      .tmp_vmlinux1
  arch/arm/mach-s3c2440/built-in.o:(.arch.info.init+0x3c): undefined reference
to `s3c2440_restart'
  make: *** [.tmp_vmlinux1] Error 1

Therefore move the s3c2440_restart function to s3c244x.c which is
common to both cpus and also fix the naming to reflect this.

Reported-and-tested-by: default avatarDenis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent c65d8ef2

arch/arm/mach-s3c2440/common.h

+1 −1
Original line number Diff line number Diff line
@@ -12,6 +12,6 @@ 
#ifndef __ARCH_ARM_MACH_S3C2440_COMMON_H

#define __ARCH_ARM_MACH_S3C2440_COMMON_H



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

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



#endif /* __ARCH_ARM_MACH_S3C2440_COMMON_H */

arch/arm/mach-s3c2440/mach-anubis.c

+1 −1
Original line number Diff line number Diff line
@@ -487,5 +487,5 @@ MACHINE_START(ANUBIS, "Simtec-Anubis") 
	.init_machine	= anubis_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END

arch/arm/mach-s3c2440/mach-at2440evb.c

+1 −1
Original line number Diff line number Diff line
@@ -222,5 +222,5 @@ MACHINE_START(AT2440EVB, "AT2440EVB") 
	.init_machine	= at2440evb_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END

arch/arm/mach-s3c2440/mach-gta02.c

+1 −1
Original line number Diff line number Diff line
@@ -601,5 +601,5 @@ MACHINE_START(NEO1973_GTA02, "GTA02") 
	.init_irq	= s3c24xx_init_irq,

	.init_machine	= gta02_machine_init,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END

arch/arm/mach-s3c2440/mach-mini2440.c

+1 −1
Original line number Diff line number Diff line
@@ -701,5 +701,5 @@ MACHINE_START(MINI2440, "MINI2440") 
	.init_machine	= mini2440_init,

	.init_irq	= s3c24xx_init_irq,

	.timer		= &s3c24xx_timer,

	.restart	= s3c2440_restart,

	.restart	= s3c244x_restart,

MACHINE_END