AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

ARM: S5PC100: Add Touchscreen support.

Browse Source 
This patch adds touchscreen support for S5PC100.

Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
This commit is contained in:
Naveen Krishna Ch 2010-06-30 21:50:24 +09:00 committed by Kukjin Kim
parent 66194a74c2
commit 327b90305e
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,12 +44,14 @@ config S5PC100_SETUP_SDHCI_GPIO
config MACH_SMDKC100 config MACH_SMDKC100
bool "SMDKC100" bool "SMDKC100"
select CPU_S5PC100 select CPU_S5PC100
select SAMSUNG_DEV_ADC
select S3C_DEV_FB select S3C_DEV_FB
select S3C_DEV_I2C1 select S3C_DEV_I2C1
select SAMSUNG_DEV_IDE select SAMSUNG_DEV_IDE
select S3C_DEV_HSMMC select S3C_DEV_HSMMC
select S3C_DEV_HSMMC1 select S3C_DEV_HSMMC1
select S3C_DEV_HSMMC2 select S3C_DEV_HSMMC2
select SAMSUNG_DEV_TS
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/cpu.c
View File

@ -41,6 +41,7 @@
#include <plat/ata-core.h> #include <plat/ata-core.h>
#include <plat/iic-core.h> #include <plat/iic-core.h>
#include <plat/sdhci.h> #include <plat/sdhci.h>
#include <plat/adc-core.h>
#include <plat/onenand-core.h> #include <plat/onenand-core.h>
#include <plat/s5pc100.h> #include <plat/s5pc100.h>
@ -88,6 +89,8 @@ void __init s5pc100_map_io(void)
s5pc100_default_sdhci1(); s5pc100_default_sdhci1();
s5pc100_default_sdhci2(); s5pc100_default_sdhci2();
s3c_adc_setname("s3c64xx-adc");
/* the i2c devices are directly compatible with s3c2440 */ /* the i2c devices are directly compatible with s3c2440 */
s3c_i2c0_setname("s3c2440-i2c"); s3c_i2c0_setname("s3c2440-i2c");
s3c_i2c1_setname("s3c2440-i2c"); s3c_i2c1_setname("s3c2440-i2c");

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

@ -106,6 +106,8 @@
#define S5PC100_PA_PCM0 0xF2400000 #define S5PC100_PA_PCM0 0xF2400000
#define S5PC100_PA_PCM1 0xF2500000 #define S5PC100_PA_PCM1 0xF2500000
#define S5PC100_PA_TSADC (0xF3000000)
/* KEYPAD */ /* KEYPAD */
#define S5PC100_PA_KEYPAD (0xF3100000) #define S5PC100_PA_KEYPAD (0xF3100000)
@ -132,11 +134,11 @@
#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_TSADC S5PC100_PA_TSADC
#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
#define SAMSUNG_PA_ADC S5PC100_PA_TSADC
#define SAMSUNG_PA_CFCON S5PC100_PA_CFCON #define SAMSUNG_PA_CFCON S5PC100_PA_CFCON
#endif /* __ASM_ARCH_C100_MAP_H */ #endif /* __ASM_ARCH_C100_MAP_H */

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

@ -43,6 +43,8 @@
#include <plat/fb.h> #include <plat/fb.h>
#include <plat/iic.h> #include <plat/iic.h>
#include <plat/ata.h> #include <plat/ata.h>
#include <plat/adc.h>
#include <plat/ts.h>
/* Following are default values for UCON, ULCON and UFCON UART registers */ /* Following are default values for UCON, ULCON and UFCON UART registers */
#define S5PC100_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \ #define S5PC100_UCON_DEFAULT (S3C2410_UCON_TXILEVEL | \
@ -155,18 +157,29 @@ 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_cfcon,
=======
&s3c_device_adc,
>>>>>>> c1b6d71... ARM: S5PC100: Add Touchscreen support.:arch/arm/mach-s5pc100/mach-smdkc100.c
&s3c_device_i2c0, &s3c_device_i2c0,
&s3c_device_i2c1, &s3c_device_i2c1,
&s3c_device_fb, &s3c_device_fb,
&s3c_device_hsmmc0, &s3c_device_hsmmc0,
&s3c_device_hsmmc1, &s3c_device_hsmmc1,
&s3c_device_hsmmc2, &s3c_device_hsmmc2,
&s3c_device_ts,
&smdkc100_lcd_powerdev, &smdkc100_lcd_powerdev,
&s5pc100_device_iis0, &s5pc100_device_iis0,
&s5pc100_device_ac97, &s5pc100_device_ac97,
}; };
static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
.delay = 10000,
.presc = 49,
.oversampling_shift = 2,
};
static void __init smdkc100_map_io(void) static void __init smdkc100_map_io(void)
{ {
s5p_init_io(NULL, 0, S5P_VA_CHIPID); s5p_init_io(NULL, 0, S5P_VA_CHIPID);
@ -176,6 +189,8 @@ static void __init smdkc100_map_io(void)
static void __init smdkc100_machine_init(void) static void __init smdkc100_machine_init(void)
{ {
s3c24xx_ts_set_platdata(&s3c_ts_platform);
/* I2C */ /* I2C */
s3c_i2c0_set_platdata(NULL); s3c_i2c0_set_platdata(NULL);
s3c_i2c1_set_platdata(NULL); s3c_i2c1_set_platdata(NULL);