Input: cyttsp - I2C driver split into two modules
authorFerruh Yigit <fery@cypress.com>
Mon, 1 Jul 2013 01:46:56 +0000 (18:46 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Mon, 1 Jul 2013 04:24:16 +0000 (21:24 -0700)
Existing I2C code is for TrueTouch Gen3 devices

TrueTouch Gen4 device is using same protocol, will split driver into
two pieces to use common code with both drivers.

Read/Write functions parameter list modified, since shared code will
be used by two separate drivers and these drivers are not sharing same
structs, parameters updated to use common structures.

Signed-off-by: Ferruh Yigit <fery@cypress.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Acked-by: Javier Martinez Canillas <javier@dowhile0.org>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
drivers/input/touchscreen/Makefile
drivers/input/touchscreen/cyttsp_core.c
drivers/input/touchscreen/cyttsp_core.h
drivers/input/touchscreen/cyttsp_i2c.c
drivers/input/touchscreen/cyttsp_i2c_common.c [new file with mode: 0644]
drivers/input/touchscreen/cyttsp_spi.c

index 6bfbeab67c9ffc93489283cb88d8ea773e291719..2b378b12ee6bb09714dca301d429623542c8da45 100644 (file)
@@ -18,7 +18,7 @@ obj-$(CONFIG_TOUCHSCREEN_AUO_PIXCIR)  += auo-pixcir-ts.o
 obj-$(CONFIG_TOUCHSCREEN_BU21013)      += bu21013_ts.o
 obj-$(CONFIG_TOUCHSCREEN_CY8CTMG110)   += cy8ctmg110_ts.o
 obj-$(CONFIG_TOUCHSCREEN_CYTTSP_CORE)  += cyttsp_core.o
-obj-$(CONFIG_TOUCHSCREEN_CYTTSP_I2C)   += cyttsp_i2c.o
+obj-$(CONFIG_TOUCHSCREEN_CYTTSP_I2C)   += cyttsp_i2c.o cyttsp_i2c_common.o
 obj-$(CONFIG_TOUCHSCREEN_CYTTSP_SPI)   += cyttsp_spi.o
 obj-$(CONFIG_TOUCHSCREEN_DA9034)       += da9034-ts.o
 obj-$(CONFIG_TOUCHSCREEN_DA9052)       += da9052_tsi.o
index 8e60437ac85b46569e57ae78f2bea455fd1b9ab5..4824fa3438979ade60c4c870b522341297fef88b 100644 (file)
@@ -84,7 +84,8 @@ static int ttsp_read_block_data(struct cyttsp *ts, u8 command,
        int tries;
 
        for (tries = 0; tries < CY_NUM_RETRY; tries++) {
-               error = ts->bus_ops->read(ts, command, length, buf);
+               error = ts->bus_ops->read(ts->dev, ts->xfer_buf, command,
+                               length, buf);
                if (!error)
                        return 0;
 
@@ -101,7 +102,8 @@ static int ttsp_write_block_data(struct cyttsp *ts, u8 command,
        int tries;
 
        for (tries = 0; tries < CY_NUM_RETRY; tries++) {
-               error = ts->bus_ops->write(ts, command, length, buf);
+               error = ts->bus_ops->write(ts->dev, ts->xfer_buf, command,
+                               length, buf);
                if (!error)
                        return 0;
 
index 1aa3c6967e70fb63610849f578f3afe08d0ac145..d0c9e488b05db81020a43d5f57a37e3741ed0bec 100644 (file)
@@ -112,9 +112,10 @@ struct cyttsp;
 
 struct cyttsp_bus_ops {
        u16 bustype;
-       int (*write)(struct cyttsp *ts,
-                    u8 addr, u8 length, const void *values);
-       int (*read)(struct cyttsp *ts, u8 addr, u8 length, void *values);
+       int (*write)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+                       const void *values);
+       int (*read)(struct device *dev, u8 *xfer_buf, u8 addr, u8 length,
+                       void *values);
 };
 
 enum cyttsp_state {
@@ -144,6 +145,10 @@ struct cyttsp *cyttsp_probe(const struct cyttsp_bus_ops *bus_ops,
                            struct device *dev, int irq, size_t xfer_buf_size);
 void cyttsp_remove(struct cyttsp *ts);
 
+int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+               u8 length, const void *values);
+int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf, u8 addr,
+               u8 length, void *values);
 extern const struct dev_pm_ops cyttsp_pm_ops;
 
 #endif /* __CYTTSP_CORE_H__ */
index 4dbdf44b8fc5478d88f6eb1b03a425eba941c8d4..63104a86a9bdfcc6bf069e2e0886cd01916491a1 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Source for:
+ * cyttsp_i2c.c
  * Cypress TrueTouch(TM) Standard Product (TTSP) I2C touchscreen driver.
  * For use with Cypress Txx3xx parts.
  * Supported parts include:
  * 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 program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contact Cypress Semiconductor at www.cypress.com <kev@cypress.com>
+ * Contact Cypress Semiconductor at www.cypress.com <ttdrivers@cypress.com>
  *
  */
 
 
 #define CY_I2C_DATA_SIZE       128
 
-static int cyttsp_i2c_read_block_data(struct cyttsp *ts,
-                                     u8 addr, u8 length, void *values)
-{
-       struct i2c_client *client = to_i2c_client(ts->dev);
-       struct i2c_msg msgs[] = {
-               {
-                       .addr = client->addr,
-                       .flags = 0,
-                       .len = 1,
-                       .buf = &addr,
-               },
-               {
-                       .addr = client->addr,
-                       .flags = I2C_M_RD,
-                       .len = length,
-                       .buf = values,
-               },
-       };
-       int retval;
-
-       retval = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
-       if (retval < 0)
-               return retval;
-
-       return retval != ARRAY_SIZE(msgs) ? -EIO : 0;
-}
-
-static int cyttsp_i2c_write_block_data(struct cyttsp *ts,
-                                      u8 addr, u8 length, const void *values)
-{
-       struct i2c_client *client = to_i2c_client(ts->dev);
-       int retval;
-
-       ts->xfer_buf[0] = addr;
-       memcpy(&ts->xfer_buf[1], values, length);
-
-       retval = i2c_master_send(client, ts->xfer_buf, length + 1);
-
-       return retval < 0 ? retval : 0;
-}
-
 static const struct cyttsp_bus_ops cyttsp_i2c_bus_ops = {
        .bustype        = BUS_I2C,
        .write          = cyttsp_i2c_write_block_data,
@@ -98,7 +53,6 @@ static int cyttsp_i2c_probe(struct i2c_client *client,
                return PTR_ERR(ts);
 
        i2c_set_clientdata(client, ts);
-
        return 0;
 }
 
diff --git a/drivers/input/touchscreen/cyttsp_i2c_common.c b/drivers/input/touchscreen/cyttsp_i2c_common.c
new file mode 100644 (file)
index 0000000..07c553f
--- /dev/null
@@ -0,0 +1,79 @@
+/*
+ * cyttsp_i2c_common.c
+ * Cypress TrueTouch(TM) Standard Product (TTSP) I2C touchscreen driver.
+ * For use with Cypress Txx3xx and Txx4xx parts.
+ * Supported parts include:
+ * CY8CTST341
+ * CY8CTMA340
+ * TMA4XX
+ * TMA1036
+ *
+ * Copyright (C) 2009, 2010, 2011 Cypress Semiconductor, Inc.
+ * Copyright (C) 2012 Javier Martinez Canillas <javier@dowhile0.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2, and only version 2, as published by the
+ * Free Software Foundation.
+ *
+ * This program 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.
+ *
+ * Contact Cypress Semiconductor at www.cypress.com <ttdrivers@cypress.com>
+ *
+ */
+
+#include <linux/device.h>
+#include <linux/export.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/types.h>
+
+int cyttsp_i2c_read_block_data(struct device *dev, u8 *xfer_buf,
+                                     u8 addr, u8 length, void *values)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct i2c_msg msgs[] = {
+               {
+                       .addr = client->addr,
+                       .flags = 0,
+                       .len = 1,
+                       .buf = &addr,
+               },
+               {
+                       .addr = client->addr,
+                       .flags = I2C_M_RD,
+                       .len = length,
+                       .buf = values,
+               },
+       };
+       int retval;
+
+       retval = i2c_transfer(client->adapter, msgs, ARRAY_SIZE(msgs));
+       if (retval < 0)
+               return retval;
+
+       return retval != ARRAY_SIZE(msgs) ? -EIO : 0;
+}
+EXPORT_SYMBOL_GPL(cyttsp_i2c_read_block_data);
+
+int cyttsp_i2c_write_block_data(struct device *dev, u8 *xfer_buf,
+                                      u8 addr, u8 length, const void *values)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       int retval;
+
+       xfer_buf[0] = addr;
+       memcpy(&xfer_buf[1], values, length);
+
+       retval = i2c_master_send(client, xfer_buf, length + 1);
+
+       return retval < 0 ? retval : 0;
+}
+EXPORT_SYMBOL_GPL(cyttsp_i2c_write_block_data);
+
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Cypress");
index 861b7f77605ba9f2c107fc7080457c5a6d8f4916..1df625337b84c53557587441934d8e157bbdc79c 100644 (file)
@@ -8,6 +8,7 @@
  *
  * Copyright (C) 2009, 2010, 2011 Cypress Semiconductor, Inc.
  * Copyright (C) 2012 Javier Martinez Canillas <javier@dowhile0.org>
+ * Copyright (C) 2013 Cypress Semiconductor
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
  * 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 program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * Contact Cypress Semiconductor at www.cypress.com <kev@cypress.com>
+ * Contact Cypress Semiconductor at www.cypress.com <ttdrivers@cypress.com>
  *
  */
 
 #define CY_SPI_DATA_BUF_SIZE   (CY_SPI_CMD_BYTES + CY_SPI_DATA_SIZE)
 #define CY_SPI_BITS_PER_WORD   8
 
-static int cyttsp_spi_xfer(struct cyttsp *ts,
+static int cyttsp_spi_xfer(struct device *dev, u8 *xfer_buf,
                           u8 op, u8 reg, u8 *buf, int length)
 {
-       struct spi_device *spi = to_spi_device(ts->dev);
+       struct spi_device *spi = to_spi_device(dev);
        struct spi_message msg;
        struct spi_transfer xfer[2];
-       u8 *wr_buf = &ts->xfer_buf[0];
-       u8 *rd_buf = &ts->xfer_buf[CY_SPI_DATA_BUF_SIZE];
+       u8 *wr_buf = &xfer_buf[0];
+       u8 *rd_buf = &xfer_buf[CY_SPI_DATA_BUF_SIZE];
        int retval;
        int i;
 
        if (length > CY_SPI_DATA_SIZE) {
-               dev_err(ts->dev, "%s: length %d is too big.\n",
+               dev_err(dev, "%s: length %d is too big.\n",
                        __func__, length);
                return -EINVAL;
        }
@@ -95,13 +92,13 @@ static int cyttsp_spi_xfer(struct cyttsp *ts,
                break;
 
        default:
-               dev_err(ts->dev, "%s: bad operation code=%d\n", __func__, op);
+               dev_err(dev, "%s: bad operation code=%d\n", __func__, op);
                return -EINVAL;
        }
 
        retval = spi_sync(spi, &msg);
        if (retval < 0) {
-               dev_dbg(ts->dev, "%s: spi_sync() error %d, len=%d, op=%d\n",
+               dev_dbg(dev, "%s: spi_sync() error %d, len=%d, op=%d\n",
                        __func__, retval, xfer[1].len, op);
 
                /*
@@ -113,14 +110,13 @@ static int cyttsp_spi_xfer(struct cyttsp *ts,
 
        if (rd_buf[CY_SPI_SYNC_BYTE] != CY_SPI_SYNC_ACK1 ||
            rd_buf[CY_SPI_SYNC_BYTE + 1] != CY_SPI_SYNC_ACK2) {
-
-               dev_dbg(ts->dev, "%s: operation %d failed\n", __func__, op);
+               dev_dbg(dev, "%s: operation %d failed\n", __func__, op);
 
                for (i = 0; i < CY_SPI_CMD_BYTES; i++)
-                       dev_dbg(ts->dev, "%s: test rd_buf[%d]:0x%02x\n",
+                       dev_dbg(dev, "%s: test rd_buf[%d]:0x%02x\n",
                                __func__, i, rd_buf[i]);
                for (i = 0; i < length; i++)
-                       dev_dbg(ts->dev, "%s: test buf[%d]:0x%02x\n",
+                       dev_dbg(dev, "%s: test buf[%d]:0x%02x\n",
                                __func__, i, buf[i]);
 
                return -EIO;
@@ -129,16 +125,18 @@ static int cyttsp_spi_xfer(struct cyttsp *ts,
        return 0;
 }
 
-static int cyttsp_spi_read_block_data(struct cyttsp *ts,
+static int cyttsp_spi_read_block_data(struct device *dev, u8 *xfer_buf,
                                      u8 addr, u8 length, void *data)
 {
-       return cyttsp_spi_xfer(ts, CY_SPI_RD_OP, addr, data, length);
+       return cyttsp_spi_xfer(dev, xfer_buf, CY_SPI_RD_OP, addr, data,
+                       length);
 }
 
-static int cyttsp_spi_write_block_data(struct cyttsp *ts,
+static int cyttsp_spi_write_block_data(struct device *dev, u8 *xfer_buf,
                                       u8 addr, u8 length, const void *data)
 {
-       return cyttsp_spi_xfer(ts, CY_SPI_WR_OP, addr, (void *)data, length);
+       return cyttsp_spi_xfer(dev, xfer_buf, CY_SPI_WR_OP, addr, (void *)data,
+                       length);
 }
 
 static const struct cyttsp_bus_ops cyttsp_spi_bus_ops = {