* [PATCHv5] input: ROHM BU21013 touch panel controller support
@ 2010-10-01 10:59 Naveen Kumar G
2010-10-01 11:19 ` Datta, Shubhrajyoti
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Naveen Kumar G @ 2010-10-01 10:59 UTC (permalink / raw)
To: Dmitry Torokhov
Cc: STEricsson_nomadik_linux, linux-input, tsoni, rydberg,
Naveen Kumar Gaddipati
From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
Added the ROHM BU21013 capacitive touch panel controller
driver support with i2c interface.
Acked-by: Linus Walleij <linus.walleij@stericsson.com>
Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
---
Changes in v5:
-Update according to Henrik comments on v4
drivers/input/touchscreen/Kconfig | 12 +
drivers/input/touchscreen/Makefile | 1 +
drivers/input/touchscreen/bu21013_ts.c | 628 ++++++++++++++++++++++++++++++++
include/linux/input/bu21013.h | 44 +++
4 files changed, 685 insertions(+), 0 deletions(-)
create mode 100755 drivers/input/touchscreen/bu21013_ts.c
create mode 100644 include/linux/input/bu21013.h
diff --git a/drivers/input/touchscreen/Kconfig b/drivers/input/touchscreen/Kconfig
index 0069d97..2380533 100644
--- a/drivers/input/touchscreen/Kconfig
+++ b/drivers/input/touchscreen/Kconfig
@@ -98,6 +98,18 @@ config TOUCHSCREEN_BITSY
To compile this driver as a module, choose M here: the
module will be called h3600_ts_input.
+config TOUCHSCREEN_BU21013
+ tristate "BU21013 based touch panel controllers"
+ depends on I2C
+ help
+ Say Y here if you have a bu21013 touchscreen connected to
+ your system.
+
+ If unsure, say N.
+
+ To compile this driver as a module, choose M here: the
+ module will be called bu21013_ts.
+
config TOUCHSCREEN_CY8CTMG110
tristate "cy8ctmg110 touchscreen"
depends on I2C
diff --git a/drivers/input/touchscreen/Makefile b/drivers/input/touchscreen/Makefile
index 28217e1..a0a2021 100644
--- a/drivers/input/touchscreen/Makefile
+++ b/drivers/input/touchscreen/Makefile
@@ -14,6 +14,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI) += ad7879-spi.o
obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) += atmel_tsadcc.o
obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
+obj-$(CONFIG_TOUCHSCREEN_BU21013) += bu21013_ts.o
obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110) += cy8ctmg110_ts.o
obj-$(CONFIG_TOUCHSCREEN_DA9034) += da9034-ts.o
obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o
diff --git a/drivers/input/touchscreen/bu21013_ts.c b/drivers/input/touchscreen/bu21013_ts.c
new file mode 100755
index 0000000..1008037
--- /dev/null
+++ b/drivers/input/touchscreen/bu21013_ts.c
@@ -0,0 +1,628 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson
+ * License terms:GNU General Public License (GPL) version 2
+ */
+
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/i2c.h>
+#include <linux/workqueue.h>
+#include <linux/input.h>
+#include <linux/input/bu21013.h>
+#include <linux/slab.h>
+
+#define PEN_DOWN_INTR 0
+#define MAX_FINGERS 2
+#define RESET_DELAY 30
+#define PENUP_TIMEOUT (10)
+#define DELTA_MIN 16
+#define MASK_BITS 0x03
+#define SHIFT_8 8
+#define SHIFT_2 2
+#define LENGTH_OF_BUFFER 11
+#define I2C_RETRY_COUNT 5
+
+#define BU21013_SENSORS_BTN_0_7_REG 0x70
+#define BU21013_SENSORS_BTN_8_15_REG 0x71
+#define BU21013_SENSORS_BTN_16_23_REG 0x72
+#define BU21013_X1_POS_MSB_REG 0x73
+#define BU21013_X1_POS_LSB_REG 0x74
+#define BU21013_Y1_POS_MSB_REG 0x75
+#define BU21013_Y1_POS_LSB_REG 0x76
+#define BU21013_X2_POS_MSB_REG 0x77
+#define BU21013_X2_POS_LSB_REG 0x78
+#define BU21013_Y2_POS_MSB_REG 0x79
+#define BU21013_Y2_POS_LSB_REG 0x7A
+#define BU21013_INT_CLR_REG 0xE8
+#define BU21013_INT_MODE_REG 0xE9
+#define BU21013_GAIN_REG 0xEA
+#define BU21013_OFFSET_MODE_REG 0xEB
+#define BU21013_XY_EDGE_REG 0xEC
+#define BU21013_RESET_REG 0xED
+#define BU21013_CALIB_REG 0xEE
+#define BU21013_DONE_REG 0xEF
+#define BU21013_SENSOR_0_7_REG 0xF0
+#define BU21013_SENSOR_8_15_REG 0xF1
+#define BU21013_SENSOR_16_23_REG 0xF2
+#define BU21013_POS_MODE1_REG 0xF3
+#define BU21013_POS_MODE2_REG 0xF4
+#define BU21013_CLK_MODE_REG 0xF5
+#define BU21013_IDLE_REG 0xFA
+#define BU21013_FILTER_REG 0xFB
+#define BU21013_TH_ON_REG 0xFC
+#define BU21013_TH_OFF_REG 0xFD
+
+
+#define BU21013_RESET_ENABLE 0x01
+
+#define BU21013_SENSORS_EN_0_7 0x3F
+#define BU21013_SENSORS_EN_8_15 0xFC
+#define BU21013_SENSORS_EN_16_23 0x1F
+
+#define BU21013_POS_MODE1_0 0x02
+#define BU21013_POS_MODE1_1 0x04
+#define BU21013_POS_MODE1_2 0x08
+
+#define BU21013_POS_MODE2_ZERO 0x01
+#define BU21013_POS_MODE2_AVG1 0x02
+#define BU21013_POS_MODE2_AVG2 0x04
+#define BU21013_POS_MODE2_EN_XY 0x08
+#define BU21013_POS_MODE2_EN_RAW 0x10
+#define BU21013_POS_MODE2_MULTI 0x80
+
+#define BU21013_CLK_MODE_DIV 0x01
+#define BU21013_CLK_MODE_EXT 0x02
+#define BU21013_CLK_MODE_CALIB 0x80
+
+#define BU21013_IDLET_0 0x01
+#define BU21013_IDLET_1 0x02
+#define BU21013_IDLET_2 0x04
+#define BU21013_IDLET_3 0x08
+#define BU21013_IDLE_INTERMIT_EN 0x10
+
+#define BU21013_DELTA_0_6 0x7F
+#define BU21013_FILTER_EN 0x80
+
+#define BU21013_INT_MODE_LEVEL 0x00
+#define BU21013_INT_MODE_EDGE 0x01
+
+#define BU21013_GAIN_0 0x01
+#define BU21013_GAIN_1 0x02
+#define BU21013_GAIN_2 0x04
+
+#define BU21013_OFFSET_MODE_DEFAULT 0x00
+#define BU21013_OFFSET_MODE_MOVE 0x01
+#define BU21013_OFFSET_MODE_DISABLE 0x02
+
+#define BU21013_TH_ON_0 0x01
+#define BU21013_TH_ON_1 0x02
+#define BU21013_TH_ON_2 0x04
+#define BU21013_TH_ON_3 0x08
+#define BU21013_TH_ON_4 0x10
+#define BU21013_TH_ON_5 0x20
+#define BU21013_TH_ON_6 0x40
+#define BU21013_TH_ON_7 0x80
+#define BU21013_TH_ON_MAX 0xFF
+
+#define BU21013_TH_OFF_0 0x01
+#define BU21013_TH_OFF_1 0x02
+#define BU21013_TH_OFF_2 0x04
+#define BU21013_TH_OFF_3 0x08
+#define BU21013_TH_OFF_4 0x10
+#define BU21013_TH_OFF_5 0x20
+#define BU21013_TH_OFF_6 0x40
+#define BU21013_TH_OFF_7 0x80
+#define BU21013_TH_OFF_MAX 0xFF
+
+#define BU21013_X_EDGE_0 0x01
+#define BU21013_X_EDGE_1 0x02
+#define BU21013_X_EDGE_2 0x04
+#define BU21013_X_EDGE_3 0x08
+#define BU21013_Y_EDGE_0 0x10
+#define BU21013_Y_EDGE_1 0x20
+#define BU21013_Y_EDGE_2 0x40
+#define BU21013_Y_EDGE_3 0x80
+
+#define BU21013_DONE 0x01
+#define BU21013_NUMBER_OF_X_SENSORS (6)
+#define BU21013_NUMBER_OF_Y_SENSORS (11)
+
+#define DRIVER_TP "bu21013_tp"
+
+/**
+ * struct bu21013_ts_data - touch panel data structure
+ * @client: pointer to the i2c client
+ * @wait: variable to wait_queue_head_t structure
+ * @touch_stopped: touch stop flag
+ * @chip: pointer to the touch panel controller
+ * @in_dev: pointer to the input device structure
+ * @intr_pin: interrupt pin value
+ *
+ * Touch panel device data structure
+ */
+struct bu21013_ts_data {
+ struct i2c_client *client;
+ wait_queue_head_t wait;
+ bool touch_stopped;
+ const struct bu21013_platform_device *chip;
+ struct input_dev *in_dev;
+ unsigned int intr_pin;
+};
+
+/**
+ * bu21013_read_block_data(): read the touch co-ordinates
+ * @data: bu21013_ts_data structure pointer
+ * @buf: byte pointer
+ *
+ * Read the touch co-ordinates using i2c read block into buffer
+ * and returns integer.
+ */
+static int bu21013_read_block_data(struct bu21013_ts_data *data, u8 *buf)
+{
+ int ret, i;
+
+ for (i = 0; i < I2C_RETRY_COUNT; i++) {
+ ret = i2c_smbus_read_i2c_block_data
+ (data->client, BU21013_SENSORS_BTN_0_7_REG,
+ LENGTH_OF_BUFFER, buf);
+ if (ret == LENGTH_OF_BUFFER)
+ return 0;
+ }
+ return -EINVAL;
+}
+
+/**
+ * bu21013_do_touch_report(): Get the touch co-ordinates
+ * @data: bu21013_ts_data structure pointer
+ *
+ * Get the touch co-ordinates from touch sensor registers and writes
+ * into device structure and returns integer.
+ */
+static int bu21013_do_touch_report(struct bu21013_ts_data *data)
+{
+ u8 buf[LENGTH_OF_BUFFER];
+ unsigned int pos_x[2], pos_y[2];
+ bool has_x_sensors, has_y_sensors;
+ int finger_down_count = 0;
+ int i;
+
+ if (data == NULL)
+ return -EINVAL;
+
+ if (bu21013_read_block_data(data, buf) < 0)
+ return -EINVAL;
+
+ has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
+ has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
+ ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >> SHIFT_2);
+ if (!has_x_sensors || !has_y_sensors)
+ return 0;
+
+ for (i = 0; i < MAX_FINGERS; i++) {
+ const u8 *p = &buf[4 * i + 3];
+ unsigned int x = p[0] << SHIFT_2 | (p[1] & MASK_BITS);
+ unsigned int y = p[2] << SHIFT_2 | (p[3] & MASK_BITS);
+ if (x == 0 || y == 0)
+ continue;
+ pos_x[finger_down_count] = x;
+ pos_y[finger_down_count] = y;
+ finger_down_count++;
+ }
+
+ if (finger_down_count == 2 &&
+ (abs(pos_x[0] - pos_x[1]) < DELTA_MIN ||
+ abs(pos_y[0] - pos_y[1]) < DELTA_MIN))
+ return 0;
+
+ if (finger_down_count <= 0) {
+ input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR, 0);
+ input_mt_sync(data->in_dev);
+ } else {
+ for (i = 0; i < finger_down_count; i++) {
+ if (data->chip->x_flip)
+ pos_x[i] = data->chip->touch_x_max - pos_x[i];
+ if (data->chip->y_flip)
+ pos_y[i] = data->chip->touch_y_max - pos_y[i];
+ input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR,
+ max(pos_x[i], pos_y[i]));
+ input_report_abs(data->in_dev, ABS_MT_POSITION_X,
+ pos_x[i]);
+ input_report_abs(data->in_dev, ABS_MT_POSITION_Y,
+ pos_y[i]);
+ input_mt_sync(data->in_dev);
+ }
+ }
+ input_sync(data->in_dev);
+
+ return 0;
+}
+/**
+ * bu21013_gpio_irq() - gpio thread function for touch interrupt
+ * @irq: irq value
+ * @device_data: void pointer
+ *
+ * This gpio thread function for touch interrupt
+ * and returns irqreturn_t.
+ */
+static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
+{
+ struct bu21013_ts_data *data = device_data;
+ struct i2c_client *i2c = data->client;
+ int retval;
+
+ do {
+ retval = bu21013_do_touch_report(data);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "bu21013_do_touch_report failed\n");
+ return IRQ_NONE;
+ }
+
+ data->intr_pin = data->chip->irq_read_val();
+ if (data->intr_pin == PEN_DOWN_INTR)
+ wait_event_timeout(data->wait, data->touch_stopped,
+ msecs_to_jiffies(2));
+ } while (!data->intr_pin && !data->touch_stopped);
+ return IRQ_HANDLED;
+}
+
+/**
+ * bu21013_init_chip() - power on sequence for the bu21013 controller
+ * @data: device structure pointer
+ *
+ * This function is used to power on
+ * the bu21013 controller and returns integer.
+ */
+static int bu21013_init_chip(struct bu21013_ts_data *data)
+{
+ int retval;
+ struct i2c_client *i2c = data->client;
+
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_RESET_REG,
+ BU21013_RESET_ENABLE);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_RESET reg write failed\n");
+ return retval;
+ }
+ msleep(RESET_DELAY);
+
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_0_7_REG,
+ BU21013_SENSORS_EN_0_7);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_SENSOR_0_7 reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_8_15_REG,
+ BU21013_SENSORS_EN_8_15);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_SENSOR_8_15 reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_16_23_REG,
+ BU21013_SENSORS_EN_16_23);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_SENSOR_16_23 reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE1_REG,
+ (BU21013_POS_MODE1_0 | BU21013_POS_MODE1_1));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_POS_MODE1 reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE2_REG,
+ (BU21013_POS_MODE2_ZERO | BU21013_POS_MODE2_AVG1 |
+ BU21013_POS_MODE2_AVG2 | BU21013_POS_MODE2_EN_RAW |
+ BU21013_POS_MODE2_MULTI));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_POS_MODE2 reg write failed\n");
+ return retval;
+ }
+ if (data->chip->ext_clk)
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
+ (BU21013_CLK_MODE_EXT | BU21013_CLK_MODE_CALIB));
+ else
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
+ (BU21013_CLK_MODE_DIV | BU21013_CLK_MODE_CALIB));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_CLK_MODE reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_IDLE_REG,
+ (BU21013_IDLET_0 | BU21013_IDLE_INTERMIT_EN));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_IDLE reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_INT_MODE_REG,
+ BU21013_INT_MODE_LEVEL);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_INT_MODE reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_FILTER_REG,
+ (BU21013_DELTA_0_6 |
+ BU21013_FILTER_EN));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_FILTER reg write failed\n");
+ return retval;
+ }
+
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_ON_REG,
+ BU21013_TH_ON_5);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_TH_ON reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_OFF_REG,
+ BU21013_TH_OFF_4 || BU21013_TH_OFF_3);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_TH_OFF reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_GAIN_REG,
+ (BU21013_GAIN_0 | BU21013_GAIN_1));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_GAIN reg write failed\n");
+ return retval;
+ }
+
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_OFFSET_MODE_REG,
+ BU21013_OFFSET_MODE_DEFAULT);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_OFFSET_MODE reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_XY_EDGE_REG,
+ (BU21013_X_EDGE_0 | BU21013_X_EDGE_2 |
+ BU21013_Y_EDGE_1 | BU21013_Y_EDGE_3));
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_XY_EDGE reg write failed\n");
+ return retval;
+ }
+ retval = i2c_smbus_write_byte_data(i2c, BU21013_DONE_REG,
+ BU21013_DONE);
+ if (retval < 0) {
+ dev_err(&i2c->dev, "BU21013_REG_DONE reg write failed\n");
+ return retval;
+ }
+
+ return retval;
+}
+
+/**
+ * bu21013_probe() - initialzes the i2c-client touchscreen driver
+ * @client: i2c client structure pointer
+ * @id: i2c device id pointer
+ *
+ * This function used to initializes the i2c-client touchscreen
+ * driver and returns integer.
+ */
+static int __devinit bu21013_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ int retval;
+ struct bu21013_ts_data *bu21013_data;
+ struct input_dev *in_dev;
+ const struct bu21013_platform_device *pdata =
+ client->dev.platform_data;
+
+ if (!i2c_check_functionality(client->adapter,
+ I2C_FUNC_SMBUS_BYTE_DATA)) {
+ dev_err(&client->dev, "i2c smbus byte data not supported\n");
+ return -EIO;
+ }
+
+ if (!pdata) {
+ dev_err(&client->dev, "platform data not defined\n");
+ retval = -EINVAL;
+ return retval;
+ }
+
+ bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL);
+ if (!bu21013_data) {
+ dev_err(&client->dev, "device memory alloc failed\n");
+ retval = -ENOMEM;
+ return retval;
+ }
+ /* allocate input device */
+ in_dev = input_allocate_device();
+ if (!in_dev) {
+ dev_err(&client->dev, "input device memory alloc failed\n");
+ retval = -ENOMEM;
+ goto err_alloc;
+ }
+ bu21013_data->in_dev = in_dev;
+ bu21013_data->chip = pdata;
+ bu21013_data->client = client;
+
+ /* configure the gpio pins */
+ if (pdata->cs_en) {
+ retval = pdata->cs_en(pdata->cs_pin);
+ if (retval < 0) {
+ dev_err(&client->dev, "chip init failed\n");
+ goto err_init_cs;
+ }
+ }
+
+ /* configure the touch panel controller */
+ retval = bu21013_init_chip(bu21013_data);
+ if (retval < 0) {
+ dev_err(&client->dev, "error in bu21013 config\n");
+ goto err_init_config;
+ }
+
+ init_waitqueue_head(&bu21013_data->wait);
+ bu21013_data->touch_stopped = false;
+
+ /* register the device to input subsystem */
+ in_dev->name = DRIVER_TP;
+ in_dev->id.bustype = BUS_I2C;
+ in_dev->dev.parent = &client->dev;
+
+ __set_bit(EV_SYN, in_dev->evbit);
+ __set_bit(EV_KEY, in_dev->evbit);
+ __set_bit(EV_ABS, in_dev->evbit);
+
+ input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
+ pdata->x_max_res, 0, 0);
+ input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
+ pdata->y_max_res, 0, 0);
+ input_set_abs_params(in_dev, ABS_MT_TOUCH_MAJOR, 0,
+ max(pdata->x_max_res , pdata->y_max_res), 0, 0);
+ input_set_drvdata(in_dev, bu21013_data);
+ retval = input_register_device(in_dev);
+ if (retval)
+ goto err_input_register;
+
+ retval = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
+ (IRQF_TRIGGER_FALLING | IRQF_SHARED),
+ DRIVER_TP, bu21013_data);
+ if (retval) {
+ dev_err(&client->dev, "request irq %d failed\n", pdata->irq);
+ goto err_init_irq;
+ }
+
+ device_init_wakeup(&client->dev, pdata->wakeup);
+ i2c_set_clientdata(client, bu21013_data);
+
+ return retval;
+
+err_init_irq:
+ input_unregister_device(bu21013_data->in_dev);
+ bu21013_data->in_dev = NULL;
+err_input_register:
+err_init_config:
+ pdata->cs_dis(pdata->cs_pin);
+err_init_cs:
+ input_free_device(bu21013_data->in_dev);
+err_alloc:
+ kfree(bu21013_data);
+
+ return retval;
+}
+/**
+ * bu21013_remove() - removes the i2c-client touchscreen driver
+ * @client: i2c client structure pointer
+ *
+ * This function uses to remove the i2c-client
+ * touchscreen driver and returns integer.
+ */
+static int __devexit bu21013_remove(struct i2c_client *client)
+{
+ struct bu21013_ts_data *bu21013_data = i2c_get_clientdata(client);
+
+ bu21013_data->touch_stopped = true;
+ wake_up(&bu21013_data->wait);
+ device_init_wakeup(&client->dev, false);
+ free_irq(bu21013_data->chip->irq, bu21013_data);
+ bu21013_data->chip->cs_dis(bu21013_data->chip->cs_pin);
+ input_unregister_device(bu21013_data->in_dev);
+ kfree(bu21013_data);
+
+ return 0;
+}
+
+#ifdef CONFIG_PM
+/**
+ * bu21013_suspend() - suspend the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This function is used to suspend the
+ * touch panel controller and returns integer
+ */
+static int bu21013_suspend(struct device *dev)
+{
+ struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
+ struct i2c_client *client = bu21013_data->client;
+
+ bu21013_data->touch_stopped = true;
+ if (device_may_wakeup(&client->dev))
+ enable_irq_wake(bu21013_data->chip->irq);
+ else
+ disable_irq(bu21013_data->chip->irq);
+
+ return 0;
+}
+
+/**
+ * bu21013_resume() - resume the touch screen controller
+ * @dev: pointer to device structure
+ *
+ * This function is used to resume the touch panel
+ * controller and returns integer.
+ */
+static int bu21013_resume(struct device *dev)
+{
+ struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
+ struct i2c_client *client = bu21013_data->client;
+ int retval;
+
+ retval = bu21013_init_chip(bu21013_data);
+ if (retval < 0) {
+ dev_err(&client->dev, "bu21013 controller config failed\n");
+ return retval;
+ }
+ bu21013_data->touch_stopped = false;
+ if (device_may_wakeup(&client->dev))
+ disable_irq_wake(bu21013_data->chip->irq);
+ else
+ enable_irq(bu21013_data->chip->irq);
+
+ return 0;
+}
+
+static const struct dev_pm_ops bu21013_dev_pm_ops = {
+ .suspend = bu21013_suspend,
+ .resume = bu21013_resume,
+};
+#endif
+
+static const struct i2c_device_id bu21013_id[] = {
+ { DRIVER_TP, 0 },
+ { }
+};
+MODULE_DEVICE_TABLE(i2c, bu21013_id);
+
+static struct i2c_driver bu21013_driver = {
+ .driver = {
+ .name = DRIVER_TP,
+ .owner = THIS_MODULE,
+#ifdef CONFIG_PM
+ .pm = &bu21013_dev_pm_ops,
+#endif
+ },
+ .probe = bu21013_probe,
+ .remove = __devexit_p(bu21013_remove),
+ .id_table = bu21013_id,
+};
+
+/**
+ * bu21013_init() - initializes the bu21013 touchscreen driver
+ *
+ * This function used to initializes the bu21013
+ * touchscreen driver and returns integer.
+ */
+static int __init bu21013_init(void)
+{
+ return i2c_add_driver(&bu21013_driver);
+}
+
+/**
+ * bu21013_exit() - de-initializes the bu21013 touchscreen driver
+ *
+ * This function uses to de-initializes the bu21013
+ * touchscreen driver and returns none.
+ */
+static void __exit bu21013_exit(void)
+{
+ i2c_del_driver(&bu21013_driver);
+}
+
+module_init(bu21013_init);
+module_exit(bu21013_exit);
+
+MODULE_LICENSE("GPL v2");
+MODULE_AUTHOR("Naveen Kumar G <naveen.gaddipati@stericsson.com>");
+MODULE_DESCRIPTION("bu21013 touch screen controller driver");
diff --git a/include/linux/input/bu21013.h b/include/linux/input/bu21013.h
new file mode 100644
index 0000000..e470d38
--- /dev/null
+++ b/include/linux/input/bu21013.h
@@ -0,0 +1,44 @@
+/*
+ * Copyright (C) ST-Ericsson SA 2010
+ * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-Ericsson
+ * License terms:GNU General Public License (GPL) version 2
+ */
+
+#ifndef _BU21013_H
+#define _BU21013_H
+
+/**
+ * struct bu21013_platform_device - Handle the platform data
+ * @cs_en: pointer to the cs enable function
+ * @cs_dis: pointer to the cs disable function
+ * @irq_read_val: pointer to read the pen irq value function
+ * @x_max_res: xmax resolution
+ * @y_max_res: ymax resolution
+ * @touch_x_max: touch x max
+ * @touch_y_max: touch y max
+ * @cs_pin: chip select pin
+ * @irq: irq pin
+ * @ext_clk: external clock flag
+ * @x_flip: x flip flag
+ * @y_flip: y flip flag
+ * @wakeup: wakeup flag
+ *
+ * This is used to handle the platform data
+ */
+struct bu21013_platform_device {
+ int (*cs_en)(int reset_pin);
+ int (*cs_dis)(int reset_pin);
+ int (*irq_read_val)(void);
+ int x_max_res;
+ int y_max_res;
+ int touch_x_max;
+ int touch_y_max;
+ unsigned int cs_pin;
+ unsigned int irq;
+ bool ext_clk;
+ bool x_flip;
+ bool y_flip;
+ bool wakeup;
+};
+
+#endif
--
1.7.2.dirty
^ permalink raw reply related [flat|nested] 7+ messages in thread
* RE: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-01 10:59 [PATCHv5] input: ROHM BU21013 touch panel controller support Naveen Kumar G
@ 2010-10-01 11:19 ` Datta, Shubhrajyoti
2010-10-02 6:24 ` Henrik Rydberg
2010-10-02 7:25 ` Henrik Rydberg
2 siblings, 0 replies; 7+ messages in thread
From: Datta, Shubhrajyoti @ 2010-10-01 11:19 UTC (permalink / raw)
To: Naveen Kumar G, Dmitry Torokhov
Cc: STEricsson_nomadik_linux@list.st.com, linux-input@vger.kernel.org,
tsoni@codeaurora.org, rydberg@euromail.se
> -----Original Message-----
> From: linux-input-owner@vger.kernel.org [mailto:linux-input-
> owner@vger.kernel.org] On Behalf Of Naveen Kumar G
> Sent: Friday, October 01, 2010 4:30 PM
> To: Dmitry Torokhov
> Cc: STEricsson_nomadik_linux@list.st.com; linux-input@vger.kernel.org;
> tsoni@codeaurora.org; rydberg@euromail.se; Naveen Kumar Gaddipati
> Subject: [PATCHv5] input: ROHM BU21013 touch panel controller support
>
> From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
>
> Added the ROHM BU21013 capacitive touch panel controller
> driver support with i2c interface.
>
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
> ---
> Changes in v5:
> -Update according to Henrik comments on v4
>
> drivers/input/touchscreen/Kconfig | 12 +
> drivers/input/touchscreen/Makefile | 1 +
> drivers/input/touchscreen/bu21013_ts.c | 628
> ++++++++++++++++++++++++++++++++
> include/linux/input/bu21013.h | 44 +++
> 4 files changed, 685 insertions(+), 0 deletions(-)
> create mode 100755 drivers/input/touchscreen/bu21013_ts.c
Think this is not needed
> create mode 100644 include/linux/input/bu21013.h
>
> diff --git a/drivers/input/touchscreen/Kconfig
> b/drivers/input/touchscreen/Kconfig
> index 0069d97..2380533 100644
> --- a/drivers/input/touchscreen/Kconfig
> +++ b/drivers/input/touchscreen/Kconfig
> @@ -98,6 +98,18 @@ config TOUCHSCREEN_BITSY
> To compile this driver as a module, choose M here: the
> module will be called h3600_ts_input.
>
> +config TOUCHSCREEN_BU21013
> + tristate "BU21013 based touch panel controllers"
> + depends on I2C
> + help
> + Say Y here if you have a bu21013 touchscreen connected to
> + your system.
> +
> + If unsure, say N.
> +
> + To compile this driver as a module, choose M here: the
> + module will be called bu21013_ts.
> +
> config TOUCHSCREEN_CY8CTMG110
> tristate "cy8ctmg110 touchscreen"
> depends on I2C
> diff --git a/drivers/input/touchscreen/Makefile
> b/drivers/input/touchscreen/Makefile
> index 28217e1..a0a2021 100644
> --- a/drivers/input/touchscreen/Makefile
> +++ b/drivers/input/touchscreen/Makefile
> @@ -14,6 +14,7 @@ obj-$(CONFIG_TOUCHSCREEN_AD7879_SPI) += ad7879-
> spi.o
> obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o
> obj-$(CONFIG_TOUCHSCREEN_ATMEL_TSADCC) += atmel_tsadcc.o
> obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o
> +obj-$(CONFIG_TOUCHSCREEN_BU21013) += bu21013_ts.o
> obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110) += cy8ctmg110_ts.o
> obj-$(CONFIG_TOUCHSCREEN_DA9034) += da9034-ts.o
> obj-$(CONFIG_TOUCHSCREEN_DYNAPRO) += dynapro.o
> diff --git a/drivers/input/touchscreen/bu21013_ts.c
> b/drivers/input/touchscreen/bu21013_ts.c
> new file mode 100755
> index 0000000..1008037
> --- /dev/null
> +++ b/drivers/input/touchscreen/bu21013_ts.c
> @@ -0,0 +1,628 @@
> +/*
> + * Copyright (C) ST-Ericsson SA 2010
> + * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-
> Ericsson
> + * License terms:GNU General Public License (GPL) version 2
> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/delay.h>
> +#include <linux/interrupt.h>
> +#include <linux/i2c.h>
> +#include <linux/workqueue.h>
> +#include <linux/input.h>
> +#include <linux/input/bu21013.h>
> +#include <linux/slab.h>
> +
> +#define PEN_DOWN_INTR 0
> +#define MAX_FINGERS 2
> +#define RESET_DELAY 30
> +#define PENUP_TIMEOUT (10)
> +#define DELTA_MIN 16
> +#define MASK_BITS 0x03
> +#define SHIFT_8 8
> +#define SHIFT_2 2
> +#define LENGTH_OF_BUFFER 11
> +#define I2C_RETRY_COUNT 5
> +
> +#define BU21013_SENSORS_BTN_0_7_REG 0x70
> +#define BU21013_SENSORS_BTN_8_15_REG 0x71
> +#define BU21013_SENSORS_BTN_16_23_REG 0x72
> +#define BU21013_X1_POS_MSB_REG 0x73
> +#define BU21013_X1_POS_LSB_REG 0x74
> +#define BU21013_Y1_POS_MSB_REG 0x75
> +#define BU21013_Y1_POS_LSB_REG 0x76
> +#define BU21013_X2_POS_MSB_REG 0x77
> +#define BU21013_X2_POS_LSB_REG 0x78
> +#define BU21013_Y2_POS_MSB_REG 0x79
> +#define BU21013_Y2_POS_LSB_REG 0x7A
> +#define BU21013_INT_CLR_REG 0xE8
> +#define BU21013_INT_MODE_REG 0xE9
> +#define BU21013_GAIN_REG 0xEA
> +#define BU21013_OFFSET_MODE_REG 0xEB
> +#define BU21013_XY_EDGE_REG 0xEC
> +#define BU21013_RESET_REG 0xED
> +#define BU21013_CALIB_REG 0xEE
> +#define BU21013_DONE_REG 0xEF
> +#define BU21013_SENSOR_0_7_REG 0xF0
> +#define BU21013_SENSOR_8_15_REG 0xF1
> +#define BU21013_SENSOR_16_23_REG 0xF2
> +#define BU21013_POS_MODE1_REG 0xF3
> +#define BU21013_POS_MODE2_REG 0xF4
> +#define BU21013_CLK_MODE_REG 0xF5
> +#define BU21013_IDLE_REG 0xFA
> +#define BU21013_FILTER_REG 0xFB
> +#define BU21013_TH_ON_REG 0xFC
> +#define BU21013_TH_OFF_REG 0xFD
> +
> +
> +#define BU21013_RESET_ENABLE 0x01
> +
> +#define BU21013_SENSORS_EN_0_7 0x3F
> +#define BU21013_SENSORS_EN_8_15 0xFC
> +#define BU21013_SENSORS_EN_16_23 0x1F
> +
> +#define BU21013_POS_MODE1_0 0x02
> +#define BU21013_POS_MODE1_1 0x04
> +#define BU21013_POS_MODE1_2 0x08
> +
> +#define BU21013_POS_MODE2_ZERO 0x01
> +#define BU21013_POS_MODE2_AVG1 0x02
> +#define BU21013_POS_MODE2_AVG2 0x04
> +#define BU21013_POS_MODE2_EN_XY 0x08
> +#define BU21013_POS_MODE2_EN_RAW 0x10
> +#define BU21013_POS_MODE2_MULTI 0x80
> +
> +#define BU21013_CLK_MODE_DIV 0x01
> +#define BU21013_CLK_MODE_EXT 0x02
> +#define BU21013_CLK_MODE_CALIB 0x80
> +
> +#define BU21013_IDLET_0 0x01
> +#define BU21013_IDLET_1 0x02
> +#define BU21013_IDLET_2 0x04
> +#define BU21013_IDLET_3 0x08
> +#define BU21013_IDLE_INTERMIT_EN 0x10
> +
> +#define BU21013_DELTA_0_6 0x7F
> +#define BU21013_FILTER_EN 0x80
> +
> +#define BU21013_INT_MODE_LEVEL 0x00
> +#define BU21013_INT_MODE_EDGE 0x01
> +
> +#define BU21013_GAIN_0 0x01
> +#define BU21013_GAIN_1 0x02
> +#define BU21013_GAIN_2 0x04
> +
> +#define BU21013_OFFSET_MODE_DEFAULT 0x00
> +#define BU21013_OFFSET_MODE_MOVE 0x01
> +#define BU21013_OFFSET_MODE_DISABLE 0x02
> +
> +#define BU21013_TH_ON_0 0x01
> +#define BU21013_TH_ON_1 0x02
> +#define BU21013_TH_ON_2 0x04
> +#define BU21013_TH_ON_3 0x08
> +#define BU21013_TH_ON_4 0x10
> +#define BU21013_TH_ON_5 0x20
> +#define BU21013_TH_ON_6 0x40
> +#define BU21013_TH_ON_7 0x80
> +#define BU21013_TH_ON_MAX 0xFF
> +
> +#define BU21013_TH_OFF_0 0x01
> +#define BU21013_TH_OFF_1 0x02
> +#define BU21013_TH_OFF_2 0x04
> +#define BU21013_TH_OFF_3 0x08
> +#define BU21013_TH_OFF_4 0x10
> +#define BU21013_TH_OFF_5 0x20
> +#define BU21013_TH_OFF_6 0x40
> +#define BU21013_TH_OFF_7 0x80
> +#define BU21013_TH_OFF_MAX 0xFF
> +
> +#define BU21013_X_EDGE_0 0x01
> +#define BU21013_X_EDGE_1 0x02
> +#define BU21013_X_EDGE_2 0x04
> +#define BU21013_X_EDGE_3 0x08
> +#define BU21013_Y_EDGE_0 0x10
> +#define BU21013_Y_EDGE_1 0x20
> +#define BU21013_Y_EDGE_2 0x40
> +#define BU21013_Y_EDGE_3 0x80
> +
> +#define BU21013_DONE 0x01
> +#define BU21013_NUMBER_OF_X_SENSORS (6)
> +#define BU21013_NUMBER_OF_Y_SENSORS (11)
> +
> +#define DRIVER_TP "bu21013_tp"
> +
> +/**
> + * struct bu21013_ts_data - touch panel data structure
> + * @client: pointer to the i2c client
> + * @wait: variable to wait_queue_head_t structure
> + * @touch_stopped: touch stop flag
> + * @chip: pointer to the touch panel controller
> + * @in_dev: pointer to the input device structure
> + * @intr_pin: interrupt pin value
> + *
> + * Touch panel device data structure
> + */
> +struct bu21013_ts_data {
> + struct i2c_client *client;
> + wait_queue_head_t wait;
> + bool touch_stopped;
> + const struct bu21013_platform_device *chip;
> + struct input_dev *in_dev;
> + unsigned int intr_pin;
> +};
> +
> +/**
> + * bu21013_read_block_data(): read the touch co-ordinates
> + * @data: bu21013_ts_data structure pointer
> + * @buf: byte pointer
> + *
> + * Read the touch co-ordinates using i2c read block into buffer
> + * and returns integer.
> + */
> +static int bu21013_read_block_data(struct bu21013_ts_data *data, u8 *buf)
> +{
> + int ret, i;
> +
> + for (i = 0; i < I2C_RETRY_COUNT; i++) {
> + ret = i2c_smbus_read_i2c_block_data
> + (data->client, BU21013_SENSORS_BTN_0_7_REG,
> + LENGTH_OF_BUFFER, buf);
> + if (ret == LENGTH_OF_BUFFER)
> + return 0;
> + }
> + return -EINVAL;
> +}
> +
> +/**
> + * bu21013_do_touch_report(): Get the touch co-ordinates
> + * @data: bu21013_ts_data structure pointer
> + *
> + * Get the touch co-ordinates from touch sensor registers and writes
> + * into device structure and returns integer.
> + */
> +static int bu21013_do_touch_report(struct bu21013_ts_data *data)
> +{
> + u8 buf[LENGTH_OF_BUFFER];
> + unsigned int pos_x[2], pos_y[2];
> + bool has_x_sensors, has_y_sensors;
> + int finger_down_count = 0;
> + int i;
> +
> + if (data == NULL)
> + return -EINVAL;
> +
> + if (bu21013_read_block_data(data, buf) < 0)
> + return -EINVAL;
> +
> + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
> + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
> + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >> SHIFT_2);
> + if (!has_x_sensors || !has_y_sensors)
> + return 0;
> +
> + for (i = 0; i < MAX_FINGERS; i++) {
> + const u8 *p = &buf[4 * i + 3];
> + unsigned int x = p[0] << SHIFT_2 | (p[1] & MASK_BITS);
> + unsigned int y = p[2] << SHIFT_2 | (p[3] & MASK_BITS);
> + if (x == 0 || y == 0)
> + continue;
> + pos_x[finger_down_count] = x;
> + pos_y[finger_down_count] = y;
> + finger_down_count++;
> + }
> +
> + if (finger_down_count == 2 &&
> + (abs(pos_x[0] - pos_x[1]) < DELTA_MIN ||
> + abs(pos_y[0] - pos_y[1]) < DELTA_MIN))
> + return 0;
> +
> + if (finger_down_count <= 0) {
> + input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR, 0);
> + input_mt_sync(data->in_dev);
> + } else {
> + for (i = 0; i < finger_down_count; i++) {
> + if (data->chip->x_flip)
> + pos_x[i] = data->chip->touch_x_max - pos_x[i];
> + if (data->chip->y_flip)
> + pos_y[i] = data->chip->touch_y_max - pos_y[i];
> + input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR,
> + max(pos_x[i], pos_y[i]));
> + input_report_abs(data->in_dev, ABS_MT_POSITION_X,
> + pos_x[i]);
> + input_report_abs(data->in_dev, ABS_MT_POSITION_Y,
> + pos_y[i]);
> + input_mt_sync(data->in_dev);
> + }
> + }
> + input_sync(data->in_dev);
> +
> + return 0;
> +}
> +/**
> + * bu21013_gpio_irq() - gpio thread function for touch interrupt
> + * @irq: irq value
> + * @device_data: void pointer
> + *
> + * This gpio thread function for touch interrupt
> + * and returns irqreturn_t.
> + */
> +static irqreturn_t bu21013_gpio_irq(int irq, void *device_data)
> +{
> + struct bu21013_ts_data *data = device_data;
> + struct i2c_client *i2c = data->client;
> + int retval;
> +
> + do {
> + retval = bu21013_do_touch_report(data);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "bu21013_do_touch_report failed\n");
> + return IRQ_NONE;
> + }
> +
> + data->intr_pin = data->chip->irq_read_val();
> + if (data->intr_pin == PEN_DOWN_INTR)
> + wait_event_timeout(data->wait, data->touch_stopped,
> + msecs_to_jiffies(2));
> + } while (!data->intr_pin && !data->touch_stopped);
> + return IRQ_HANDLED;
> +}
> +
> +/**
> + * bu21013_init_chip() - power on sequence for the bu21013 controller
> + * @data: device structure pointer
> + *
> + * This function is used to power on
> + * the bu21013 controller and returns integer.
> + */
> +static int bu21013_init_chip(struct bu21013_ts_data *data)
> +{
> + int retval;
> + struct i2c_client *i2c = data->client;
> +
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_RESET_REG,
> + BU21013_RESET_ENABLE);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_RESET reg write failed\n");
> + return retval;
> + }
> + msleep(RESET_DELAY);
> +
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_0_7_REG,
> + BU21013_SENSORS_EN_0_7);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_SENSOR_0_7 reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_8_15_REG,
> + BU21013_SENSORS_EN_8_15);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_SENSOR_8_15 reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_SENSOR_16_23_REG,
> + BU21013_SENSORS_EN_16_23);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_SENSOR_16_23 reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE1_REG,
> + (BU21013_POS_MODE1_0 | BU21013_POS_MODE1_1));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_POS_MODE1 reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_POS_MODE2_REG,
> + (BU21013_POS_MODE2_ZERO | BU21013_POS_MODE2_AVG1 |
> + BU21013_POS_MODE2_AVG2 | BU21013_POS_MODE2_EN_RAW |
> + BU21013_POS_MODE2_MULTI));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_POS_MODE2 reg write failed\n");
> + return retval;
> + }
> + if (data->chip->ext_clk)
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
> + (BU21013_CLK_MODE_EXT | BU21013_CLK_MODE_CALIB));
> + else
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_CLK_MODE_REG,
> + (BU21013_CLK_MODE_DIV | BU21013_CLK_MODE_CALIB));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_CLK_MODE reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_IDLE_REG,
> + (BU21013_IDLET_0 | BU21013_IDLE_INTERMIT_EN));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_IDLE reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_INT_MODE_REG,
> + BU21013_INT_MODE_LEVEL);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_INT_MODE reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_FILTER_REG,
> + (BU21013_DELTA_0_6 |
> + BU21013_FILTER_EN));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_FILTER reg write failed\n");
> + return retval;
> + }
> +
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_ON_REG,
> + BU21013_TH_ON_5);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_TH_ON reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_TH_OFF_REG,
> + BU21013_TH_OFF_4 || BU21013_TH_OFF_3);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_TH_OFF reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_GAIN_REG,
> + (BU21013_GAIN_0 | BU21013_GAIN_1));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_GAIN reg write failed\n");
> + return retval;
> + }
> +
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_OFFSET_MODE_REG,
> + BU21013_OFFSET_MODE_DEFAULT);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_OFFSET_MODE reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_XY_EDGE_REG,
> + (BU21013_X_EDGE_0 | BU21013_X_EDGE_2 |
> + BU21013_Y_EDGE_1 | BU21013_Y_EDGE_3));
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_XY_EDGE reg write failed\n");
> + return retval;
> + }
> + retval = i2c_smbus_write_byte_data(i2c, BU21013_DONE_REG,
> + BU21013_DONE);
> + if (retval < 0) {
> + dev_err(&i2c->dev, "BU21013_REG_DONE reg write failed\n");
> + return retval;
> + }
> +
> + return retval;
> +}
> +
> +/**
> + * bu21013_probe() - initialzes the i2c-client touchscreen driver
> + * @client: i2c client structure pointer
> + * @id: i2c device id pointer
> + *
> + * This function used to initializes the i2c-client touchscreen
> + * driver and returns integer.
> + */
> +static int __devinit bu21013_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + int retval;
> + struct bu21013_ts_data *bu21013_data;
> + struct input_dev *in_dev;
> + const struct bu21013_platform_device *pdata =
> + client->dev.platform_data;
> +
> + if (!i2c_check_functionality(client->adapter,
> + I2C_FUNC_SMBUS_BYTE_DATA)) {
> + dev_err(&client->dev, "i2c smbus byte data not supported\n");
> + return -EIO;
> + }
> +
> + if (!pdata) {
> + dev_err(&client->dev, "platform data not defined\n");
> + retval = -EINVAL;
> + return retval;
> + }
> +
> + bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL);
> + if (!bu21013_data) {
> + dev_err(&client->dev, "device memory alloc failed\n");
> + retval = -ENOMEM;
> + return retval;
> + }
> + /* allocate input device */
> + in_dev = input_allocate_device();
> + if (!in_dev) {
> + dev_err(&client->dev, "input device memory alloc failed\n");
> + retval = -ENOMEM;
> + goto err_alloc;
> + }
> + bu21013_data->in_dev = in_dev;
> + bu21013_data->chip = pdata;
> + bu21013_data->client = client;
> +
> + /* configure the gpio pins */
> + if (pdata->cs_en) {
> + retval = pdata->cs_en(pdata->cs_pin);
> + if (retval < 0) {
> + dev_err(&client->dev, "chip init failed\n");
> + goto err_init_cs;
> + }
> + }
> +
> + /* configure the touch panel controller */
> + retval = bu21013_init_chip(bu21013_data);
> + if (retval < 0) {
> + dev_err(&client->dev, "error in bu21013 config\n");
> + goto err_init_config;
> + }
> +
> + init_waitqueue_head(&bu21013_data->wait);
> + bu21013_data->touch_stopped = false;
> +
> + /* register the device to input subsystem */
> + in_dev->name = DRIVER_TP;
> + in_dev->id.bustype = BUS_I2C;
> + in_dev->dev.parent = &client->dev;
> +
> + __set_bit(EV_SYN, in_dev->evbit);
> + __set_bit(EV_KEY, in_dev->evbit);
> + __set_bit(EV_ABS, in_dev->evbit);
> +
> + input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
> + pdata->x_max_res, 0, 0);
> + input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
> + pdata->y_max_res, 0, 0);
> + input_set_abs_params(in_dev, ABS_MT_TOUCH_MAJOR, 0,
> + max(pdata->x_max_res , pdata->y_max_res), 0, 0);
> + input_set_drvdata(in_dev, bu21013_data);
> + retval = input_register_device(in_dev);
> + if (retval)
> + goto err_input_register;
> +
> + retval = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
> + (IRQF_TRIGGER_FALLING | IRQF_SHARED),
> + DRIVER_TP, bu21013_data);
> + if (retval) {
> + dev_err(&client->dev, "request irq %d failed\n", pdata->irq);
> + goto err_init_irq;
> + }
> +
> + device_init_wakeup(&client->dev, pdata->wakeup);
> + i2c_set_clientdata(client, bu21013_data);
> +
> + return retval;
> +
> +err_init_irq:
> + input_unregister_device(bu21013_data->in_dev);
> + bu21013_data->in_dev = NULL;
> +err_input_register:
> +err_init_config:
> + pdata->cs_dis(pdata->cs_pin);
> +err_init_cs:
> + input_free_device(bu21013_data->in_dev);
> +err_alloc:
> + kfree(bu21013_data);
> +
> + return retval;
> +}
> +/**
> + * bu21013_remove() - removes the i2c-client touchscreen driver
> + * @client: i2c client structure pointer
> + *
> + * This function uses to remove the i2c-client
> + * touchscreen driver and returns integer.
> + */
> +static int __devexit bu21013_remove(struct i2c_client *client)
> +{
> + struct bu21013_ts_data *bu21013_data = i2c_get_clientdata(client);
> +
> + bu21013_data->touch_stopped = true;
> + wake_up(&bu21013_data->wait);
> + device_init_wakeup(&client->dev, false);
> + free_irq(bu21013_data->chip->irq, bu21013_data);
> + bu21013_data->chip->cs_dis(bu21013_data->chip->cs_pin);
> + input_unregister_device(bu21013_data->in_dev);
> + kfree(bu21013_data);
> +
> + return 0;
> +}
> +
> +#ifdef CONFIG_PM
> +/**
> + * bu21013_suspend() - suspend the touch screen controller
> + * @dev: pointer to device structure
> + *
> + * This function is used to suspend the
> + * touch panel controller and returns integer
> + */
> +static int bu21013_suspend(struct device *dev)
> +{
> + struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
> + struct i2c_client *client = bu21013_data->client;
> +
> + bu21013_data->touch_stopped = true;
> + if (device_may_wakeup(&client->dev))
> + enable_irq_wake(bu21013_data->chip->irq);
> + else
> + disable_irq(bu21013_data->chip->irq);
> +
> + return 0;
> +}
> +
> +/**
> + * bu21013_resume() - resume the touch screen controller
> + * @dev: pointer to device structure
> + *
> + * This function is used to resume the touch panel
> + * controller and returns integer.
> + */
> +static int bu21013_resume(struct device *dev)
> +{
> + struct bu21013_ts_data *bu21013_data = dev_get_drvdata(dev);
> + struct i2c_client *client = bu21013_data->client;
> + int retval;
> +
> + retval = bu21013_init_chip(bu21013_data);
> + if (retval < 0) {
> + dev_err(&client->dev, "bu21013 controller config failed\n");
> + return retval;
> + }
> + bu21013_data->touch_stopped = false;
> + if (device_may_wakeup(&client->dev))
> + disable_irq_wake(bu21013_data->chip->irq);
> + else
> + enable_irq(bu21013_data->chip->irq);
> +
> + return 0;
> +}
> +
> +static const struct dev_pm_ops bu21013_dev_pm_ops = {
> + .suspend = bu21013_suspend,
> + .resume = bu21013_resume,
> +};
> +#endif
> +
> +static const struct i2c_device_id bu21013_id[] = {
> + { DRIVER_TP, 0 },
> + { }
> +};
> +MODULE_DEVICE_TABLE(i2c, bu21013_id);
> +
> +static struct i2c_driver bu21013_driver = {
> + .driver = {
> + .name = DRIVER_TP,
> + .owner = THIS_MODULE,
> +#ifdef CONFIG_PM
> + .pm = &bu21013_dev_pm_ops,
> +#endif
> + },
> + .probe = bu21013_probe,
> + .remove = __devexit_p(bu21013_remove),
> + .id_table = bu21013_id,
> +};
> +
> +/**
> + * bu21013_init() - initializes the bu21013 touchscreen driver
> + *
> + * This function used to initializes the bu21013
> + * touchscreen driver and returns integer.
> + */
> +static int __init bu21013_init(void)
> +{
> + return i2c_add_driver(&bu21013_driver);
> +}
> +
> +/**
> + * bu21013_exit() - de-initializes the bu21013 touchscreen driver
> + *
> + * This function uses to de-initializes the bu21013
> + * touchscreen driver and returns none.
> + */
> +static void __exit bu21013_exit(void)
> +{
> + i2c_del_driver(&bu21013_driver);
> +}
> +
> +module_init(bu21013_init);
> +module_exit(bu21013_exit);
> +
> +MODULE_LICENSE("GPL v2");
> +MODULE_AUTHOR("Naveen Kumar G <naveen.gaddipati@stericsson.com>");
> +MODULE_DESCRIPTION("bu21013 touch screen controller driver");
> diff --git a/include/linux/input/bu21013.h b/include/linux/input/bu21013.h
> new file mode 100644
> index 0000000..e470d38
> --- /dev/null
> +++ b/include/linux/input/bu21013.h
> @@ -0,0 +1,44 @@
> +/*
> + * Copyright (C) ST-Ericsson SA 2010
> + * Author: Naveen Kumar G <naveen.gaddipati@stericsson.com> for ST-
> Ericsson
> + * License terms:GNU General Public License (GPL) version 2
> + */
> +
> +#ifndef _BU21013_H
> +#define _BU21013_H
> +
> +/**
> + * struct bu21013_platform_device - Handle the platform data
> + * @cs_en: pointer to the cs enable function
> + * @cs_dis: pointer to the cs disable function
> + * @irq_read_val: pointer to read the pen irq value function
> + * @x_max_res: xmax resolution
> + * @y_max_res: ymax resolution
> + * @touch_x_max: touch x max
> + * @touch_y_max: touch y max
> + * @cs_pin: chip select pin
> + * @irq: irq pin
> + * @ext_clk: external clock flag
> + * @x_flip: x flip flag
> + * @y_flip: y flip flag
> + * @wakeup: wakeup flag
> + *
> + * This is used to handle the platform data
> + */
> +struct bu21013_platform_device {
> + int (*cs_en)(int reset_pin);
> + int (*cs_dis)(int reset_pin);
> + int (*irq_read_val)(void);
> + int x_max_res;
> + int y_max_res;
> + int touch_x_max;
> + int touch_y_max;
> + unsigned int cs_pin;
> + unsigned int irq;
> + bool ext_clk;
> + bool x_flip;
> + bool y_flip;
> + bool wakeup;
> +};
> +
> +#endif
> --
> 1.7.2.dirty
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-input" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-01 10:59 [PATCHv5] input: ROHM BU21013 touch panel controller support Naveen Kumar G
2010-10-01 11:19 ` Datta, Shubhrajyoti
@ 2010-10-02 6:24 ` Henrik Rydberg
2010-10-04 5:15 ` Naveen Kumar GADDIPATI
2010-10-02 7:25 ` Henrik Rydberg
2 siblings, 1 reply; 7+ messages in thread
From: Henrik Rydberg @ 2010-10-02 6:24 UTC (permalink / raw)
To: Naveen Kumar G
Cc: Dmitry Torokhov, STEricsson_nomadik_linux, linux-input, tsoni
On 10/01/2010 12:59 PM, Naveen Kumar G wrote:
> From: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
>
> Added the ROHM BU21013 capacitive touch panel controller
> driver support with i2c interface.
>
> Acked-by: Linus Walleij <linus.walleij@stericsson.com>
> Signed-off-by: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
> ---
Thank you very much for the changes. Please find a couple of comments inline.
Dmitry, with the comments addressed, feel free to add
Acked-by: Henrik Rydberg <rydberg@euromail.se>
> +static int bu21013_do_touch_report(struct bu21013_ts_data *data)
> +{
> + u8 buf[LENGTH_OF_BUFFER];
> + unsigned int pos_x[2], pos_y[2];
> + bool has_x_sensors, has_y_sensors;
> + int finger_down_count = 0;
> + int i;
> +
> + if (data == NULL)
> + return -EINVAL;
> +
> + if (bu21013_read_block_data(data, buf) < 0)
> + return -EINVAL;
> +
> + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
> + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
> + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >> SHIFT_2);
The bitcounting hweight32 can actually be removed here.
> + if (!has_x_sensors || !has_y_sensors)
> + return 0;
> +
> + for (i = 0; i < MAX_FINGERS; i++) {
> + const u8 *p = &buf[4 * i + 3];
> + unsigned int x = p[0] << SHIFT_2 | (p[1] & MASK_BITS);
> + unsigned int y = p[2] << SHIFT_2 | (p[3] & MASK_BITS);
> + if (x == 0 || y == 0)
> + continue;
> + pos_x[finger_down_count] = x;
> + pos_y[finger_down_count] = y;
> + finger_down_count++;
> + }
> +
> + if (finger_down_count == 2 &&
> + (abs(pos_x[0] - pos_x[1]) < DELTA_MIN ||
> + abs(pos_y[0] - pos_y[1]) < DELTA_MIN))
> + return 0;
> +
> + if (finger_down_count <= 0) {
> + input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR, 0);
Please do not use ABS_MT_TOUCH_MAJOR, since the device does not support it.
> + input_mt_sync(data->in_dev);
> + } else {
> + for (i = 0; i < finger_down_count; i++) {
> + if (data->chip->x_flip)
> + pos_x[i] = data->chip->touch_x_max - pos_x[i];
> + if (data->chip->y_flip)
> + pos_y[i] = data->chip->touch_y_max - pos_y[i];
> + input_report_abs(data->in_dev, ABS_MT_TOUCH_MAJOR,
> + max(pos_x[i], pos_y[i]));
> + input_report_abs(data->in_dev, ABS_MT_POSITION_X,
> + pos_x[i]);
> + input_report_abs(data->in_dev, ABS_MT_POSITION_Y,
> + pos_y[i]);
> + input_mt_sync(data->in_dev);
> + }
> + }
The pointer emulation ABS_X/ABS_Y/BTN_TOUCH was removed? Fine with me.
> + input_sync(data->in_dev);
> +
> + return 0;
> +}
[...]
> +static int __devinit bu21013_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + int retval;
> + struct bu21013_ts_data *bu21013_data;
> + struct input_dev *in_dev;
> + const struct bu21013_platform_device *pdata =
> + client->dev.platform_data;
> +
> + if (!i2c_check_functionality(client->adapter,
> + I2C_FUNC_SMBUS_BYTE_DATA)) {
> + dev_err(&client->dev, "i2c smbus byte data not supported\n");
> + return -EIO;
> + }
> +
> + if (!pdata) {
> + dev_err(&client->dev, "platform data not defined\n");
> + retval = -EINVAL;
> + return retval;
> + }
> +
> + bu21013_data = kzalloc(sizeof(struct bu21013_ts_data), GFP_KERNEL);
> + if (!bu21013_data) {
> + dev_err(&client->dev, "device memory alloc failed\n");
> + retval = -ENOMEM;
> + return retval;
> + }
> + /* allocate input device */
> + in_dev = input_allocate_device();
> + if (!in_dev) {
> + dev_err(&client->dev, "input device memory alloc failed\n");
> + retval = -ENOMEM;
> + goto err_alloc;
> + }
> + bu21013_data->in_dev = in_dev;
> + bu21013_data->chip = pdata;
> + bu21013_data->client = client;
> +
> + /* configure the gpio pins */
> + if (pdata->cs_en) {
> + retval = pdata->cs_en(pdata->cs_pin);
> + if (retval < 0) {
> + dev_err(&client->dev, "chip init failed\n");
> + goto err_init_cs;
> + }
> + }
> +
> + /* configure the touch panel controller */
> + retval = bu21013_init_chip(bu21013_data);
> + if (retval < 0) {
> + dev_err(&client->dev, "error in bu21013 config\n");
> + goto err_init_config;
> + }
> +
> + init_waitqueue_head(&bu21013_data->wait);
> + bu21013_data->touch_stopped = false;
> +
> + /* register the device to input subsystem */
> + in_dev->name = DRIVER_TP;
> + in_dev->id.bustype = BUS_I2C;
> + in_dev->dev.parent = &client->dev;
> +
> + __set_bit(EV_SYN, in_dev->evbit);
> + __set_bit(EV_KEY, in_dev->evbit);
> + __set_bit(EV_ABS, in_dev->evbit);
> +
> + input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
> + pdata->x_max_res, 0, 0);
> + input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
> + pdata->y_max_res, 0, 0);
> + input_set_abs_params(in_dev, ABS_MT_TOUCH_MAJOR, 0,
> + max(pdata->x_max_res , pdata->y_max_res), 0, 0);
Same here - no ABS_MT_TOUCH_MAJOR, please.
> + input_set_drvdata(in_dev, bu21013_data);
> + retval = input_register_device(in_dev);
> + if (retval)
> + goto err_input_register;
> +
> + retval = request_threaded_irq(pdata->irq, NULL, bu21013_gpio_irq,
> + (IRQF_TRIGGER_FALLING | IRQF_SHARED),
> + DRIVER_TP, bu21013_data);
> + if (retval) {
> + dev_err(&client->dev, "request irq %d failed\n", pdata->irq);
> + goto err_init_irq;
> + }
> +
> + device_init_wakeup(&client->dev, pdata->wakeup);
> + i2c_set_clientdata(client, bu21013_data);
> +
> + return retval;
> +
> +err_init_irq:
> + input_unregister_device(bu21013_data->in_dev);
> + bu21013_data->in_dev = NULL;
> +err_input_register:
> +err_init_config:
> + pdata->cs_dis(pdata->cs_pin);
> +err_init_cs:
> + input_free_device(bu21013_data->in_dev);
> +err_alloc:
> + kfree(bu21013_data);
> +
> + return retval;
> +}
Thanks,
Henrik
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-01 10:59 [PATCHv5] input: ROHM BU21013 touch panel controller support Naveen Kumar G
2010-10-01 11:19 ` Datta, Shubhrajyoti
2010-10-02 6:24 ` Henrik Rydberg
@ 2010-10-02 7:25 ` Henrik Rydberg
2010-10-04 4:52 ` Naveen Kumar GADDIPATI
2 siblings, 1 reply; 7+ messages in thread
From: Henrik Rydberg @ 2010-10-02 7:25 UTC (permalink / raw)
To: Naveen Kumar G
Cc: Dmitry Torokhov, STEricsson_nomadik_linux, linux-input, tsoni
On 10/01/2010 12:59 PM, Naveen Kumar G wrote:
[...]
> +static int bu21013_do_touch_report(struct bu21013_ts_data *data)
> +{
> + u8 buf[LENGTH_OF_BUFFER];
> + unsigned int pos_x[2], pos_y[2];
> + bool has_x_sensors, has_y_sensors;
> + int finger_down_count = 0;
> + int i;
> +
> + if (data == NULL)
> + return -EINVAL;
> +
> + if (bu21013_read_block_data(data, buf) < 0)
> + return -EINVAL;
> +
> + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
> + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
> + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >> SHIFT_2);
> + if (!has_x_sensors || !has_y_sensors)
> + return 0;
I believe this line will lead to fingers stuck in the down position.
Henrik
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-02 7:25 ` Henrik Rydberg
@ 2010-10-04 4:52 ` Naveen Kumar GADDIPATI
0 siblings, 0 replies; 7+ messages in thread
From: Naveen Kumar GADDIPATI @ 2010-10-04 4:52 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Dmitry Torokhov, STEricsson_nomadik_linux,
linux-input@vger.kernel.org, tsoni@codeaurora.org
Hi Henrik,
Thanks for your commenst.
> -----Original Message-----
> From: Henrik Rydberg [mailto:rydberg@euromail.se]
> Sent: Saturday, October 02, 2010 12:56 PM
> > + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
> > + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
> > + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >>
> SHIFT_2);
> > + if (!has_x_sensors || !has_y_sensors)
> > + return 0;
>
>
> I believe this line will lead to fingers stuck in the down position.
>
This case is only used when there is only x or y -co-ordinates or both are null.
This case is coming either before pen down report or after pen up reporting.
So, this is not an issue.
Thanks & Regards,
Naveen
^ permalink raw reply [flat|nested] 7+ messages in thread
* RE: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-02 6:24 ` Henrik Rydberg
@ 2010-10-04 5:15 ` Naveen Kumar GADDIPATI
2010-10-04 6:33 ` Henrik Rydberg
0 siblings, 1 reply; 7+ messages in thread
From: Naveen Kumar GADDIPATI @ 2010-10-04 5:15 UTC (permalink / raw)
To: Henrik Rydberg
Cc: Dmitry Torokhov, STEricsson_nomadik_linux,
linux-input@vger.kernel.org, tsoni@codeaurora.org
Hi Henrik,
> -----Original Message-----
> From: Henrik Rydberg [mailto:rydberg@euromail.se]
> Sent: Saturday, October 02, 2010 11:55 AM
> > + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
> > + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
> > + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >>
> SHIFT_2);
>
>
> The bitcounting hweight32 can actually be removed here.
>
This register values of touch controller used to know the valid touch.
Otherwise we need do the calculate the co-ordinates and then decide to ignore.
> > + if (!has_x_sensors || !has_y_sensors)
> > + return 0;
> > +
> > + for (i = 0; i < MAX_FINGERS; i++) {
> > + const u8 *p = &buf[4 * i + 3];
> > + unsigned int x = p[0] << SHIFT_2 | (p[1] & MASK_BITS);
> > + unsigned int y = p[2] << SHIFT_2 | (p[3] & MASK_BITS);
> > + if (x == 0 || y == 0)
> > + continue;
> > + pos_x[finger_down_count] = x;
> > + pos_y[finger_down_count] = y;
> > + finger_down_count++;
> > + }
> > +
> > + input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
> > + pdata->x_max_res, 0, 0);
> > + input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
> > + pdata->y_max_res, 0, 0);
> > + input_set_abs_params(in_dev, ABS_MT_TOUCH_MAJOR, 0,
> > + max(pdata->x_max_res , pdata->y_max_res), 0, 0);
>
>
> Same here - no ABS_MT_TOUCH_MAJOR, please.
>
According to MT documentation, we need to report this value.
We observe without this value reporting in Pen down case, Android framework is not recognizing the touch.
Thanks & Regards,
Naveen
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCHv5] input: ROHM BU21013 touch panel controller support
2010-10-04 5:15 ` Naveen Kumar GADDIPATI
@ 2010-10-04 6:33 ` Henrik Rydberg
0 siblings, 0 replies; 7+ messages in thread
From: Henrik Rydberg @ 2010-10-04 6:33 UTC (permalink / raw)
To: Naveen Kumar GADDIPATI
Cc: Dmitry Torokhov, STEricsson_nomadik_linux,
linux-input@vger.kernel.org, tsoni@codeaurora.org
On 10/04/2010 07:15 AM, Naveen Kumar GADDIPATI wrote:
[...]
>>> + has_x_sensors = hweight32(buf[0] & BU21013_SENSORS_EN_0_7);
>>> + has_y_sensors = hweight32(((buf[1] & BU21013_SENSORS_EN_8_15) |
>>> + ((buf[2] & BU21013_SENSORS_EN_16_23) << SHIFT_8)) >>
>> SHIFT_2);
>>
>>
>> The bitcounting hweight32 can actually be removed here.
>>
> This register values of touch controller used to know the valid touch.
> Otherwise we need do the calculate the co-ordinates and then decide to ignore.
>
>>> + if (!has_x_sensors || !has_y_sensors)
>>> + return 0;
Testing whether x == 0 or number_of_set_bits(x) == 0 seems pretty equivalent to me.
>
>>> +
>>> + input_set_abs_params(in_dev, ABS_MT_POSITION_X, 0,
>>> + pdata->x_max_res, 0, 0);
>>> + input_set_abs_params(in_dev, ABS_MT_POSITION_Y, 0,
>>> + pdata->y_max_res, 0, 0);
>>> + input_set_abs_params(in_dev, ABS_MT_TOUCH_MAJOR, 0,
>>> + max(pdata->x_max_res , pdata->y_max_res), 0, 0);
>>
>>
>> Same here - no ABS_MT_TOUCH_MAJOR, please.
>>
> According to MT documentation, we need to report this value.
> We observe without this value reporting in Pen down case, Android framework is not recognizing the touch.
The touch_major requirement was relaxed during 2009, after discussions. This
makes me wonder if the driver has been tested against 2.6.36. What is the base
version of that Android kernel, 2.6.29?
Henrik
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2010-10-04 6:33 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-10-01 10:59 [PATCHv5] input: ROHM BU21013 touch panel controller support Naveen Kumar G
2010-10-01 11:19 ` Datta, Shubhrajyoti
2010-10-02 6:24 ` Henrik Rydberg
2010-10-04 5:15 ` Naveen Kumar GADDIPATI
2010-10-04 6:33 ` Henrik Rydberg
2010-10-02 7:25 ` Henrik Rydberg
2010-10-04 4:52 ` Naveen Kumar GADDIPATI
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).