From 33910e8c9357c93b3ab09e1850bb6eda0473122e Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 8 Dec 2008 16:29:41 -0800 Subject: [PATCH] REMOVE OMAP LEGACY CODE: Get rid of old tsc2102_ts.c This should use tsc210x instead. Signed-off-by: Tony Lindgren --- drivers/input/touchscreen/Kconfig | 15 --- drivers/input/touchscreen/Makefile | 1 - drivers/input/touchscreen/tsc2102_ts.c | 163 ------------------------- 3 files changed, 179 deletions(-) delete mode 100644 drivers/input/touchscreen/tsc2102_ts.c diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig index dbbbb78af69..1ea5153040b 100644 --- a/drivers/input/touchscreen/Kconfig +++ b/drivers/input/touchscreen/Kconfig @@ -227,21 +227,6 @@ config TOUCHSCREEN_TSC2005 help Say Y here for if you are using the touchscreen features of TSC2005. -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_TSC210X tristate "TI TSC210x based touchscreens" depends on SPI_MASTER diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile index 2175a2c8464..a2530b83ff7 100644 --- a/drivers/input/touchscreen/Makefile +++ b/drivers/input/touchscreen/Makefile @@ -27,7 +27,6 @@ obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o obj-$(CONFIG_TOUCHSCREEN_TSC2005) += tsc2005.o -obj-$(CONFIG_TOUCHSCREEN_TSC2102) += tsc2102_ts.o obj-$(CONFIG_TOUCHSCREEN_TSC210X) += tsc210x_ts.o obj-$(CONFIG_TOUCHSCREEN_TSC2301) += tsc2301_ts.o obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx-ts.o diff --git a/drivers/input/touchscreen/tsc2102_ts.c b/drivers/input/touchscreen/tsc2102_ts.c deleted file mode 100644 index b6ed92757ed..00000000000 --- a/drivers/input/touchscreen/tsc2102_ts.c +++ /dev/null @@ -1,163 +0,0 @@ -/* - * input/touchscreen/tsc2102_ts.c - * - * Touchscreen input device driver for the TSC 2102 chip. - * - * Copyright (c) 2006 Andrzej Zaborowski - * - * This package is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This package is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this package; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#include -#include -#include -#include -#include -#include - -#include - -struct input_dev *dev; - -static void tsc2102_touch(int touching) -{ - if (!touching) { - input_report_abs(dev, ABS_X, 0); - input_report_abs(dev, ABS_Y, 0); - input_report_abs(dev, ABS_PRESSURE, 0); - input_sync(dev); - } - - input_report_key(dev, BTN_TOUCH, touching); -} - -static void tsc2102_coords(int x, int y, int z1, int z2) -{ - int p; - - /* Calculate the touch resistance a la equation #1 */ - if (z1 != 0) - p = x * (z2 - z1) / (z1 << 4); - else - p = 1; - - input_report_abs(dev, ABS_X, x); - input_report_abs(dev, ABS_Y, y); - input_report_abs(dev, ABS_PRESSURE, p); - input_sync(dev); -} - -static int tsc2102_ts_probe(struct platform_device *pdev) -{ - int status; - - dev = input_allocate_device(); - if (!dev) - return -ENOMEM; - - status = tsc2102_touch_cb(tsc2102_touch); - if (status) { - input_free_device(dev); - return status; - } - - status = tsc2102_coords_cb(tsc2102_coords); - if (status) { - tsc2102_touch_cb(0); - input_free_device(dev); - return status; - } - - dev->name = "TSC2102 Touchscreen"; - dev->cdev.dev = &pdev->dev; - dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS); - dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH); - dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE); - dev->phys = "tsc2102/input0"; - dev->id.bustype = BUS_HOST; - dev->id.vendor = 0x0001; - dev->id.product = 0x2102; - dev->id.version = 0x0001; - - status = input_register_device(dev); - if (status) { - tsc2102_coords_cb(0); - tsc2102_touch_cb(0); - input_free_device(dev); - return status; - } - - printk(KERN_INFO "TSC2102 touchscreen driver initialized\n"); - return 0; -} - -static int tsc2102_ts_remove(struct platform_device *pdev) -{ - tsc2102_touch_cb(0); - tsc2102_coords_cb(0); - input_unregister_device(dev); - input_free_device(dev); - return 0; -} - -#ifdef CONFIG_PM -static int -tsc2102_ts_suspend(struct platform_device *pdev, pm_message_t state) -{ - return 0; -} - -static int tsc2102_ts_resume(struct platform_device *pdev) -{ - return 0; -} -#else -#define tsc2102_ts_suspend NULL -#define tsc2102_ts_resume NULL -#endif - -static struct platform_driver tsc2102_ts_driver = { - .probe = tsc2102_ts_probe, - .remove = tsc2102_ts_remove, - .suspend = tsc2102_ts_suspend, - .resume = tsc2102_ts_resume, - .driver = { - .name = "tsc2102-ts", - .owner = THIS_MODULE, - }, -}; - -static int __init tsc2102_ts_init(void) -{ - int ret; - - ret = platform_driver_register(&tsc2102_ts_driver); - if (ret) - return -ENODEV; - - return 0; -} - -static void __exit tsc2102_ts_exit(void) -{ - platform_driver_unregister(&tsc2102_ts_driver); -} - -module_init(tsc2102_ts_init); -module_exit(tsc2102_ts_exit); - -MODULE_AUTHOR("Andrzej Zaborowski"); -MODULE_DESCRIPTION("Touchscreen input driver for TI TSC2102."); -MODULE_LICENSE("GPL"); -- 2.41.1