/*
- * drivers/spi/tsc210x.c
- *
- * TSC2101/2102 interface driver.
+ * tsc210x.c - TSC2101/2102/... driver core
*
* Copyright (c) 2005-2007 Andrzej Zaborowski <balrog@zabor.org>
*
#include <linux/spi/spi.h>
#include <linux/spi/tsc210x.h>
+
+/* NOTE: It should be straightforward to make this driver framework handle
+ * tsc2100 and tsc2111 chips, and maybe others too. The main differences
+ * are in the audio codec capabilities, but there are also some differences
+ * in how the various sensors (including touchscreen) are handled.
+ */
+
/* Bit field definitions for chip registers */
/* Scan X, Y, Z1, Z2, chip controlled, 12-bit, 16 samples, 500 usec */
struct tsc210x_spi_req {
struct spi_device *dev;
- uint16_t command, data;
+ u16 command;
+ u16 data;
struct spi_message message;
};
struct delayed_work sensor_worker; /* Scan the ADC inputs */
spinlock_t queue_lock;
struct completion data_avail;
+
tsc210x_touch_t touch_cb;
void *touch_cb_ctx;
+
tsc210x_coords_t coords_cb;
void *coords_cb_ctx;
+
tsc210x_ports_t ports_cb;
void *ports_cb_ctx;
+
tsc210x_temp_t temp1_cb;
void *temp2_cb_ctx;
+
tsc210x_temp_t temp2_cb;
void *temp1_cb_ctx;
int pendown;
int flushing; /* Queue flush in progress */
- uint16_t status, adc_data[4];
+ u16 status;
+ u16 adc_data[4];
int bat[2], aux[2], temp[2];
};
module_param_named(sensor_scan_msecs, settings.mode_msecs, uint, 0);
MODULE_PARM_DESC(sensor_scan_msecs, "Temperature & battery scan interval");
-void tsc210x_write_sync(struct tsc210x_dev *dev,
+int tsc210x_write_sync(struct tsc210x_dev *dev,
int page, u8 address, u16 data)
{
static struct tsc210x_spi_req req;
/* Address */
req.command = (page << 11) | (address << 5);
transfer[0].tx_buf = &req.command;
- transfer[0].rx_buf = 0;
+ transfer[0].rx_buf = NULL;
transfer[0].len = 2;
spi_message_add_tail(&transfer[0], &req.message);
/* Data */
transfer[1].tx_buf = &data;
- transfer[1].rx_buf = 0;
+ transfer[1].rx_buf = NULL;
transfer[1].len = 2;
transfer[1].cs_change = CS_CHANGE(1);
spi_message_add_tail(&transfer[1], &req.message);
ret = spi_sync(dev->spi, &req.message);
if (!ret && req.message.status)
ret = req.message.status;
-
if (ret)
- printk(KERN_ERR "%s: error %i in SPI request\n",
- __FUNCTION__, ret);
+ dev_dbg(&dev->spi->dev, "write_sync --> %d\n", ret);
+
+ return ret;
}
+EXPORT_SYMBOL(tsc210x_write_sync);
-void tsc210x_reads_sync(struct tsc210x_dev *dev,
+int tsc210x_reads_sync(struct tsc210x_dev *dev,
int page, u8 startaddress, u16 *data, int numregs)
{
static struct tsc210x_spi_req req;
static struct spi_transfer transfer[6];
int ret, i, j;
- BUG_ON(numregs + 1 > ARRAY_SIZE(transfer));
+ if (numregs + 1 > ARRAY_SIZE(transfer))
+ return -EINVAL;
spi_message_init(&req.message);
i = 0;
/* Address */
req.command = 0x8000 | (page << 11) | (startaddress << 5);
transfer[i].tx_buf = &req.command;
- transfer[i].rx_buf = 0;
+ transfer[i].rx_buf = NULL;
transfer[i].len = 2;
spi_message_add_tail(&transfer[i ++], &req.message);
/* Data */
while (j < numregs) {
- transfer[i].tx_buf = 0;
+ transfer[i].tx_buf = NULL;
transfer[i].rx_buf = &data[j ++];
transfer[i].len = 2;
transfer[i].cs_change = CS_CHANGE(j == numregs);
ret = spi_sync(dev->spi, &req.message);
if (!ret && req.message.status)
ret = req.message.status;
-
if (ret)
- printk(KERN_ERR "%s: error %i in SPI request\n",
- __FUNCTION__, ret);
+ dev_dbg(&dev->spi->dev, "reads_sync --> %d\n", ret);
+
+ return ret;
}
+EXPORT_SYMBOL(tsc210x_reads_sync);
-uint16_t tsc210x_read_sync(struct tsc210x_dev *dev, int page, uint8_t address)
+int tsc210x_read_sync(struct tsc210x_dev *dev, int page, u8 address)
{
- uint16_t ret;
- tsc210x_reads_sync(dev, page, address, &ret, 1);
- return ret;
+ u16 ret;
+ int status;
+
+ status = tsc210x_reads_sync(dev, page, address, &ret, 1);
+ return status ? : ret;
}
+EXPORT_SYMBOL(tsc210x_read_sync);
+
static void tsc210x_submit_async(struct tsc210x_spi_req *spi)
{
ret = spi_async(spi->dev, &spi->message);
if (ret)
- printk(KERN_ERR "%s: error %i in SPI request\n",
+ dev_dbg(&spi->dev->dev, "%s: error %i in SPI request\n",
__FUNCTION__, ret);
}
static void tsc210x_request_alloc(struct tsc210x_dev *dev,
struct tsc210x_spi_req *spi, int direction,
- int page, u8 startaddress, int numregs, uint16_t *data,
+ int page, u8 startaddress, int numregs, u16 *data,
void (*complete)(struct tsc210x_dev *context),
struct spi_transfer **transfer)
{
spi->command |= 1 << 15;
(*transfer)->tx_buf = &spi->command;
- (*transfer)->rx_buf = 0;
+ (*transfer)->rx_buf = NULL;
(*transfer)->len = 2;
spi_message_add_tail((*transfer) ++, &spi->message);
if (direction == 1)
(*transfer)->tx_buf = &spi->data;
else
- (*transfer)->rx_buf = data ++;
+ (*transfer)->rx_buf = data++;
(*transfer)->len = 2;
(*transfer)->cs_change = CS_CHANGE(numregs != 1);
spi_message_add_tail((*transfer) ++, &spi->message);
#define tsc210x_cb_register_func(cb, cb_t) \
int tsc210x_ ## cb(struct device *dev, cb_t handler, void *context) \
{ \
- struct tsc210x_dev *tsc = (struct tsc210x_dev *) \
- platform_get_drvdata(to_platform_device(dev)); \
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev); \
\
/* Lock the module */ \
if (handler && !tsc->cb) \
if (!try_module_get(THIS_MODULE)) { \
- printk(KERN_INFO "Failed to get TSC module\n"); \
+ dev_err(dev, "Failed to get TSC module\n"); \
} \
if (!handler && tsc->cb) \
module_put(THIS_MODULE); \
tsc->cb = handler; \
tsc->cb ## _ctx = context; \
return 0; \
-}
+} \
+EXPORT_SYMBOL(tsc210x_ ## cb);
tsc210x_cb_register_func(touch_cb, tsc210x_touch_t)
tsc210x_cb_register_func(coords_cb, tsc210x_coords_t)
tsc210x_cb_register_func(temp2_cb, tsc210x_temp_t)
#ifdef DEBUG
-static void tsc210x_print_dav(void)
+static void tsc210x_print_dav(struct tsc210x_dev *dev)
{
- u16 status = tsc210x_read_sync(dev, TSC210X_TS_STATUS_CTRL);
- if (status & 0x0fff)
- printk("TSC210x: data in");
- if (status & 0x0400)
- printk(" X");
- if (status & 0x0200)
- printk(" Y");
- if (status & 0x0100)
- printk(" Z1");
- if (status & 0x0080)
- printk(" Z2");
- if (status & 0x0040)
- printk(" BAT1");
- if (status & 0x0020)
- printk(" BAT2");
- if (status & 0x0010)
- printk(" AUX1");
- if (status & 0x0008)
- printk(" AUX2");
- if (status & 0x0004)
- printk(" TEMP1");
- if (status & 0x0002)
- printk(" TEMP2");
- if (status & 0x0001)
- printk(" KP");
- if (status & 0x0fff)
- printk(".\n");
+ int status = tsc210x_read_sync(dev, TSC210X_TS_STATUS_CTRL);
+
+ if (status < 0) {
+ dev_dbg(&dev->spi->dev, "status %d\n", status);
+ return;
+ }
+
+ if (!(status & 0x0fff))
+ return;
+
+ dev_dbg(&dev->spi->dev, "data in %s%s%s%s%s%s%s%s%s%s%s\n",
+ (status & 0x0400) ? " X" : "",
+ (status & 0x0200) ? " Y" : "",
+ (status & 0x0100) ? " Z1" : "",
+ (status & 0x0080) ? " Z2" : "",
+ (status & 0x0040) ? " BAT1" : "",
+ (status & 0x0020) ? " BAT2" : "",
+ (status & 0x0010) ? " AUX1" : "",
+ (status & 0x0008) ? " AUX2" : "",
+ (status & 0x0004) ? " TEMP1" : "",
+ (status & 0x0002) ? " TEMP2" : "",
+ (status & 0x0001) ? " KP" : "");
}
#endif
{
if (dev->pdata->monitor)
if (!queue_delayed_work(dev->queue,
- &dev->sensor_worker,
- msecs_to_jiffies(settings.mode_msecs)))
- printk(KERN_ERR "%s: can't queue measurements\n",
+ &dev->sensor_worker,
+ msecs_to_jiffies(settings.mode_msecs)))
+ dev_err(&dev->spi->dev,
+ "%s: can't queue measurements\n",
__FUNCTION__);
}
static void tsc210x_queue_penup(struct tsc210x_dev *dev)
{
if (!queue_delayed_work(dev->queue,
- &dev->ts_worker,
- msecs_to_jiffies(settings.ts_msecs)))
- printk(KERN_ERR "%s: can't queue pen-up poll\n",
+ &dev->ts_worker,
+ msecs_to_jiffies(settings.ts_msecs)))
+ dev_err(&dev->spi->dev,
+ "%s: can't queue pen-up poll\n",
__FUNCTION__);
}
tsc210x_submit_async(&dev->req_adc);
}
- if (dev->status & (TSC210X_PS_DAV | TSC210X_T1_DAV |TSC210X_T2_DAV))
+ if (dev->status & (TSC210X_PS_DAV | TSC210X_T1_DAV | TSC210X_T2_DAV))
complete(&dev->data_avail);
}
static void tsc210x_data_report(struct tsc210x_dev *dev)
{
- uint16_t adc_data[4];
+ u16 adc_data[4];
if (dev->status & TSC210X_PS_DAV) {
tsc210x_reads_sync(dev, TSC210X_TS_BAT1, adc_data, 4);
+ /* NOTE: reads_sync() could fail */
dev->bat[0] = adc_data[0];
dev->bat[1] = adc_data[1];
if (dev->status & TSC210X_T1_DAV) {
dev->temp[0] = tsc210x_read_sync(dev, TSC210X_TS_TEMP1);
- if (dev->temp1_cb)
+ if (dev->temp[0] >= 0 && dev->temp1_cb)
dev->temp1_cb(dev->temp1_cb_ctx, dev->temp[0]);
}
if (dev->status & TSC210X_T2_DAV) {
dev->temp[1] = tsc210x_read_sync(dev, TSC210X_TS_TEMP2);
- if (dev->temp2_cb)
+ if (dev->temp[1] >= 0 && dev->temp2_cb)
dev->temp2_cb(dev->temp2_cb_ctx, dev->temp[1]);
}
}
{
struct tsc210x_dev *dev =
container_of(work, struct tsc210x_dev, ts_worker.work);
- uint16_t adc_status;
+ int adc_status;
- BUG_ON(!dev->pendown);
+ WARN_ON(!dev->pendown);
adc_status = tsc210x_read_sync(dev, TSC210X_TS_ADC_CTRL);
+ if (adc_status < 0) {
+ dev_dbg(&dev->spi->dev, "pressure, err %d\n", adc_status);
+ return;
+ }
- if ((adc_status & TSC210X_ADC_PSTCM) ||
- !(adc_status & TSC210X_ADC_ADST)) {
+ if ((adc_status & TSC210X_ADC_PSTCM) != 0
+ || !(adc_status & TSC210X_ADC_ADST))
tsc210x_queue_penup(dev);
- } else {
+ else {
dev->pendown = 0;
if (dev->touch_cb)
dev->touch_cb(dev->touch_cb_ctx, 0);
return IRQ_HANDLED;
}
-#ifdef CONFIG_SOUND
+#if defined(CONFIG_SOUND) || defined(CONFIG_SOUND_MODULE)
+
+/*
+ * FIXME the audio support shouldn't be included in upstream patches
+ * until it's ready. They might be better as utility functions linked
+ * with a chip-specific tsc21xx audio module ... e.g. chips with input
+ * channels need more, as will ones with multiple output channels and
+ * so on. Each of these functions should probably return a fault code,
+ * and will need to be exported so the sound drier can be modular.
+ */
+
/*
* Volume level values should be in the range [0, 127].
* Higher values mean lower volume.
*/
-void tsc210x_set_dac_volume(struct device *dev,
- uint8_t left_ch, uint8_t right_ch)
+void tsc210x_set_dac_volume(struct device *dev, u8 left_ch, u8 right_ch)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- u16 val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
+
if (tsc->kind == tsc2102) {
/* All 0's or all 1's */
if (left_ch == 0x00 || left_ch == 0x7f)
}
val = tsc210x_read_sync(tsc, TSC210X_DAC_GAIN_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
val &= 0x8080; /* Preserve mute-bits */
val |= (left_ch << 8) | right_ch;
tsc210x_write_sync(tsc, TSC210X_DAC_GAIN_CTRL, val);
+ /* NOTE: write_sync() could fail */
}
void tsc210x_set_dac_mute(struct device *dev, int left_ch, int right_ch)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- u16 val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
val = tsc210x_read_sync(tsc, TSC210X_DAC_GAIN_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
val &= 0x7f7f; /* Preserve volume settings */
val |= (left_ch << 15) | (right_ch << 7);
tsc210x_write_sync(tsc, TSC210X_DAC_GAIN_CTRL, val);
+ /* NOTE: write_sync() could fail */
}
void tsc210x_get_dac_mute(struct device *dev, int *left_ch, int *right_ch)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- u16 val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
val = tsc210x_read_sync(tsc, TSC210X_DAC_GAIN_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
*left_ch = !!(val & (1 << 15));
*right_ch = !!(val & (1 << 7));
void tsc210x_set_deemphasis(struct device *dev, int enable)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- u16 val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
+
val = tsc210x_read_sync(tsc, TSC210X_POWER_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
if (enable)
val &= ~TSC210X_DEEMPF;
val |= TSC210X_DEEMPF;
tsc210x_write_sync(tsc, TSC210X_POWER_CTRL, val);
+ /* NOTE: write_sync() could fail */
}
void tsc2102_set_bassboost(struct device *dev, int enable)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- u16 val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
+
val = tsc210x_read_sync(tsc, TSC210X_POWER_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
if (enable)
val &= ~TSC2102_BASSBC;
val |= TSC2102_BASSBC;
tsc210x_write_sync(tsc, TSC210X_POWER_CTRL, val);
+ /* NOTE: write_sync() could fail */
}
/* {rate, dsor, fsref} */
{44100, 0, 1},
{48000, 0, 0},
- {0, 0, 0},
+ {0, 0, 0},
};
/* {rate, dsor, fsref} */
{44100, 0, 1},
{48000, 0, 0},
- {0, 0, 0},
+ {0, 0, 0},
};
int tsc210x_set_rate(struct device *dev, int rate)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
int i;
- uint16_t val;
+ int val;
const struct tsc210x_rate_info_s *rates;
if (tsc->kind == tsc2101)
if (rates[i].sample_rate == rate)
break;
if (rates[i].sample_rate == 0) {
- printk(KERN_ERR "Unknown sampling rate %i.0 Hz\n", rate);
+ dev_err(dev, "Unknown sampling rate %i.0 Hz\n", rate);
return -EINVAL;
}
if (tsc->kind == tsc2101) {
- val = tsc210x_read_sync(tsc, TSC210X_AUDIO1_CTRL) &
- ~((7 << 3) | (7 << 0));
+ val = tsc210x_read_sync(tsc, TSC210X_AUDIO1_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return val;
+ }
+ val &= ~((7 << 3) | (7 << 0));
val |= rates[i].divisor << 3;
val |= rates[i].divisor << 0;
} else
val = rates[i].divisor;
tsc210x_write_sync(tsc, TSC210X_AUDIO1_CTRL, val);
+ /* NOTE: write_sync() could fail */
val = tsc210x_read_sync(tsc, TSC210X_AUDIO3_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return val;
+ }
if (tsc2102_rates[i].fs_44k) {
tsc210x_write_sync(tsc,
*/
void tsc210x_dac_power(struct device *dev, int on)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ /* NOTE: write_sync() could fail */
if (on) {
/* 16-bit words, DSP mode, sample at Fsref */
tsc210x_write_sync(tsc,
void tsc210x_set_i2s_master(struct device *dev, int state)
{
- struct tsc210x_dev *tsc = (struct tsc210x_dev *)
- platform_get_drvdata(to_platform_device(dev));
- uint16_t val;
+ struct tsc210x_dev *tsc = dev_get_drvdata(dev);
+ int val;
val = tsc210x_read_sync(tsc, TSC210X_AUDIO3_CTRL);
+ if (val < 0) {
+ dev_dbg(dev, "%s, err %d\n", __FUNCTION__, val);
+ return;
+ }
+ /* NOTE: write_sync() could fail */
if (state)
tsc210x_write_sync(tsc, TSC210X_AUDIO3_CTRL,
val | TSC210X_SLVMS);
static int tsc210x_configure(struct tsc210x_dev *dev)
{
+ /* NOTE: write_sync() could fail */
+
/* Reset the chip */
tsc210x_write_sync(dev, TSC210X_TS_RESET_CTRL, TSC210X_RESET);
return 0;
}
-/*
- * Retrieves chip revision. Should be always 1.
- */
-int tsc210x_get_revision(struct tsc210x_dev *dev)
-{
- return tsc210x_read_sync(dev, TSC210X_AUDIO3_CTRL) & 7;
-}
-
void tsc210x_keyclick(struct tsc210x_dev *dev,
int amplitude, int freq, int length)
{
- u16 val;
+ int val;
+
val = tsc210x_read_sync(dev, TSC210X_AUDIO2_CTRL);
+ if (val < 0) {
+ dev_dbg(&dev->spi->dev, "%s, err %d\n",
+ __FUNCTION__, val);
+ return;
+ }
val &= 0x800f;
/* Set amplitude */
/* Enable keyclick */
val |= 0x8000;
+ /* NOTE: write_sync() could fail */
tsc210x_write_sync(dev, TSC210X_AUDIO2_CTRL, val);
}
+EXPORT_SYMBOL(tsc210x_keyclick);
#ifdef CONFIG_PM
/*
/* Abort current conversion and power down the ADC */
tsc210x_write_sync(dev, TSC210X_TS_ADC_CTRL, TSC210X_ADC_ADST);
-
- dev->spi->dev.power.power_state = state;
+ /* NOTE: write_sync() could fail */
return 0;
}
if (!dev)
return 0;
- dev->spi->dev.power.power_state = PMSG_ON;
-
spin_lock(&dev->queue_lock);
err = tsc210x_configure(dev);
#define tsc210x_resume NULL
#endif
+/* REVISIT don't make these static */
static struct platform_device tsc210x_ts_device = {
- .name = "tsc210x-ts",
- .id = -1,
+ .name = "tsc210x-ts",
+ .id = -1,
};
static struct platform_device tsc210x_hwmon_device = {
- .name = "tsc210x-hwmon",
- .id = -1,
+ .name = "tsc210x-hwmon",
+ .id = -1,
};
static struct platform_device tsc210x_alsa_device = {
- .name = "tsc210x-alsa",
- .id = -1,
+ .name = "tsc210x-alsa",
+ .id = -1,
};
static int tsc210x_probe(struct spi_device *spi, enum tsc_type type)
struct tsc210x_config *pdata = spi->dev.platform_data;
struct spi_transfer *spi_buffer;
struct tsc210x_dev *dev;
+ int reg;
int err = 0;
if (!pdata) {
- printk(KERN_ERR "TSC210x: Platform data not supplied\n");
+ dev_dbg(&spi->dev, "Platform data not supplied\n");
return -ENOENT;
}
if (!spi->irq) {
- printk(KERN_ERR "TSC210x: Invalid irq value\n");
+ dev_dbg(&spi->dev, "Invalid irq value\n");
return -EINVAL;
}
dev = (struct tsc210x_dev *)
kzalloc(sizeof(struct tsc210x_dev), GFP_KERNEL);
if (!dev) {
- printk(KERN_ERR "TSC210x: No memory\n");
+ dev_dbg(&spi->dev, "No memory\n");
return -ENOMEM;
}
dev->kind = type;
dev->queue = create_singlethread_workqueue(spi->dev.driver->name);
if (!dev->queue) {
- printk(KERN_ERR "TSC210x: Can't make a workqueue\n");
+ dev_dbg(&spi->dev, "Can't make a workqueue\n");
err = -ENOMEM;
goto err_queue;
}
/* Allocate enough struct spi_transfer's for all requests */
spi_buffer = kzalloc(sizeof(struct spi_transfer) * 16, GFP_KERNEL);
if (!spi_buffer) {
- printk(KERN_ERR "TSC210x: No memory for SPI buffers\n");
+ dev_dbg(&spi->dev, "No memory for SPI buffers\n");
err = -ENOMEM;
goto err_buffers;
}
TSC210X_TS_STATUS_CTRL, 1, &dev->status,
tsc210x_status_report, &spi_buffer);
tsc210x_request_alloc(dev, &dev->req_mode, 1,
- TSC210X_TS_ADC_CTRL, 1, 0,
+ TSC210X_TS_ADC_CTRL, 1, NULL,
tsc210x_complete_dummy, &spi_buffer);
tsc210x_request_alloc(dev, &dev->req_stop, 1,
- TSC210X_TS_ADC_CTRL, 1, 0,
+ TSC210X_TS_ADC_CTRL, 1, NULL,
tsc210x_complete_dummy, &spi_buffer);
if (pdata->bclk) {
dev->bclk_ck = clk_get(&spi->dev, pdata->bclk);
if (IS_ERR(dev->bclk_ck)) {
err = PTR_ERR(dev->bclk_ck);
- printk(KERN_ERR "Unable to get '%s': %i\n",
+ dev_dbg(&spi->dev, "Unable to get '%s': %i\n",
pdata->bclk, err);
goto err_clk;
}
/* Setup the communication bus */
dev_set_drvdata(&spi->dev, dev);
- spi->dev.power.power_state = PMSG_ON;
spi->mode = SPI_MODE_1;
spi->bits_per_word = 16;
err = spi_setup(spi);
if (err)
goto err_spi;
- /* Now try to detect the chip, make first contact */
- if (tsc210x_get_revision(dev) != 0x1) {
- printk(KERN_ERR "No TI %s chip found!\n",
- spi->dev.driver->name);
- err = -ENODEV;
+ /* Now try to detect the chip, make first contact. These chips
+ * don't self-identify, but we can expect that the status register
+ * reports the ADC is idle and use that as a sanity check. (It'd
+ * be even better if we did a soft reset first...)
+ */
+ reg = tsc210x_read_sync(dev, TSC210X_TS_ADC_CTRL);
+ if (reg < 0) {
+ err = reg;
+ dev_dbg(&dev->spi->dev, "adc_ctrl, err %d\n", err);
+ goto err_spi;
+ }
+ if (!(reg & (1 << 14))) {
+ err = -EIO;
+ dev_dbg(&dev->spi->dev, "adc_ctrl, busy? - %04x\n", reg);
+ goto err_spi;
+ }
+
+ reg = tsc210x_read_sync(dev, TSC210X_AUDIO3_CTRL);
+ if (reg < 0) {
+ err = reg;
+ dev_dbg(&dev->spi->dev, "revision, err %d\n", err);
goto err_spi;
}
+ dev_info(&spi->dev, "rev %d, irq %d\n", reg & 0x0007, spi->irq);
err = tsc210x_configure(dev);
if (err)
if (request_irq(spi->irq, tsc210x_handler, IRQF_SAMPLE_RANDOM |
IRQF_TRIGGER_FALLING, spi->dev.driver->name,
dev)) {
- printk(KERN_ERR "Could not allocate touchscreen IRQ!\n");
+ dev_dbg(&spi->dev, "Could not allocate touchscreen IRQ!\n");
err = -EINVAL;
goto err_irq;
}
/* Abort current conversion and power down the ADC */
tsc210x_write_sync(dev, TSC210X_TS_ADC_CTRL, TSC210X_ADC_ADST);
+ /* NOTE: write_sync() could fail */
destroy_workqueue(dev->queue);
return err;
}
+module_init(tsc210x_init);
static void __exit tsc210x_exit(void)
{
spi_unregister_driver(&tsc2101_driver);
spi_unregister_driver(&tsc2102_driver);
}
-
-module_init(tsc210x_init);
module_exit(tsc210x_exit);
-EXPORT_SYMBOL(tsc210x_read_sync);
-EXPORT_SYMBOL(tsc210x_reads_sync);
-EXPORT_SYMBOL(tsc210x_write_sync);
-EXPORT_SYMBOL(tsc210x_keyclick);
-
MODULE_AUTHOR("Andrzej Zaborowski");
MODULE_DESCRIPTION("Interface driver for TI TSC210x chips.");
MODULE_LICENSE("GPL");
projects / linux-2.6-omap-h63xx.git / blobdiff