Input: s3c24xx_ts - Implement generic GPIO configuration callback
This patch implements generic GPIO configuration function in Samsung touchscreen driver. And makes the touchscreen driver s3c24xx-ts.c generic to all the Samsung SoCs. Signed-off-by: Naveen Krishna Ch <ch.naveen@samsung.com> Signed-off-by: Kukjin Kim <kgene.kim@samsung.com> [ben-linux@fluff.org: fixed title ] Signed-off-by: Ben Dooks <ben-linux@fluff.org> Acked-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Родитель
2b6c02abca
Коммит
658ad39ea9
|
@ -39,8 +39,6 @@
|
|||
#include <plat/regs-adc.h>
|
||||
#include <plat/ts.h>
|
||||
|
||||
#include <mach/regs-gpio.h>
|
||||
|
||||
#define TSC_SLEEP (S3C2410_ADCTSC_PULL_UP_DISABLE | S3C2410_ADCTSC_XY_PST(0))
|
||||
|
||||
#define INT_DOWN (0)
|
||||
|
@ -87,21 +85,6 @@ struct s3c2410ts {
|
|||
|
||||
static struct s3c2410ts ts;
|
||||
|
||||
/**
|
||||
* s3c2410_ts_connect - configure gpio for s3c2410 systems
|
||||
*
|
||||
* Configure the GPIO for the S3C2410 system, where we have external FETs
|
||||
* connected to the device (later systems such as the S3C2440 integrate
|
||||
* these into the device).
|
||||
*/
|
||||
static inline void s3c2410_ts_connect(void)
|
||||
{
|
||||
s3c2410_gpio_cfgpin(S3C2410_GPG(12), S3C2410_GPG12_XMON);
|
||||
s3c2410_gpio_cfgpin(S3C2410_GPG(13), S3C2410_GPG13_nXPON);
|
||||
s3c2410_gpio_cfgpin(S3C2410_GPG(14), S3C2410_GPG14_YMON);
|
||||
s3c2410_gpio_cfgpin(S3C2410_GPG(15), S3C2410_GPG15_nYPON);
|
||||
}
|
||||
|
||||
/**
|
||||
* get_down - return the down state of the pen
|
||||
* @data0: The data read from ADCDAT0 register.
|
||||
|
@ -296,9 +279,9 @@ static int __devinit s3c2410ts_probe(struct platform_device *pdev)
|
|||
goto err_clk;
|
||||
}
|
||||
|
||||
/* Configure the touchscreen external FETs on the S3C2410 */
|
||||
if (!platform_get_device_id(pdev)->driver_data)
|
||||
s3c2410_ts_connect();
|
||||
/* inititalise the gpio */
|
||||
if (info->cfg_gpio)
|
||||
info->cfg_gpio(to_platform_device(ts.dev));
|
||||
|
||||
ts.client = s3c_adc_register(pdev, s3c24xx_ts_select,
|
||||
s3c24xx_ts_conversion, 1);
|
||||
|
|
Загрузка…
Ссылка в новой задаче