diff options
author | Naveen Krishna <ch.naveen@samsung.com> | 2010-05-18 07:44:27 -0400 |
---|---|---|
committer | Ben Dooks <ben-linux@fluff.org> | 2010-05-19 05:25:22 -0400 |
commit | 5bfdca146edc558ae6b3bac6b05dc5b1f094fbf3 (patch) | |
tree | 16f5d546a0ac4cd948efa8576ce20f8ecc6f865e /arch/arm/mach-s3c2410 | |
parent | 909de0d67dbd9488d5f77bdcadcd34264fea3c02 (diff) |
ARM: SAMSUNG: Implements cfg_gpio function for Samsung touchscreen
This patch implements cfg_gpio function for Samsung touchscreen.
And also modifies the H1940 machine respectively.
Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Diffstat (limited to 'arch/arm/mach-s3c2410')
-rw-r--r-- | arch/arm/mach-s3c2410/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c2410/mach-h1940.c | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig index a4c0b3fcdbba..7245a55795dc 100644 --- a/arch/arm/mach-s3c2410/Kconfig +++ b/arch/arm/mach-s3c2410/Kconfig | |||
@@ -77,6 +77,7 @@ config ARCH_H1940 | |||
77 | select PM_H1940 if PM | 77 | select PM_H1940 if PM |
78 | select S3C_DEV_USB_HOST | 78 | select S3C_DEV_USB_HOST |
79 | select S3C_DEV_NAND | 79 | select S3C_DEV_NAND |
80 | select S3C2410_SETUP_TS | ||
80 | help | 81 | help |
81 | Say Y here if you are using the HP IPAQ H1940 | 82 | Say Y here if you are using the HP IPAQ H1940 |
82 | 83 | ||
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c index b1f7dbb3bb60..779b45b3f80f 100644 --- a/arch/arm/mach-s3c2410/mach-h1940.c +++ b/arch/arm/mach-s3c2410/mach-h1940.c | |||
@@ -146,6 +146,7 @@ static struct s3c2410_ts_mach_info h1940_ts_cfg __initdata = { | |||
146 | .delay = 10000, | 146 | .delay = 10000, |
147 | .presc = 49, | 147 | .presc = 49, |
148 | .oversampling_shift = 2, | 148 | .oversampling_shift = 2, |
149 | .cfg_gpio = s3c24xx_ts_cfg_gpio, | ||
149 | }; | 150 | }; |
150 | 151 | ||
151 | /** | 152 | /** |