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

Commit 04a49b71 authored by Romain Naour's avatar Romain Naour Committed by Kukjin Kim
Browse files

ARM: S3C64XX: Add samsung-time support for s3c64xx 



Signed-off-by: default avatarNaour Romain <romain.naour@openwide.fr>
[tomasz.figa@gmail.com: tested on a Tiny6410 board]
Reviewed-and-Tested-by: default avatarTomasz Figa <tomasz.figa@gmail.com>
Reviewed-by: default avatarHeiko Stuebner <heiko@sntech.de>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 7f78b6eb

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -790,10 +790,11 @@ config ARCH_S3C64XX 
	bool "Samsung S3C64XX"

	select ARCH_HAS_CPUFREQ

	select ARCH_REQUIRE_GPIOLIB

	select ARCH_USES_GETTIMEOFFSET

	select ARM_VIC

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select CPU_V6

	select GENERIC_CLOCKEVENTS

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

arch/arm/mach-s3c64xx/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -17,11 +17,13 @@ config PLAT_S3C64XX 
# Configuration options for the S3C6410 CPU



config CPU_S3C6400

	select SAMSUNG_HRT

	bool

	help

	  Enable S3C6400 CPU support



config CPU_S3C6410

	select SAMSUNG_HRT

	bool

	help

	  Enable S3C6410 CPU support

arch/arm/mach-s3c64xx/mach-anw6410.c

+3 −1
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ 
#include <plat/devs.h>

#include <plat/cpu.h>

#include <mach/regs-gpio.h>

#include <plat/samsung-time.h>



#include "common.h"

#include "regs-modem.h"
@@ -208,6 +209,7 @@ static void __init anw6410_map_io(void) 
	s3c64xx_init_io(anw6410_iodesc, ARRAY_SIZE(anw6410_iodesc));

	s3c24xx_init_clocks(12000000);

	s3c24xx_init_uarts(anw6410_uartcfgs, ARRAY_SIZE(anw6410_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);



	anw6410_lcd_mode_set();

}
@@ -232,6 +234,6 @@ MACHINE_START(ANW6410, "A&W6410") 
	.map_io		= anw6410_map_io,

	.init_machine	= anw6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-crag6410.c

+3 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include <plat/adc.h>

#include <linux/platform_data/i2c-s3c2410.h>

#include <plat/pm.h>

#include <plat/samsung-time.h>



#include "common.h"

#include "crag6410.h"
@@ -744,6 +745,7 @@ static void __init crag6410_map_io(void) 
	s3c64xx_init_io(NULL, 0);

	s3c24xx_init_clocks(12000000);

	s3c24xx_init_uarts(crag6410_uartcfgs, ARRAY_SIZE(crag6410_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);



	/* LCD type and Bypass set by bootloader */

}
@@ -868,6 +870,6 @@ MACHINE_START(WLF_CRAGG_6410, "Wolfson Cragganmore 6410") 
	.map_io		= crag6410_map_io,

	.init_machine	= crag6410_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END

arch/arm/mach-s3c64xx/mach-hmt.c

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <plat/clock.h>

#include <plat/devs.h>

#include <plat/cpu.h>

#include <plat/samsung-time.h>



#include "common.h"
@@ -248,6 +249,7 @@ static void __init hmt_map_io(void) 
	s3c64xx_init_io(hmt_iodesc, ARRAY_SIZE(hmt_iodesc));

	s3c24xx_init_clocks(12000000);

	s3c24xx_init_uarts(hmt_uartcfgs, ARRAY_SIZE(hmt_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

}



static void __init hmt_machine_init(void)
@@ -275,6 +277,6 @@ MACHINE_START(HMT, "Airgoo-HMT") 
	.map_io		= hmt_map_io,

	.init_machine	= hmt_machine_init,

	.init_late	= s3c64xx_init_late,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c64xx_restart,

MACHINE_END