From: andrzej zaborowski Date: Tue, 22 May 2007 17:22:12 +0000 (+0200) Subject: Re-add a lost TSC2102 touchscreen Kconfig entry X-Git-Tag: v2.6.22-omap1~118 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=cafb944dd8e8ba61a7fa2a3a4fcf289e58623dbf;p=linux-2.6-omap-h63xx.git Re-add a lost TSC2102 touchscreen Kconfig entry The TSC2102 option in drivers/input/touchscreen/Kconfig got lost somewhere in January (although the commit is not visible in git-web), so adding it back. Also remove the input_dev.dev assignment due to an upstream change. Signed-off-by: Andrzej Zaborowski From 492e5cbe39613f06b8146c12bff9500259739fd5 Mon Sep 17 00:00:00 2001 From: Andrzej Zaborowski Date: Tue, 22 May 2007 20:08:47 +0200 Subject: [PATCH] Re-add a lost TSC2102 touchscreen Kconfig entry. The TSC2102 option in drivers/input/touchscreen/Kconfig got lost somewhere in January (although the commit is not visible in git-web), so adding it back. Also remove the input_dev.dev assignment due to an upstream change. Signed-off-by: Tony Lindgren --- diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index f8abc9ec89a..fe6fc0de248 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -164,6 +164,21 @@ config TOUCHSCREEN_UCB1400 To compile this driver as a module, choose M here: the module will be called ucb1400_ts. +config TOUCHSCREEN_TSC2102 + tristate "TSC 2102 based touchscreens" + depends on SPI_MASTER + select SPI_TSC2102 + help + Say Y here if you have a touchscreen interface using the + TI TSC 2102 controller, and your board-specific initialization + code includes that in its table of SPI devices. Also make + sure the proper SPI controller is selected. + + If unsure, say N (but it's safe to say "Y"). + + To compile this driver as a module, choose M here: the + module will be called tsc2102_ts. + config TOUCHSCREEN_TSC2301 tristate "TSC2301 touchscreen support" depends on SPI_TSC2301 diff --git a/drivers/input/touchscreen/tsc2102_ts.c b/drivers/input/touchscreen/tsc2102_ts.c index 81882639c90..b6ed92757ed 100644 --- a/drivers/input/touchscreen/tsc2102_ts.c +++ b/drivers/input/touchscreen/tsc2102_ts.c @@ -81,7 +81,6 @@ static int tsc2102_ts_probe(struct platform_device *pdev) } dev->name = "TSC2102 Touchscreen"; - dev->dev = &pdev->dev; dev->cdev.dev = &pdev->dev; dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);