Skip to contentSkip to conversation

Adds TSADC support for S3C64XX, S5P6440, and S5PV210

PATCH New Kukjin Kim 2 participants 5 messages May 20, 2010

Subsystems (3)
lore
Share & tools
lore

Kukjin Kim

author
#0 lore raw

v4 cover Adds TSADC support for S3C64XX, S5P6440, and S5PV210

This patches add TSADC support for S3C64XX, S5P6440 and S5PV210 which were made against Ben Dooks' tree on for-2635-2/samsung-ts branch.

Now SMDK6410, SMDK6440 and SMDKV210 are availabe and will add SMDKC110.

[PATCH v4 1/3] ARM: S3C64XX: Adds Touchscreen support for S3C64XX [PATCH v4 2/3] ARM: S5P6440: Adds Touchscreen support for S5P6440 [PATCH v4 3/3] ARM: S5PV210: Adds Touchscreen support for S5PV210

author
#1 lore raw

PATCH v4 1/3 ARM: S3C64XX: Adds Touchscreen support for S3C64XX

From: Naveen Krishna Ch <[email protected]>

This patch adds touchscreen support for S3C64XX.

---
 arch/arm/mach-s3c64xx/Kconfig         |    1 +
 arch/arm/mach-s3c64xx/mach-smdk6410.c |   12 ++++++++++++
 2 files changed, 13 insertions(+), 0 deletions(-)
arch/arm/mach-s3c64xx/Kconfig +1 -0
index 69e9fbf..1f2f412 100644
@@ -90,6 +90,7 @@ config MACH_SMDK6410
 	select S3C_DEV_HSMMC1
 	select S3C_DEV_I2C1
 	select S3C_DEV_FB
+	select SAMSUNG_DEV_TS
 	select S3C_DEV_USB_HOST
 	select S3C_DEV_USB_HSOTG
 	select S3C64XX_SETUP_SDHCI
arch/arm/mach-s3c64xx/mach-smdk6410.c +12 -0
index 9d51455..d0c6e9b 100644
@@ -64,6 +64,8 @@
 #include <plat/clock.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 #define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
 #define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -262,6 +264,8 @@ static struct platform_device *smdk6410_devices[] __initdata = {
 	&smdk6410_lcd_powerdev,
 
 	&smdk6410_smsc911x,
+	&s3c_device_adc,
+	&s3c_device_ts,
 };
 
 #ifdef CONFIG_REGULATOR
@@ -596,6 +600,12 @@ static struct i2c_board_info i2c_devs1[] __initdata = {
 	{ I2C_BOARD_INFO("24c128", 0x57), },	/* Samsung S524AD0XD1 */
 };
 
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+	.delay			= 10000,
+	.presc			= 49,
+	.oversampling_shift	= 2,
+};
+
 static void __init smdk6410_map_io(void)
 {
 	u32 tmp;
@@ -625,6 +635,8 @@ static void __init smdk6410_machine_init(void)
 	s3c_i2c1_set_platdata(NULL);
 	s3c_fb_set_platdata(&smdk6410_lcd_pdata);
 
+	s3c24xx_ts_set_platdata(&s3c_ts_platform);
+
 	/* configure nCS1 width to 16 bits */
 
 	cs1 = __raw_readl(S3C64XX_SROM_BW) &
author
#2 lore raw

PATCH v4 2/3 ARM: S5P6440: Adds Touchscreen support for S5P6440

From: Naveen Krishna Ch <[email protected]>

This patch adds touchscreen support for S5P6440.

Signed-off-by Naveen Krishna Ch <ch.naveen at samsung.com
---
 arch/arm/mach-s5p6440/Kconfig            |    2 ++
 arch/arm/mach-s5p6440/cpu.c              |    1 +
 arch/arm/mach-s5p6440/include/mach/map.h |    3 +++
 arch/arm/mach-s5p6440/mach-smdk6440.c    |   12 ++++++++++++
 4 files changed, 18 insertions(+), 0 deletions(-)
arch/arm/mach-s5p6440/Kconfig +2 -0
index 77aeffd..ef00cb7 100644
@@ -16,6 +16,8 @@ config CPU_S5P6440
 config MACH_SMDK6440
 	bool "SMDK6440"
 	select CPU_S5P6440
+	select SAMSUNG_DEV_TS
+	select SAMSUNG_DEV_ADC
 	help
 	  Machine support for the Samsung SMDK6440
 
arch/arm/mach-s5p6440/cpu.c +1 -0
index ca3b320..b2fe6a5 100644
@@ -61,6 +61,7 @@ static void s5p6440_idle(void)
 void __init s5p6440_map_io(void)
 {
 	/* initialize any device information early */
+	s3c_device_adc.name	= "s3c64xx-adc";
 }
 
 void __init s5p6440_init_clocks(int xtal)
arch/arm/mach-s5p6440/include/mach/map.h +3 -0
index 72aedad..13c1ee7 100644
@@ -69,8 +69,11 @@
 /* PCM */
 #define S5P6440_PA_PCM		0xF2100000
 
+#define S5P6440_PA_ADC		(0xF3000000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART		S5P6440_PA_UART
 #define S3C_PA_IIC		S5P6440_PA_IIC0
+#define SAMSUNG_PA_ADC		S5P6440_PA_ADC
 
 #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5p6440/mach-smdk6440.c +12 -0
index d7fede9..f994817 100644
@@ -38,6 +38,8 @@
 #include <plat/devs.h>
 #include <plat/cpu.h>
 #include <plat/pll.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 #define S5P6440_UCON_DEFAULT    (S3C2410_UCON_TXILEVEL |	\
 				S3C2410_UCON_RXILEVEL |		\
@@ -85,6 +87,14 @@ static struct s3c2410_uartcfg smdk6440_uartcfgs[] __initdata = {
 
 static struct platform_device *smdk6440_devices[] __initdata = {
 	&s5p6440_device_iis,
+	&s3c_device_adc,
+	&s3c_device_ts,
+};
+
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+	.delay			= 10000,
+	.presc			= 49,
+	.oversampling_shift	= 2,
 };
 
 static void __init smdk6440_map_io(void)
@@ -96,6 +106,8 @@ static void __init smdk6440_map_io(void)
 
 static void __init smdk6440_machine_init(void)
 {
+	s3c24xx_ts_set_platdata(&s3c_ts_platform);
+
 	platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));
 }
 
author
#3 lore raw

PATCH v4 3/3 ARM: S5PV210: Adds Touchscreen support for S5PV210

From: Naveen Krishna Ch <[email protected]>

This patch adds touchscreen support for S5PV210.

Note: TSADC in S5PV210 support 2 touchscreen interfaces, Only 1 is implemented as of now.

---
 arch/arm/mach-s5pv210/Kconfig            |    2 ++
 arch/arm/mach-s5pv210/cpu.c              |    2 ++
 arch/arm/mach-s5pv210/include/mach/map.h |    3 +++
 arch/arm/mach-s5pv210/mach-smdkv210.c    |   11 +++++++++++
 4 files changed, 18 insertions(+), 0 deletions(-)
arch/arm/mach-s5pv210/Kconfig +2 -0
index 7601c28..b05988f 100644
@@ -25,6 +25,8 @@ config MACH_SMDKV210
 	bool "SMDKV210"
 	select CPU_S5PV210
 	select ARCH_SPARSEMEM_ENABLE
+	select SAMSUNG_DEV_ADC
+	select SAMSUNG_DEV_TS
 	help
 	  Machine support for Samsung SMDKV210
 
arch/arm/mach-s5pv210/cpu.c +2 -0
index 2b776eb..359bdc8 100644
@@ -74,6 +74,8 @@ static void s5pv210_idle(void)
 
 void __init s5pv210_map_io(void)
 {
+	s3c_device_adc.name	= "s3c64xx-adc";
+
 	iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc));
 }
 
arch/arm/mach-s5pv210/include/mach/map.h +3 -0
index 5adcb9f..e859570 100644
@@ -75,8 +75,11 @@
 /* AC97 */
 #define S5PV210_PA_AC97		0xE2200000
 
+#define S5PV210_PA_ADC		(0xE1700000)
+
 /* compatibiltiy defines. */
 #define S3C_PA_UART		S5PV210_PA_UART
 #define S3C_PA_IIC		S5PV210_PA_IIC0
+#define SAMSUNG_PA_ADC		S5PV210_PA_ADC
 
 #endif /* __ASM_ARCH_MAP_H */
arch/arm/mach-s5pv210/mach-smdkv210.c +11 -0
index 3c29e18..b92beb6 100644
@@ -25,6 +25,8 @@
 #include <plat/s5pv210.h>
 #include <plat/devs.h>
 #include <plat/cpu.h>
+#include <plat/adc.h>
+#include <plat/ts.h>
 
 /* Following are default values for UCON, ULCON and UFCON UART registers */
 #define S5PV210_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
@@ -74,6 +76,14 @@ static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
 static struct platform_device *smdkv210_devices[] __initdata = {
 	&s5pv210_device_iis0,
 	&s5pv210_device_ac97,
+	&s3c_device_adc,
+	&s3c_device_ts,
+};
+
+static struct s3c2410_ts_mach_info s3c_ts_platform __initdata = {
+	.delay			= 10000,
+	.presc			= 49,
+	.oversampling_shift	= 2,
 };
 
 static void __init smdkv210_map_io(void)
@@ -85,6 +95,7 @@ static void __init smdkv210_map_io(void)
 
 static void __init smdkv210_machine_init(void)
 {
+	s3c24xx_ts_set_platdata(&s3c_ts_platform);
 	platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices));
 }
 
#4 lore raw

v4 cover Adds TSADC support for S3C64XX, S5P6440, and S5PV210

In reply to Kukjin Kim
Quoted 8 lines · Kukjin Kim

This patches add TSADC support for S3C64XX, S5P6440 and S5PV210 which were made against Ben Dooks' tree on for-2635-2/samsung-ts branch.

Now SMDK6410, SMDK6440 and SMDKV210 are availabe and will add SMDKC110.

[PATCH v4 1/3] ARM: S3C64XX: Adds Touchscreen support for S3C64XX [PATCH v4 2/3] ARM: S5P6440: Adds Touchscreen support for S5P6440 [PATCH v4 3/3] ARM: S5PV210: Adds Touchscreen support for S5PV210

Ok, please remember --no-chain-reply-to next time.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.