You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Input: ad7879 - split bus logic out
The ad7879 driver is using the old bus method of only supporting one at a time (I2C or SPI). So refactor it like the other input drivers that support multiple busses simultaneously. Signed-off-by: Mike Frysinger <vapier@gentoo.org> Signed-off-by: Michael Hennerich <michael.hennerich@analog.com> Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Mike Frysinger
committed by
Dmitry Torokhov
Dmitry Torokhov
parent
7cd7a82d16
commit
4397c98a8a
@@ -55,37 +55,36 @@ config TOUCHSCREEN_AD7877
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called ad7877.
|
||||
|
||||
config TOUCHSCREEN_AD7879_I2C
|
||||
tristate "AD7879 based touchscreens: AD7879-1 I2C Interface"
|
||||
depends on I2C
|
||||
select TOUCHSCREEN_AD7879
|
||||
config TOUCHSCREEN_AD7879
|
||||
tristate "Analog Devices AD7879-1/AD7889-1 touchscreen interface"
|
||||
help
|
||||
Say Y here if you have a touchscreen interface using the
|
||||
AD7879-1/AD7889-1 controller, and your board-specific
|
||||
initialization code includes that in its table of I2C devices.
|
||||
Say Y here if you want to support a touchscreen interface using
|
||||
the AD7879-1/AD7889-1 controller.
|
||||
|
||||
If unsure, say N (but it's safe to say "Y").
|
||||
You should select a bus connection too.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called ad7879.
|
||||
|
||||
config TOUCHSCREEN_AD7879_I2C
|
||||
tristate "support I2C bus connection"
|
||||
depends on TOUCHSCREEN_AD7879 && I2C
|
||||
help
|
||||
Say Y here if you have AD7879-1/AD7889-1 hooked to an I2C bus.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called ad7879-i2c.
|
||||
|
||||
config TOUCHSCREEN_AD7879_SPI
|
||||
tristate "AD7879 based touchscreens: AD7879 SPI Interface"
|
||||
depends on SPI_MASTER && TOUCHSCREEN_AD7879_I2C = n
|
||||
select TOUCHSCREEN_AD7879
|
||||
tristate "support SPI bus connection"
|
||||
depends on TOUCHSCREEN_AD7879 && SPI_MASTER
|
||||
help
|
||||
Say Y here if you have a touchscreen interface using the
|
||||
AD7879/AD7889 controller, and your board-specific initialization
|
||||
code includes that in its table of SPI devices.
|
||||
Say Y here if you have AD7879-1/AD7889-1 hooked to a SPI bus.
|
||||
|
||||
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 ad7879.
|
||||
|
||||
config TOUCHSCREEN_AD7879
|
||||
tristate
|
||||
default n
|
||||
module will be called ad7879-spi.
|
||||
|
||||
config TOUCHSCREEN_BITSY
|
||||
tristate "Compaq iPAQ H3600 (Bitsy) touchscreen"
|
||||
|
||||
@@ -9,6 +9,8 @@ wm97xx-ts-y := wm97xx-core.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_88PM860X) += 88pm860x-ts.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_AD7877) += ad7877.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_AD7879) += ad7879.o
|
||||
obj-$(CONFIG_TOUCHSCREEN_AD7879_I2C) += ad7879-i2c.o
|
||||
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
|
||||
|
||||
@@ -0,0 +1,140 @@
|
||||
/*
|
||||
* AD7879-1/AD7889-1 touchscreen (I2C bus)
|
||||
*
|
||||
* Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
|
||||
*
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#include <linux/input.h> /* BUS_I2C */
|
||||
#include <linux/i2c.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/types.h>
|
||||
|
||||
#include "ad7879.h"
|
||||
|
||||
#define AD7879_DEVID 0x79 /* AD7879-1/AD7889-1 */
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int ad7879_i2c_suspend(struct i2c_client *client, pm_message_t message)
|
||||
{
|
||||
struct ad7879 *ts = i2c_get_clientdata(client);
|
||||
|
||||
ad7879_disable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad7879_i2c_resume(struct i2c_client *client)
|
||||
{
|
||||
struct ad7879 *ts = i2c_get_clientdata(client);
|
||||
|
||||
ad7879_enable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
# define ad7879_i2c_suspend NULL
|
||||
# define ad7879_i2c_resume NULL
|
||||
#endif
|
||||
|
||||
/* All registers are word-sized.
|
||||
* AD7879 uses a high-byte first convention.
|
||||
*/
|
||||
static int ad7879_i2c_read(struct device *dev, u8 reg)
|
||||
{
|
||||
struct i2c_client *client = to_i2c_client(dev);
|
||||
|
||||
return swab16(i2c_smbus_read_word_data(client, reg));
|
||||
}
|
||||
|
||||
static int ad7879_i2c_multi_read(struct device *dev,
|
||||
u8 first_reg, u8 count, u16 *buf)
|
||||
{
|
||||
u8 idx;
|
||||
|
||||
for (idx = 0; idx < count; ++idx)
|
||||
buf[idx] = ad7879_i2c_read(dev, first_reg + 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_data(client, reg, swab16(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 __devinit ad7879_i2c_probe(struct i2c_client *client,
|
||||
const struct i2c_device_id *id)
|
||||
{
|
||||
struct ad7879 *ts;
|
||||
|
||||
if (!i2c_check_functionality(client->adapter,
|
||||
I2C_FUNC_SMBUS_WORD_DATA)) {
|
||||
dev_err(&client->dev, "SMBUS Word Data not Supported\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
ts = ad7879_probe(&client->dev, AD7879_DEVID, client->irq,
|
||||
&ad7879_i2c_bus_ops);
|
||||
if (IS_ERR(ts))
|
||||
return PTR_ERR(ts);
|
||||
|
||||
i2c_set_clientdata(client, ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit ad7879_i2c_remove(struct i2c_client *client)
|
||||
{
|
||||
struct ad7879 *ts = i2c_get_clientdata(client);
|
||||
|
||||
ad7879_remove(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static const struct i2c_device_id ad7879_id[] = {
|
||||
{ "ad7879", 0 },
|
||||
{ "ad7889", 0 },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(i2c, ad7879_id);
|
||||
|
||||
static struct i2c_driver ad7879_i2c_driver = {
|
||||
.driver = {
|
||||
.name = "ad7879",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = ad7879_i2c_probe,
|
||||
.remove = __devexit_p(ad7879_i2c_remove),
|
||||
.suspend = ad7879_i2c_suspend,
|
||||
.resume = ad7879_i2c_resume,
|
||||
.id_table = ad7879_id,
|
||||
};
|
||||
|
||||
static int __init ad7879_i2c_init(void)
|
||||
{
|
||||
return i2c_add_driver(&ad7879_i2c_driver);
|
||||
}
|
||||
module_init(ad7879_i2c_init);
|
||||
|
||||
static void __exit ad7879_i2c_exit(void)
|
||||
{
|
||||
i2c_del_driver(&ad7879_i2c_driver);
|
||||
}
|
||||
module_exit(ad7879_i2c_exit);
|
||||
|
||||
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
|
||||
MODULE_DESCRIPTION("AD7879(-1) touchscreen I2C bus driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("i2c:ad7879");
|
||||
@@ -0,0 +1,190 @@
|
||||
/*
|
||||
* AD7879/AD7889 touchscreen (SPI bus)
|
||||
*
|
||||
* Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
|
||||
*
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#include <linux/input.h> /* BUS_SPI */
|
||||
#include <linux/spi/spi.h>
|
||||
|
||||
#include "ad7879.h"
|
||||
|
||||
#define AD7879_DEVID 0x7A /* AD7879/AD7889 */
|
||||
|
||||
#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)
|
||||
|
||||
#ifdef CONFIG_PM
|
||||
static int ad7879_spi_suspend(struct spi_device *spi, pm_message_t message)
|
||||
{
|
||||
struct ad7879 *ts = spi_get_drvdata(spi);
|
||||
|
||||
ad7879_disable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int ad7879_spi_resume(struct spi_device *spi)
|
||||
{
|
||||
struct ad7879 *ts = spi_get_drvdata(spi);
|
||||
|
||||
ad7879_enable(ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
#else
|
||||
# define ad7879_spi_suspend NULL
|
||||
# define ad7879_spi_resume NULL
|
||||
#endif
|
||||
|
||||
/*
|
||||
* ad7879_read/write are only used for initial setup and for sysfs controls.
|
||||
* 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);
|
||||
|
||||
if (count == 1)
|
||||
_rx_buf[0] = command[2];
|
||||
|
||||
kfree(spi_data);
|
||||
|
||||
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 __devinit ad7879_spi_probe(struct spi_device *spi)
|
||||
{
|
||||
struct ad7879 *ts;
|
||||
|
||||
/* don't exceed max specified SPI CLK frequency */
|
||||
if (spi->max_speed_hz > MAX_SPI_FREQ_HZ) {
|
||||
dev_err(&spi->dev, "SPI CLK %d Hz?\n", spi->max_speed_hz);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
ts = ad7879_probe(&spi->dev, AD7879_DEVID, spi->irq, &ad7879_spi_bus_ops);
|
||||
if (IS_ERR(ts))
|
||||
return PTR_ERR(ts);
|
||||
|
||||
spi_set_drvdata(spi, ts);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devexit ad7879_spi_remove(struct spi_device *spi)
|
||||
{
|
||||
struct ad7879 *ts = spi_get_drvdata(spi);
|
||||
|
||||
ad7879_remove(ts);
|
||||
spi_set_drvdata(spi, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct spi_driver ad7879_spi_driver = {
|
||||
.driver = {
|
||||
.name = "ad7879",
|
||||
.bus = &spi_bus_type,
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
.probe = ad7879_spi_probe,
|
||||
.remove = __devexit_p(ad7879_spi_remove),
|
||||
.suspend = ad7879_spi_suspend,
|
||||
.resume = ad7879_spi_resume,
|
||||
};
|
||||
|
||||
static int __init ad7879_spi_init(void)
|
||||
{
|
||||
return spi_register_driver(&ad7879_spi_driver);
|
||||
}
|
||||
module_init(ad7879_spi_init);
|
||||
|
||||
static void __exit ad7879_spi_exit(void)
|
||||
{
|
||||
spi_unregister_driver(&ad7879_spi_driver);
|
||||
}
|
||||
module_exit(ad7879_spi_exit);
|
||||
|
||||
MODULE_AUTHOR("Michael Hennerich <hennerich@blackfin.uclinux.org>");
|
||||
MODULE_DESCRIPTION("AD7879(-1) touchscreen SPI bus driver");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_ALIAS("spi:ad7879");
|
||||
+104
-396
File diff suppressed because it is too large
Load Diff
@@ -0,0 +1,30 @@
|
||||
/*
|
||||
* AD7879/AD7889 touchscreen (bus interfaces)
|
||||
*
|
||||
* Copyright (C) 2008-2010 Michael Hennerich, Analog Devices Inc.
|
||||
*
|
||||
* Licensed under the GPL-2 or later.
|
||||
*/
|
||||
|
||||
#ifndef _AD7879_H_
|
||||
#define _AD7879_H_
|
||||
|
||||
#include <linux/types.h>
|
||||
|
||||
struct ad7879;
|
||||
struct device;
|
||||
|
||||
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);
|
||||
};
|
||||
|
||||
void ad7879_disable(struct ad7879 *);
|
||||
void ad7879_enable(struct ad7879 *);
|
||||
struct ad7879 *ad7879_probe(struct device *dev, u8 devid, unsigned irq,
|
||||
const struct ad7879_bus_ops *bops);
|
||||
void ad7879_remove(struct ad7879 *);
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user