Commit 404a24c3 authored by Dmitry Torokhov's avatar Dmitry Torokhov

Input: ad7879 - convert to use regmap

Instead of rolling our own infrastructure to provide uniform access to I2C
and SPI buses, let's switch to using regmap.
Reviewed-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Tested-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent a1b53592
...@@ -73,6 +73,7 @@ config TOUCHSCREEN_AD7879 ...@@ -73,6 +73,7 @@ config TOUCHSCREEN_AD7879
config TOUCHSCREEN_AD7879_I2C config TOUCHSCREEN_AD7879_I2C
tristate "support I2C bus connection" tristate "support I2C bus connection"
depends on TOUCHSCREEN_AD7879 && I2C depends on TOUCHSCREEN_AD7879 && I2C
select REGMAP_I2C
help help
Say Y here if you have AD7879-1/AD7889-1 hooked to an I2C bus. Say Y here if you have AD7879-1/AD7889-1 hooked to an I2C bus.
...@@ -82,6 +83,7 @@ config TOUCHSCREEN_AD7879_I2C ...@@ -82,6 +83,7 @@ config TOUCHSCREEN_AD7879_I2C
config TOUCHSCREEN_AD7879_SPI config TOUCHSCREEN_AD7879_SPI
tristate "support SPI bus connection" tristate "support SPI bus connection"
depends on TOUCHSCREEN_AD7879 && SPI_MASTER depends on TOUCHSCREEN_AD7879 && SPI_MASTER
select REGMAP_SPI
help help
Say Y here if you have AD7879-1/AD7889-1 hooked to a SPI bus. Say Y here if you have AD7879-1/AD7889-1 hooked to a SPI bus.
......
...@@ -12,53 +12,23 @@ ...@@ -12,53 +12,23 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/pm.h> #include <linux/pm.h>
#include <linux/regmap.h>
#include "ad7879.h" #include "ad7879.h"
#define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */ #define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */
/* All registers are word-sized. static const struct regmap_config ad7879_i2c_regmap_config = {
* AD7879 uses a high-byte first convention. .reg_bits = 8,
*/ .val_bits = 16,
static int ad7879_i2c_read(struct device *dev, u8 reg) .max_register = 15,
{
struct i2c_client *client = to_i2c_client(dev);
return i2c_smbus_read_word_swapped(client, reg);
}
static int ad7879_i2c_multi_read(struct device *dev,
u8 first_reg, u8 count, u16 *buf)
{
struct i2c_client *client = to_i2c_client(dev);
u8 idx;
i2c_smbus_read_i2c_block_data(client, first_reg, count * 2, (u8 *)buf);
for (idx = 0; idx < count; ++idx)
buf[idx] = swab16(buf[idx]);
return 0;
}
static int ad7879_i2c_write(struct device *dev, u8 reg, u16 val)
{
struct i2c_client *client = to_i2c_client(dev);
return i2c_smbus_write_word_swapped(client, reg, val);
}
static const struct ad7879_bus_ops ad7879_i2c_bus_ops = {
.bustype = BUS_I2C,
.read = ad7879_i2c_read,
.multi_read = ad7879_i2c_multi_read,
.write = ad7879_i2c_write,
}; };
static int ad7879_i2c_probe(struct i2c_client *client, static int ad7879_i2c_probe(struct i2c_client *client,
const struct i2c_device_id *id) const struct i2c_device_id *id)
{ {
struct ad7879 *ts; struct ad7879 *ts;
struct regmap *regmap;
if (!i2c_check_functionality(client->adapter, if (!i2c_check_functionality(client->adapter,
I2C_FUNC_SMBUS_WORD_DATA)) { I2C_FUNC_SMBUS_WORD_DATA)) {
...@@ -66,8 +36,12 @@ static int ad7879_i2c_probe(struct i2c_client *client, ...@@ -66,8 +36,12 @@ static int ad7879_i2c_probe(struct i2c_client *client,
return -EIO; return -EIO;
} }
ts = ad7879_probe(&client->dev, AD7879_DEVID, client->irq, regmap = devm_regmap_init_i2c(client, &ad7879_i2c_regmap_config);
&ad7879_i2c_bus_ops); if (IS_ERR(regmap))
return PTR_ERR(regmap);
ts = ad7879_probe(&client->dev, regmap, client->irq,
BUS_I2C, AD7879_DEVID);
if (IS_ERR(ts)) if (IS_ERR(ts))
return PTR_ERR(ts); return PTR_ERR(ts);
......
...@@ -11,109 +11,29 @@ ...@@ -11,109 +11,29 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/regmap.h>
#include "ad7879.h" #include "ad7879.h"
#define AD7879_DEVID 0x7A /* AD7879/AD7889 */ #define AD7879_DEVID 0x7A /* AD7879/AD7889 */
#define MAX_SPI_FREQ_HZ 5000000 #define MAX_SPI_FREQ_HZ 5000000
#define AD7879_CMD_MAGIC 0xE000
#define AD7879_CMD_READ (1 << 10)
#define AD7879_CMD(reg) (AD7879_CMD_MAGIC | ((reg) & 0xF))
#define AD7879_WRITECMD(reg) (AD7879_CMD(reg))
#define AD7879_READCMD(reg) (AD7879_CMD(reg) | AD7879_CMD_READ)
/* #define AD7879_CMD_MAGIC 0xE0
* ad7879_read/write are only used for initial setup and for sysfs controls. #define AD7879_CMD_READ BIT(2)
* The main traffic is done in ad7879_collect().
*/
static int ad7879_spi_xfer(struct spi_device *spi,
u16 cmd, u8 count, u16 *tx_buf, u16 *rx_buf)
{
struct spi_message msg;
struct spi_transfer *xfers;
void *spi_data;
u16 *command;
u16 *_rx_buf = _rx_buf; /* shut gcc up */
u8 idx;
int ret;
xfers = spi_data = kzalloc(sizeof(*xfers) * (count + 2), GFP_KERNEL);
if (!spi_data)
return -ENOMEM;
spi_message_init(&msg);
command = spi_data;
command[0] = cmd;
if (count == 1) {
/* ad7879_spi_{read,write} gave us buf on stack */
command[1] = *tx_buf;
tx_buf = &command[1];
_rx_buf = rx_buf;
rx_buf = &command[2];
}
++xfers;
xfers[0].tx_buf = command;
xfers[0].len = 2;
spi_message_add_tail(&xfers[0], &msg);
++xfers;
for (idx = 0; idx < count; ++idx) {
if (rx_buf)
xfers[idx].rx_buf = &rx_buf[idx];
if (tx_buf)
xfers[idx].tx_buf = &tx_buf[idx];
xfers[idx].len = 2;
spi_message_add_tail(&xfers[idx], &msg);
}
ret = spi_sync(spi, &msg); static const struct regmap_config ad7879_spi_regmap_config = {
.reg_bits = 16,
if (count == 1) .val_bits = 16,
_rx_buf[0] = command[2]; .max_register = 15,
.read_flag_mask = AD7879_CMD_MAGIC | AD7879_CMD_READ,
kfree(spi_data); .write_flag_mask = AD7879_CMD_MAGIC,
return ret;
}
static int ad7879_spi_multi_read(struct device *dev,
u8 first_reg, u8 count, u16 *buf)
{
struct spi_device *spi = to_spi_device(dev);
return ad7879_spi_xfer(spi, AD7879_READCMD(first_reg), count, NULL, buf);
}
static int ad7879_spi_read(struct device *dev, u8 reg)
{
struct spi_device *spi = to_spi_device(dev);
u16 ret, dummy;
return ad7879_spi_xfer(spi, AD7879_READCMD(reg), 1, &dummy, &ret) ? : ret;
}
static int ad7879_spi_write(struct device *dev, u8 reg, u16 val)
{
struct spi_device *spi = to_spi_device(dev);
u16 dummy;
return ad7879_spi_xfer(spi, AD7879_WRITECMD(reg), 1, &val, &dummy);
}
static const struct ad7879_bus_ops ad7879_spi_bus_ops = {
.bustype = BUS_SPI,
.read = ad7879_spi_read,
.multi_read = ad7879_spi_multi_read,
.write = ad7879_spi_write,
}; };
static int ad7879_spi_probe(struct spi_device *spi) static int ad7879_spi_probe(struct spi_device *spi)
{ {
struct ad7879 *ts; struct ad7879 *ts;
struct regmap *regmap;
int err; int err;
/* don't exceed max specified SPI CLK frequency */ /* don't exceed max specified SPI CLK frequency */
...@@ -129,7 +49,11 @@ static int ad7879_spi_probe(struct spi_device *spi) ...@@ -129,7 +49,11 @@ static int ad7879_spi_probe(struct spi_device *spi)
return err; return err;
} }
ts = ad7879_probe(&spi->dev, AD7879_DEVID, spi->irq, &ad7879_spi_bus_ops); regmap = devm_regmap_init_spi(spi, &ad7879_spi_regmap_config);
if (IS_ERR(regmap))
return PTR_ERR(regmap);
ts = ad7879_probe(&spi->dev, regmap, spi->irq, BUS_SPI, AD7879_DEVID);
if (IS_ERR(ts)) if (IS_ERR(ts))
return PTR_ERR(ts); return PTR_ERR(ts);
......
...@@ -26,9 +26,8 @@ ...@@ -26,9 +26,8 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/regmap.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spi/spi.h>
#include <linux/i2c.h>
#include <linux/gpio.h> #include <linux/gpio.h>
#include <linux/input/touchscreen.h> #include <linux/input/touchscreen.h>
...@@ -106,8 +105,7 @@ enum { ...@@ -106,8 +105,7 @@ enum {
#define TS_PEN_UP_TIMEOUT msecs_to_jiffies(50) #define TS_PEN_UP_TIMEOUT msecs_to_jiffies(50)
struct ad7879 { struct ad7879 {
const struct ad7879_bus_ops *bops; struct regmap *regmap;
struct device *dev; struct device *dev;
struct input_dev *input; struct input_dev *input;
struct timer_list timer; struct timer_list timer;
...@@ -137,17 +135,32 @@ struct ad7879 { ...@@ -137,17 +135,32 @@ struct ad7879 {
static int ad7879_read(struct ad7879 *ts, u8 reg) static int ad7879_read(struct ad7879 *ts, u8 reg)
{ {
return ts->bops->read(ts->dev, reg); unsigned int val;
} int error;
static int ad7879_multi_read(struct ad7879 *ts, u8 first_reg, u8 count, u16 *buf) error = regmap_read(ts->regmap, reg, &val);
{ if (error) {
return ts->bops->multi_read(ts->dev, first_reg, count, buf); dev_err(ts->dev, "failed to read register %#02x: %d\n",
reg, error);
return error;
}
return val;
} }
static int ad7879_write(struct ad7879 *ts, u8 reg, u16 val) static int ad7879_write(struct ad7879 *ts, u8 reg, u16 val)
{ {
return ts->bops->write(ts->dev, reg, val); int error;
error = regmap_write(ts->regmap, reg, val);
if (error) {
dev_err(ts->dev,
"failed to write %#04x to register %#02x: %d\n",
val, reg, error);
return error;
}
return 0;
} }
static int ad7879_report(struct ad7879 *ts) static int ad7879_report(struct ad7879 *ts)
...@@ -234,7 +247,8 @@ static irqreturn_t ad7879_irq(int irq, void *handle) ...@@ -234,7 +247,8 @@ static irqreturn_t ad7879_irq(int irq, void *handle)
{ {
struct ad7879 *ts = handle; struct ad7879 *ts = handle;
ad7879_multi_read(ts, AD7879_REG_XPLUS, AD7879_NR_SENSE, ts->conversion_data); regmap_bulk_read(ts->regmap, AD7879_REG_XPLUS,
ts->conversion_data, AD7879_NR_SENSE);
if (!ad7879_report(ts)) if (!ad7879_report(ts))
mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT); mod_timer(&ts->timer, jiffies + TS_PEN_UP_TIMEOUT);
...@@ -511,8 +525,8 @@ static int ad7879_parse_dt(struct device *dev, struct ad7879 *ts) ...@@ -511,8 +525,8 @@ static int ad7879_parse_dt(struct device *dev, struct ad7879 *ts)
return 0; return 0;
} }
struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, struct ad7879 *ad7879_probe(struct device *dev, struct regmap *regmap,
const struct ad7879_bus_ops *bops) int irq, u16 bustype, u8 devid)
{ {
struct ad7879_platform_data *pdata = dev_get_platdata(dev); struct ad7879_platform_data *pdata = dev_get_platdata(dev);
struct ad7879 *ts; struct ad7879 *ts;
...@@ -520,7 +534,7 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, ...@@ -520,7 +534,7 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq,
int err; int err;
u16 revid; u16 revid;
if (!irq) { if (irq <= 0) {
dev_err(dev, "No IRQ specified\n"); dev_err(dev, "No IRQ specified\n");
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }
...@@ -553,10 +567,10 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, ...@@ -553,10 +567,10 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq,
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
} }
ts->bops = bops;
ts->dev = dev; ts->dev = dev;
ts->input = input_dev; ts->input = input_dev;
ts->irq = irq; ts->irq = irq;
ts->regmap = regmap;
setup_timer(&ts->timer, ad7879_timer, (unsigned long) ts); setup_timer(&ts->timer, ad7879_timer, (unsigned long) ts);
snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(dev)); snprintf(ts->phys, sizeof(ts->phys), "%s/input0", dev_name(dev));
...@@ -564,7 +578,7 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq, ...@@ -564,7 +578,7 @@ struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned int irq,
input_dev->name = "AD7879 Touchscreen"; input_dev->name = "AD7879 Touchscreen";
input_dev->phys = ts->phys; input_dev->phys = ts->phys;
input_dev->dev.parent = dev; input_dev->dev.parent = dev;
input_dev->id.bustype = bops->bustype; input_dev->id.bustype = bustype;
input_dev->open = ad7879_open; input_dev->open = ad7879_open;
input_dev->close = ad7879_close; input_dev->close = ad7879_close;
......
...@@ -13,18 +13,12 @@ ...@@ -13,18 +13,12 @@
struct ad7879; struct ad7879;
struct device; struct device;
struct regmap;
struct ad7879_bus_ops {
u16 bustype;
int (*read)(struct device *dev, u8 reg);
int (*multi_read)(struct device *dev, u8 first_reg, u8 count, u16 *buf);
int (*write)(struct device *dev, u8 reg, u16 val);
};
extern const struct dev_pm_ops ad7879_pm_ops; extern const struct dev_pm_ops ad7879_pm_ops;
struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned irq, struct ad7879 *ad7879_probe(struct device *dev, struct regmap *regmap,
const struct ad7879_bus_ops *bops); int irq, u16 bustype, u8 devid);
void ad7879_remove(struct ad7879 *); void ad7879_remove(struct ad7879 *);
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment