UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

ARM: S5PC100: Add Watchdog support for S5PC100 

This patch adds support for Watchdog timer for Samsung S5PC100.

Signed-off-by: Banajit Goswami <banajit.g@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Banajit Goswami 2010-06-18 12:12:06 +05:30 committed by Kukjin Kim
parent 327b90305e
commit c4023617f3
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-s5pc100/Kconfig
View File

@ -52,6 +52,8 @@ config MACH_SMDKC100
select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select SAMSUNG_DEV_TS select SAMSUNG_DEV_TS
select S3C_DEV_WDT
select HAVE_S3C2410_WATCHDOG
select S5PC100_SETUP_FB_24BPP select S5PC100_SETUP_FB_24BPP
select S5PC100_SETUP_I2C1 select S5PC100_SETUP_I2C1
select S5PC100_SETUP_IDE select S5PC100_SETUP_IDE

3
arch/arm/mach-s5pc100/include/mach/map.h
View File

@ -74,6 +74,8 @@
#define S5PC100_PA_SYSTIMER (0xEA100000) #define S5PC100_PA_SYSTIMER (0xEA100000)
#define S5PC100_PA_WATCHDOG (0xEA200000)
#define S5PC100_PA_UART (0xEC000000) #define S5PC100_PA_UART (0xEC000000)
#define S5P_PA_UART0 (S5PC100_PA_UART + 0x0) #define S5P_PA_UART0 (S5PC100_PA_UART + 0x0)
@ -134,6 +136,7 @@
#define S3C_PA_HSMMC1 S5PC100_PA_HSMMC(1) #define S3C_PA_HSMMC1 S5PC100_PA_HSMMC(1)
#define S3C_PA_HSMMC2 S5PC100_PA_HSMMC(2) #define S3C_PA_HSMMC2 S5PC100_PA_HSMMC(2)
#define S3C_PA_KEYPAD S5PC100_PA_KEYPAD #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 S5PC100_PA_ONENAND
#define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF #define S3C_PA_ONENAND_BUF S5PC100_PA_ONENAND_BUF
#define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF #define S3C_SZ_ONENAND_BUF S5PC100_SZ_ONENAND_BUF

6
arch/arm/mach-s5pc100/mach-smdkc100.c
View File

@ -157,11 +157,8 @@ static struct s3c_ide_platdata smdkc100_ide_pdata __initdata = {
}; };
static struct platform_device *smdkc100_devices[] __initdata = { static struct platform_device *smdkc100_devices[] __initdata = {
<<<<<<< HEAD:arch/arm/mach-s5pc100/mach-smdkc100.c
&s3c_device_cfcon,
=======
&s3c_device_adc, &s3c_device_adc,
>>>>>>> c1b6d71... ARM: S5PC100: Add Touchscreen support.:arch/arm/mach-s5pc100/mach-smdkc100.c &s3c_device_cfcon,
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_i2c1, &s3c_device_i2c1,
&s3c_device_fb, &s3c_device_fb,
@ -169,6 +166,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
&s3c_device_hsmmc1, &s3c_device_hsmmc1,
&s3c_device_hsmmc2, &s3c_device_hsmmc2,
&s3c_device_ts, &s3c_device_ts,
&s3c_device_wdt,
&smdkc100_lcd_powerdev, &smdkc100_lcd_powerdev,
&s5pc100_device_iis0, &s5pc100_device_iis0,
&s5pc100_device_ac97, &s5pc100_device_ac97,