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

Commit c4023617 authored by Banajit Goswami's avatar Banajit Goswami Committed by Kukjin Kim
Browse files

ARM: S5PC100: Add Watchdog support for S5PC100 



This patch adds support for Watchdog timer for Samsung S5PC100.

Signed-off-by: default avatarBanajit Goswami <banajit.g@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 327b9030

arch/arm/mach-s5pc100/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,8 @@ config MACH_SMDKC100 
	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select SAMSUNG_DEV_TS

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PC100_SETUP_FB_24BPP

	select S5PC100_SETUP_I2C1

	select S5PC100_SETUP_IDE

arch/arm/mach-s5pc100/include/mach/map.h

+3 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ 


#define S5PC100_PA_SYSTIMER	(0xEA100000)



#define S5PC100_PA_WATCHDOG	(0xEA200000)



#define S5PC100_PA_UART		(0xEC000000)



#define S5P_PA_UART0		(S5PC100_PA_UART + 0x0)
@@ -134,6 +136,7 @@ 
#define S3C_PA_HSMMC1		S5PC100_PA_HSMMC(1)

#define S3C_PA_HSMMC2		S5PC100_PA_HSMMC(2)

#define S3C_PA_KEYPAD		S5PC100_PA_KEYPAD

#define S3C_PA_WDT		S5PC100_PA_WATCHDOG

#define S3C_PA_ONENAND		S5PC100_PA_ONENAND

#define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF

#define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF

arch/arm/mach-s5pc100/mach-smdkc100.c

+2 −4
Original line number Diff line number Diff line
@@ -157,11 +157,8 @@ static struct s3c_ide_platdata smdkc100_ide_pdata __initdata = { 
};



static struct platform_device *smdkc100_devices[] __initdata = {

<<<<<<< HEAD:arch/arm/mach-s5pc100/mach-smdkc100.c

	&s3c_device_cfcon,

=======

	&s3c_device_adc,

>>>>>>> c1b6d71... ARM: S5PC100: Add Touchscreen support.:arch/arm/mach-s5pc100/mach-smdkc100.c

	&s3c_device_cfcon,

	&s3c_device_i2c0,

	&s3c_device_i2c1,

	&s3c_device_fb,
@@ -169,6 +166,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { 
	&s3c_device_hsmmc1,

	&s3c_device_hsmmc2,

	&s3c_device_ts,

	&s3c_device_wdt,

	&smdkc100_lcd_powerdev,

	&s5pc100_device_iis0,

	&s5pc100_device_ac97,