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

Commit 7f78b6eb authored by Romain Naour's avatar Romain Naour Committed by Kukjin Kim
Browse files

ARM: S3C24XX: Add samsung-time support for s3c24xx 



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

arch/arm/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -770,8 +770,10 @@ config ARCH_SA1100 
config ARCH_S3C24XX

	bool "Samsung S3C24XX SoCs"

	select ARCH_HAS_CPUFREQ

	select ARCH_USES_GETTIMEOFFSET

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

	select GENERIC_CLOCKEVENTS

	select GENERIC_GPIO

	select HAVE_CLK

	select HAVE_S3C2410_I2C if I2C

	select HAVE_S3C2410_WATCHDOG if WATCHDOG

arch/arm/mach-s3c24xx/Kconfig

+6 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ config CPU_S3C2410 
	select S3C2410_CLOCK

	select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX

	select S3C2410_PM if PM

	select SAMSUNG_HRT

	help

	  Support for S3C2410 and S3C2410A family from the S3C24XX line

	  of Samsung Mobile CPUs.
@@ -41,6 +42,7 @@ config CPU_S3C2412 
	select CPU_LLSERIAL_S3C2440

	select S3C2412_DMA if S3C24XX_DMA

	select S3C2412_PM if PM

	select SAMSUNG_HRT

	help

	  Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
@@ -53,6 +55,7 @@ config CPU_S3C2416 
	select S3C2443_COMMON

	select S3C2443_DMA if S3C24XX_DMA

	select SAMSUNG_CLKSRC

	select SAMSUNG_HRT

	help

	  Support for the S3C2416 SoC from the S3C24XX line
@@ -63,6 +66,7 @@ config CPU_S3C2440 
	select S3C2410_CLOCK

	select S3C2410_PM if PM

	select S3C2440_DMA if S3C24XX_DMA

	select SAMSUNG_HRT

	help

	  Support for S3C2440 Samsung Mobile CPU based systems.
@@ -72,6 +76,7 @@ config CPU_S3C2442 
	select CPU_LLSERIAL_S3C2440

	select S3C2410_CLOCK

	select S3C2410_PM if PM

	select SAMSUNG_HRT

	help

	  Support for S3C2442 Samsung Mobile CPU based systems.
@@ -87,6 +92,7 @@ config CPU_S3C2443 
	select S3C2443_COMMON

	select S3C2443_DMA if S3C24XX_DMA

	select SAMSUNG_CLKSRC

	select SAMSUNG_HRT

	help

	  Support for the S3C2443 SoC from the S3C24XX line

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

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

#include <linux/mtd/physmap.h>



#include <plat/samsung-time.h>



#include "common.h"



static struct resource amlm5900_nor_resource =
@@ -160,6 +162,7 @@ static void __init amlm5900_map_io(void) 
	s3c24xx_init_io(amlm5900_iodesc, ARRAY_SIZE(amlm5900_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(amlm5900_uartcfgs, ARRAY_SIZE(amlm5900_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

}



#ifdef CONFIG_FB_S3C2410
@@ -237,6 +240,6 @@ MACHINE_START(AML_M5900, "AML_M5900") 
	.map_io		= amlm5900_map_io,

	.init_irq	= s3c24xx_init_irq,

	.init_machine	= amlm5900_init,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c2410_restart,

MACHINE_END

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

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

#include <plat/cpu.h>

#include <linux/platform_data/asoc-s3c24xx_simtec.h>

#include <plat/samsung-time.h>



#include "anubis.h"

#include "common.h"
@@ -410,6 +411,7 @@ static void __init anubis_map_io(void) 
	s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));

	s3c24xx_init_clocks(0);

	s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);



	/* check for the newer revision boards with large page nand */
@@ -444,6 +446,6 @@ MACHINE_START(ANUBIS, "Simtec-Anubis") 
	.map_io		= anubis_map_io,

	.init_machine	= anubis_init,

	.init_irq	= s3c24xx_init_irq,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c244x_restart,

MACHINE_END

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

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

#include <plat/cpu.h>

#include <linux/platform_data/mmc-s3cmci.h>

#include <plat/samsung-time.h>



#include "common.h"
@@ -192,6 +193,7 @@ static void __init at2440evb_map_io(void) 
	s3c24xx_init_io(at2440evb_iodesc, ARRAY_SIZE(at2440evb_iodesc));

	s3c24xx_init_clocks(16934400);

	s3c24xx_init_uarts(at2440evb_uartcfgs, ARRAY_SIZE(at2440evb_uartcfgs));

	samsung_set_timer_source(SAMSUNG_PWM3, SAMSUNG_PWM4);

}



static void __init at2440evb_init(void)
@@ -210,6 +212,6 @@ MACHINE_START(AT2440EVB, "AT2440EVB") 
	.map_io		= at2440evb_map_io,

	.init_machine	= at2440evb_init,

	.init_irq	= s3c24xx_init_irq,

	.init_time	= s3c24xx_timer_init,

	.init_time	= samsung_timer_init,

	.restart	= s3c244x_restart,

MACHINE_END