* [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup.
@ 2011-06-29 11:51 Jonathan Cameron
2011-06-29 11:51 ` [PATCH 01/24] staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec Jonathan Cameron
` (24 more replies)
0 siblings, 25 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
This series is intended to remove the last few users of accel.h, gyro.h, magnet.h
and adc.h.
There are a fair few cleanps along the way including some bug fixes.
A few of these drivers are still in 'interesting' condition, but this
is at least a step in the right direction. Taking them further probably
requires test hardware. Note this set is build tested only.
(obviously for simple header removal that's enough, but others could do with
testing if anyone has the hardware).
All comments welcome.
At some point we'll want to do the same for dds, resolver, dac and light.
If anyone else wants to take one of those, feel free. *looks around hopefuly*
This sits on top of
staging:iio:triggers introduce iio_trigger_ops to take const bits out of iio_trig_structure.
+ the dev_data removal patch and the tsl2583 one that Jon is testing.
Thanks all - looking like 3.1 is going to be a cleanup cycle for IIO
rather than anything particularly ground breaking. Of course it's
relatively early days yet!
Thanks,
Jonathan
Jonathan Cameron (24):
staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec.
staging:iio: add quadrature correction to chan info types.
staging:iio:gyro:adxrs450 move to iio_chan_spec registration
staging:iio:gyro:adxrs450 make more use of spi_read and spi_write.
staging:iio:gyro:adxrs450 squish some trivial single call point
wrappers functions.
staging:iio:gyro:adis16080 convert to iio_chan_spec.
staging:iio:gyro:adis16260 remove some unused headers
staging:iio:imu:adis16400 remove unused headers.
staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups.
staging:iio:magnetometer:hmc5843 iio_chan_spec conversion.
staging:iio:magnetometer: remove unused header magnet.h
staging:iio:gyro:adis16130 fix adis16130_spi_read which was never
selecting the channel
staging:iio:gyro:adis16130 drop control of adc resolution.
staging:iio:gyro:adis16130 move to iio_chan_spec registration.
staging:iio:gyro:adis16060 convert to iio_chan_spec
staging:iio:gyro: remove gyro.h
staging:iio:accel: usused header removals.
staging:iio:inclinometer.h remove as now unused.
staging:iio:adc: unused header removals.
staging:iio:various header includes that should never have been.
staging:iio:accel:adis16204: use peak_raw info_mask element + push
some defs down from header.
staging:iio:accel:adis16220 iio_chan_spec conversion.
staging:iio:accel remove unused accel.h header.
staging:iio:adc remove unused adc.h.
drivers/staging/iio/accel/accel.h | 87 -------
drivers/staging/iio/accel/adis16201_core.c | 4 -
drivers/staging/iio/accel/adis16201_ring.c | 1 -
drivers/staging/iio/accel/adis16203_core.c | 3 -
drivers/staging/iio/accel/adis16203_ring.c | 1 -
drivers/staging/iio/accel/adis16204_core.c | 47 +++--
drivers/staging/iio/accel/adis16204_ring.c | 1 -
drivers/staging/iio/accel/adis16209_core.c | 3 -
drivers/staging/iio/accel/adis16209_ring.c | 1 -
drivers/staging/iio/accel/adis16220_core.c | 340 +++++++++++++++++-----------
drivers/staging/iio/accel/adis16240_core.c | 2 -
drivers/staging/iio/accel/adis16240_ring.c | 1 -
drivers/staging/iio/accel/inclinometer.h | 25 --
drivers/staging/iio/accel/kxsd9.c | 267 +++++++++-------------
drivers/staging/iio/accel/lis3l02dq_core.c | 2 -
drivers/staging/iio/accel/lis3l02dq_ring.c | 1 -
drivers/staging/iio/accel/sca3000_core.c | 1 -
drivers/staging/iio/accel/sca3000_ring.c | 1 -
drivers/staging/iio/adc/ad7298_core.c | 1 -
drivers/staging/iio/adc/ad7476_core.c | 1 -
drivers/staging/iio/adc/ad7606_core.c | 1 -
drivers/staging/iio/adc/ad7780.c | 1 -
drivers/staging/iio/adc/ad7793.c | 1 -
drivers/staging/iio/adc/ad7887_core.c | 2 +-
drivers/staging/iio/adc/ad799x_core.c | 13 +-
drivers/staging/iio/adc/adc.h | 42 ----
drivers/staging/iio/adc/max1363_core.c | 23 ++-
drivers/staging/iio/gyro/adis16060_core.c | 113 +++++-----
drivers/staging/iio/gyro/adis16080_core.c | 91 ++++----
drivers/staging/iio/gyro/adis16130_core.c | 143 ++++---------
drivers/staging/iio/gyro/adis16260_core.c | 2 -
drivers/staging/iio/gyro/adis16260_ring.c | 1 -
drivers/staging/iio/gyro/adxrs450_core.c | 251 +++++++++------------
drivers/staging/iio/gyro/gyro.h | 85 -------
drivers/staging/iio/iio.h | 3 +
drivers/staging/iio/imu/adis16400_core.c | 5 -
drivers/staging/iio/imu/adis16400_ring.c | 1 -
drivers/staging/iio/industrialio-core.c | 2 +
drivers/staging/iio/magnetometer/ak8975.c | 213 +++++++++---------
drivers/staging/iio/magnetometer/hmc5843.c | 95 ++++----
drivers/staging/iio/magnetometer/magnet.h | 31 ---
drivers/staging/iio/meter/ade7758_ring.c | 1 -
42 files changed, 782 insertions(+), 1128 deletions(-)
delete mode 100644 drivers/staging/iio/accel/accel.h
delete mode 100644 drivers/staging/iio/accel/inclinometer.h
delete mode 100644 drivers/staging/iio/adc/adc.h
delete mode 100644 drivers/staging/iio/gyro/gyro.h
delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
--
1.7.3.4
^ permalink raw reply [flat|nested] 27+ messages in thread
* [PATCH 01/24] staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 02/24] staging:iio: add quadrature correction to chan info types Jonathan Cameron
` (23 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Lots of minor bits and pieces.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/kxsd9.c | 267 ++++++++++++++----------------------
1 files changed, 104 insertions(+), 163 deletions(-)
diff --git a/drivers/staging/iio/accel/kxsd9.c b/drivers/staging/iio/accel/kxsd9.c
index c8a358a..af38dd9 100644
--- a/drivers/staging/iio/accel/kxsd9.c
+++ b/drivers/staging/iio/accel/kxsd9.c
@@ -24,8 +24,6 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../adc/adc.h"
-#include "accel.h"
#define KXSD9_REG_X 0x00
#define KXSD9_REG_Y 0x02
@@ -34,10 +32,6 @@
#define KXSD9_REG_RESET 0x0a
#define KXSD9_REG_CTRL_C 0x0c
-#define KXSD9_FS_8 0x00
-#define KXSD9_FS_6 0x01
-#define KXSD9_FS_4 0x02
-#define KXSD9_FS_2 0x03
#define KXSD9_FS_MASK 0x03
#define KXSD9_REG_CTRL_B 0x0d
@@ -46,13 +40,8 @@
#define KXSD9_READ(a) (0x80 | (a))
#define KXSD9_WRITE(a) (a)
-#define KXSD9_SCALE_2G "0.011978"
-#define KXSD9_SCALE_4G "0.023927"
-#define KXSD9_SCALE_6G "0.035934"
-#define KXSD9_SCALE_8G "0.047853"
-
#define KXSD9_STATE_RX_SIZE 2
-#define KXSD9_STATE_TX_SIZE 4
+#define KXSD9_STATE_TX_SIZE 2
/**
* struct kxsd9_state - device related storage
* @buf_lock: protect the rx and tx buffers.
@@ -67,170 +56,70 @@ struct kxsd9_state {
u8 tx[KXSD9_STATE_TX_SIZE];
};
-/* This may want to move to mili g to allow for non integer ranges */
-static ssize_t kxsd9_read_scale(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- int ret;
- ssize_t len = 0;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- struct kxsd9_state *st = iio_priv(indio_dev);
- struct spi_transfer xfer = {
- .bits_per_word = 8,
- .len = 2,
- .cs_change = 1,
- .tx_buf = st->tx,
- .rx_buf = st->rx,
- };
- struct spi_message msg;
-
- mutex_lock(&st->buf_lock);
- st->tx[0] = KXSD9_READ(KXSD9_REG_CTRL_C);
- st->tx[1] = 0;
- spi_message_init(&msg);
- spi_message_add_tail(&xfer, &msg);
- ret = spi_sync(st->us, &msg);
- if (ret)
- goto error_ret;
-
- switch (st->rx[1] & KXSD9_FS_MASK) {
- case KXSD9_FS_8:
- len += sprintf(buf, "%s\n", KXSD9_SCALE_8G);
- break;
- case KXSD9_FS_6:
- len += sprintf(buf, "%s\n", KXSD9_SCALE_6G);
- break;
- case KXSD9_FS_4:
- len += sprintf(buf, "%s\n", KXSD9_SCALE_4G);
- break;
- case KXSD9_FS_2:
- len += sprintf(buf, "%s\n", KXSD9_SCALE_2G);
- break;
- }
+#define KXSD9_SCALE_2G "0.011978"
+#define KXSD9_SCALE_4G "0.023927"
+#define KXSD9_SCALE_6G "0.035934"
+#define KXSD9_SCALE_8G "0.047853"
-error_ret:
- mutex_unlock(&st->buf_lock);
+/* reverse order */
+static const int kxsd9_micro_scales[4] = { 47853, 35934, 23927, 11978 };
- return ret ? ret : len;
-}
-static ssize_t kxsd9_write_scale(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
+static int kxsd9_write_scale(struct iio_dev *indio_dev, int micro)
{
-
- struct spi_message msg;
- int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ int ret, i;
struct kxsd9_state *st = iio_priv(indio_dev);
- u8 val;
- struct spi_transfer xfers[] = {
- {
- .bits_per_word = 8,
- .len = 2,
- .cs_change = 1,
- .tx_buf = st->tx,
- .rx_buf = st->rx,
- }, {
- .bits_per_word = 8,
- .len = 2,
- .cs_change = 1,
- .tx_buf = st->tx,
- },
- };
-
- if (!strncmp(buf, KXSD9_SCALE_8G,
- strlen(buf) < strlen(KXSD9_SCALE_8G)
- ? strlen(buf) : strlen(KXSD9_SCALE_8G)))
- val = KXSD9_FS_8;
- else if (!strncmp(buf, KXSD9_SCALE_6G,
- strlen(buf) < strlen(KXSD9_SCALE_6G)
- ? strlen(buf) : strlen(KXSD9_SCALE_6G)))
- val = KXSD9_FS_6;
- else if (!strncmp(buf, KXSD9_SCALE_4G,
- strlen(buf) < strlen(KXSD9_SCALE_4G)
- ? strlen(buf) : strlen(KXSD9_SCALE_4G)))
- val = KXSD9_FS_4;
- else if (!strncmp(buf, KXSD9_SCALE_2G,
- strlen(buf) < strlen(KXSD9_SCALE_2G)
- ? strlen(buf) : strlen(KXSD9_SCALE_2G)))
- val = KXSD9_FS_2;
- else
+ bool foundit = false;
+
+ for (i = 0; i < 4; i++)
+ if (micro == kxsd9_micro_scales[i]) {
+ foundit = true;
+ break;
+ }
+ if (!foundit)
return -EINVAL;
mutex_lock(&st->buf_lock);
- st->tx[0] = KXSD9_READ(KXSD9_REG_CTRL_C);
- st->tx[1] = 0;
- spi_message_init(&msg);
- spi_message_add_tail(&xfers[0], &msg);
- ret = spi_sync(st->us, &msg);
+ ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
if (ret)
goto error_ret;
st->tx[0] = KXSD9_WRITE(KXSD9_REG_CTRL_C);
- st->tx[1] = (st->rx[1] & ~KXSD9_FS_MASK) | val;
+ st->tx[1] = (ret & ~KXSD9_FS_MASK) | i;
- spi_message_init(&msg);
- spi_message_add_tail(&xfers[1], &msg);
- ret = spi_sync(st->us, &msg);
+ ret = spi_write(st->us, st->tx, 2);
error_ret:
mutex_unlock(&st->buf_lock);
- return ret ? ret : len;
+ return ret;
}
-static ssize_t kxsd9_read_accel(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int kxsd9_read(struct iio_dev *indio_dev, u8 address)
{
struct spi_message msg;
int ret;
- ssize_t len = 0;
- u16 val;
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct kxsd9_state *st = iio_priv(indio_dev);
struct spi_transfer xfers[] = {
{
.bits_per_word = 8,
.len = 1,
- .cs_change = 0,
.delay_usecs = 200,
.tx_buf = st->tx,
}, {
.bits_per_word = 8,
.len = 2,
- .cs_change = 1,
.rx_buf = st->rx,
},
};
mutex_lock(&st->buf_lock);
- st->tx[0] = KXSD9_READ(this_attr->address);
+ st->tx[0] = KXSD9_READ(address);
spi_message_init(&msg);
spi_message_add_tail(&xfers[0], &msg);
spi_message_add_tail(&xfers[1], &msg);
ret = spi_sync(st->us, &msg);
if (ret)
- goto error_ret;
- val = (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
- len = sprintf(buf, "%d\n", val);
-error_ret:
- mutex_unlock(&st->buf_lock);
-
- return ret ? ret : len;
+ return ret;
+ return (((u16)(st->rx[0])) << 8) | (st->rx[1] & 0xF0);
}
-static IIO_DEV_ATTR_ACCEL_X(kxsd9_read_accel, KXSD9_REG_X);
-static IIO_DEV_ATTR_ACCEL_Y(kxsd9_read_accel, KXSD9_REG_Y);
-static IIO_DEV_ATTR_ACCEL_Z(kxsd9_read_accel, KXSD9_REG_Z);
-static IIO_DEV_ATTR_IN_RAW(0, kxsd9_read_accel, KXSD9_REG_AUX);
-
-static IIO_DEVICE_ATTR(accel_scale,
- S_IRUGO | S_IWUSR,
- kxsd9_read_scale,
- kxsd9_write_scale,
- 0);
-
static IIO_CONST_ATTR(accel_scale_available,
KXSD9_SCALE_2G " "
KXSD9_SCALE_4G " "
@@ -238,48 +127,94 @@ static IIO_CONST_ATTR(accel_scale_available,
KXSD9_SCALE_8G);
static struct attribute *kxsd9_attributes[] = {
- &iio_dev_attr_accel_x_raw.dev_attr.attr,
- &iio_dev_attr_accel_y_raw.dev_attr.attr,
- &iio_dev_attr_accel_z_raw.dev_attr.attr,
- &iio_dev_attr_in0_raw.dev_attr.attr,
- &iio_dev_attr_accel_scale.dev_attr.attr,
&iio_const_attr_accel_scale_available.dev_attr.attr,
NULL,
};
+static int kxsd9_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ int ret = -EINVAL;
+
+ if (mask == (1 << IIO_CHAN_INFO_SCALE_SHARED)) {
+ /* Check no integer component */
+ if (val)
+ return -EINVAL;
+ ret = kxsd9_write_scale(indio_dev, val2);
+ }
+
+ return ret;
+}
+
+static int kxsd9_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2, long mask)
+{
+ int ret = -EINVAL;
+ struct kxsd9_state *st = iio_priv(indio_dev);
+
+ switch (mask) {
+ case 0:
+ ret = kxsd9_read(indio_dev, chan->address);
+ if (ret < 0)
+ goto error_ret;
+ *val = ret;
+ break;
+ case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+ ret = spi_w8r8(st->us, KXSD9_READ(KXSD9_REG_CTRL_C));
+ if (ret)
+ goto error_ret;
+ *val2 = kxsd9_micro_scales[ret & KXSD9_FS_MASK];
+ ret = IIO_VAL_INT_PLUS_MICRO;
+ break;
+ };
+
+error_ret:
+ return ret;
+};
+#define KXSD9_ACCEL_CHAN(axis) \
+ { \
+ .type = IIO_ACCEL, \
+ .modified = 1, \
+ .channel2 = IIO_MOD_##axis, \
+ .info_mask = 1 << IIO_CHAN_INFO_SCALE_SHARED, \
+ .address = KXSD9_REG_##axis, \
+ }
+
+static struct iio_chan_spec kxsd9_channels[] = {
+ KXSD9_ACCEL_CHAN(X), KXSD9_ACCEL_CHAN(Y), KXSD9_ACCEL_CHAN(Z),
+ {
+ .type = IIO_IN,
+ .indexed = 1,
+ .address = KXSD9_REG_AUX,
+ }
+};
+
static const struct attribute_group kxsd9_attribute_group = {
.attrs = kxsd9_attributes,
};
static int __devinit kxsd9_power_up(struct kxsd9_state *st)
{
- struct spi_transfer xfers[2] = {
- {
- .bits_per_word = 8,
- .len = 2,
- .cs_change = 1,
- .tx_buf = st->tx,
- }, {
- .bits_per_word = 8,
- .len = 2,
- .cs_change = 1,
- .tx_buf = st->tx + 2,
- },
- };
- struct spi_message msg;
+ int ret;
+
st->tx[0] = 0x0d;
st->tx[1] = 0x40;
- st->tx[2] = 0x0c;
- st->tx[3] = 0x9b;
-
- spi_message_init(&msg);
- spi_message_add_tail(&xfers[0], &msg);
- spi_message_add_tail(&xfers[1], &msg);
+ ret = spi_write(st->us, st->tx, 2);
+ if (ret)
+ return ret;
- return spi_sync(st->us, &msg);
+ st->tx[0] = 0x0c;
+ st->tx[1] = 0x9b;
+ return spi_write(st->us, st->tx, 2);
};
static const struct iio_info kxsd9_info = {
+ .read_raw = &kxsd9_read_raw,
+ .write_raw = &kxsd9_write_raw,
.attrs = &kxsd9_attribute_group,
.driver_module = THIS_MODULE,
};
@@ -300,7 +235,8 @@ static int __devinit kxsd9_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
-
+ indio_dev->channels = kxsd9_channels;
+ indio_dev->name = spi_get_device_id(spi)->name;
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &kxsd9_info;
indio_dev->modes = INDIO_DIRECT_MODE;
@@ -328,6 +264,10 @@ static int __devexit kxsd9_remove(struct spi_device *spi)
return 0;
}
+static const struct spi_device_id kxsd9_id[] = {
+ {"kxsd9", 0}
+};
+
static struct spi_driver kxsd9_driver = {
.driver = {
.name = "kxsd9",
@@ -335,6 +275,7 @@ static struct spi_driver kxsd9_driver = {
},
.probe = kxsd9_probe,
.remove = __devexit_p(kxsd9_remove),
+ .id_table = kxsd9_id,
};
static __init int kxsd9_spi_init(void)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 02/24] staging:iio: add quadrature correction to chan info types.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
2011-06-29 11:51 ` [PATCH 01/24] staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 03/24] staging:iio:gyro:adxrs450 move to iio_chan_spec registration Jonathan Cameron
` (22 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/iio.h | 3 +++
drivers/staging/iio/industrialio-core.c | 2 ++
2 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/staging/iio/iio.h b/drivers/staging/iio/iio.h
index bc7bc9d..2a8c8e2 100644
--- a/drivers/staging/iio/iio.h
+++ b/drivers/staging/iio/iio.h
@@ -1,3 +1,4 @@
+
/* The industrial I/O core
*
* Copyright (c) 2008 Jonathan Cameron
@@ -75,6 +76,8 @@ enum iio_chan_info_enum {
IIO_CHAN_INFO_PEAK_SEPARATE,
IIO_CHAN_INFO_PEAK_SCALE_SHARED,
IIO_CHAN_INFO_PEAK_SCALE_SEPARATE,
+ IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED,
+ IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE,
};
/**
diff --git a/drivers/staging/iio/industrialio-core.c b/drivers/staging/iio/industrialio-core.c
index 8fa2be6..ae490e5 100644
--- a/drivers/staging/iio/industrialio-core.c
+++ b/drivers/staging/iio/industrialio-core.c
@@ -84,6 +84,8 @@ static const char * const iio_chan_info_postfix[] = {
[IIO_CHAN_INFO_CALIBBIAS_SHARED/2] = "calibbias",
[IIO_CHAN_INFO_PEAK_SHARED/2] = "peak_raw",
[IIO_CHAN_INFO_PEAK_SCALE_SHARED/2] = "peak_scale",
+ [IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SHARED/2]
+ = "quadrature_correction_raw",
};
int iio_push_event(struct iio_dev *dev_info,
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 03/24] staging:iio:gyro:adxrs450 move to iio_chan_spec registration
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
2011-06-29 11:51 ` [PATCH 01/24] staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec Jonathan Cameron
2011-06-29 11:51 ` [PATCH 02/24] staging:iio: add quadrature correction to chan info types Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write Jonathan Cameron
` (21 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adxrs450_core.c | 173 ++++++++++++++++++------------
1 files changed, 102 insertions(+), 71 deletions(-)
diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
index 7502a26..a756262 100644
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@ -20,7 +20,6 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "gyro.h"
#include "../adc/adc.h"
#include "adxrs450.h"
@@ -32,12 +31,11 @@
* Second register's address is reg_address + 1.
* @val: somewhere to pass back the value read
**/
-static int adxrs450_spi_read_reg_16(struct device *dev,
- u8 reg_address,
- u16 *val)
+static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
+ u8 reg_address,
+ u16 *val)
{
struct spi_message msg;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
struct spi_transfer xfers[] = {
@@ -86,12 +84,11 @@ error_ret:
* Second register's address is reg_address + 1.
* @val: value to be written.
**/
-static int adxrs450_spi_write_reg_16(struct device *dev,
- u8 reg_address,
- u16 val)
+static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
+ u8 reg_address,
+ u16 val)
{
struct spi_message msg;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
struct spi_transfer xfers = {
@@ -126,10 +123,9 @@ static int adxrs450_spi_write_reg_16(struct device *dev,
* @dev: device associated with child of actual iio_dev
* @val: somewhere to pass back the value read
**/
-static int adxrs450_spi_sensor_data(struct device *dev, s16 *val)
+static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
{
struct spi_message msg;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
struct spi_transfer xfers[] = {
@@ -206,64 +202,39 @@ error_ret:
return ret;
}
-static ssize_t adxrs450_read_temp(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adxrs450_read_temp(struct iio_dev *indio_dev, int *val)
{
int ret;
u16 t;
- ret = adxrs450_spi_read_reg_16(dev,
- ADXRS450_TEMP1,
- &t);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_TEMP1, &t);
if (ret)
return ret;
- return sprintf(buf, "%d\n", t >> 7);
+ *val = t;
+ return 0;
}
-static ssize_t adxrs450_read_quad(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adxrs450_read_quad(struct iio_dev *indio_dev, int *val)
{
int ret;
s16 t;
- ret = adxrs450_spi_read_reg_16(dev,
- ADXRS450_QUAD1,
- &t);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_QUAD1, &t);
if (ret)
return ret;
- return sprintf(buf, "%d\n", t);
-}
-
-static ssize_t adxrs450_write_dnc(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
-{
- int ret;
- long val;
-
- ret = strict_strtol(buf, 10, &val);
- if (ret)
- goto error_ret;
- ret = adxrs450_spi_write_reg_16(dev,
- ADXRS450_DNC1,
- val & 0x3FF);
-error_ret:
- return ret ? ret : len;
+ *val = t;
+ return 0;
}
-static ssize_t adxrs450_read_sensor_data(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adxrs450_read_sensor_data(struct iio_dev *indio_dev, int *val)
{
int ret;
s16 t;
- ret = adxrs450_spi_sensor_data(dev, &t);
+ ret = adxrs450_spi_sensor_data(indio_dev, &t);
if (ret)
return ret;
- return sprintf(buf, "%d\n", t);
+ *val = t;
+ return 0;
}
/* Recommended Startup Sequence by spec */
@@ -272,7 +243,6 @@ static int adxrs450_initial_setup(struct iio_dev *indio_dev)
u32 t;
u16 data;
int ret;
- struct device *dev = &indio_dev->dev;
struct adxrs450_state *st = iio_priv(indio_dev);
msleep(ADXRS450_STARTUP_DELAY*2);
@@ -305,23 +275,23 @@ static int adxrs450_initial_setup(struct iio_dev *indio_dev)
return -EIO;
}
- ret = adxrs450_spi_read_reg_16(dev, ADXRS450_FAULT1, &data);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_FAULT1, &data);
if (ret)
return ret;
if (data & 0x0fff) {
dev_err(&st->us->dev, "The device is not in normal status!\n");
return -EINVAL;
}
- ret = adxrs450_spi_read_reg_16(dev, ADXRS450_PID1, &data);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_PID1, &data);
if (ret)
return ret;
dev_info(&st->us->dev, "The Part ID is 0x%x\n", data);
- ret = adxrs450_spi_read_reg_16(dev, ADXRS450_SNL, &data);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_SNL, &data);
if (ret)
return ret;
t = data;
- ret = adxrs450_spi_read_reg_16(dev, ADXRS450_SNH, &data);
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_SNH, &data);
if (ret)
return ret;
t |= data << 16;
@@ -330,29 +300,88 @@ static int adxrs450_initial_setup(struct iio_dev *indio_dev)
return 0;
}
-static IIO_DEV_ATTR_GYRO_Z(adxrs450_read_sensor_data, 0);
-static IIO_DEV_ATTR_TEMP_RAW(adxrs450_read_temp);
-static IIO_DEV_ATTR_GYRO_Z_QUADRATURE_CORRECTION(adxrs450_read_quad, 0);
-static IIO_DEV_ATTR_GYRO_Z_CALIBBIAS(S_IWUSR,
- NULL, adxrs450_write_dnc, 0);
-static IIO_CONST_ATTR(name, "adxrs450");
-
-static struct attribute *adxrs450_attributes[] = {
- &iio_dev_attr_gyro_z_raw.dev_attr.attr,
- &iio_dev_attr_temp_raw.dev_attr.attr,
- &iio_dev_attr_gyro_z_quadrature_correction_raw.dev_attr.attr,
- &iio_dev_attr_gyro_z_calibbias.dev_attr.attr,
- &iio_const_attr_name.dev_attr.attr,
- NULL
-};
+static int adxrs450_write_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int val,
+ int val2,
+ long mask)
+{
+ int ret;
+ switch (mask) {
+ case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
+ ret = adxrs450_spi_write_reg_16(indio_dev,
+ ADXRS450_DNC1,
+ val & 0x3FF);
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+static int adxrs450_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val,
+ int *val2,
+ long mask)
+{
+ int ret;
+ switch (mask) {
+ case 0:
+ switch (chan->type) {
+ case IIO_GYRO:
+ ret = adxrs450_read_sensor_data(indio_dev, val);
+ if (ret < 0)
+ break;
+ *val = ret;
+ ret = IIO_VAL_INT;
+ break;
+ case IIO_TEMP:
+ ret = adxrs450_read_temp(indio_dev, val);
+ if (ret < 0)
+ break;
+ *val = ret;
+ ret = IIO_VAL_INT;
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+ break;
+ case (1 << IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE):
+ ret = adxrs450_read_quad(indio_dev, val);
+ if (ret < 0)
+ break;
+ *val = ret;
+ ret = IIO_VAL_INT;
+ break;
+ default:
+ ret = -EINVAL;
+ break;
+ }
+
+ return ret;
+}
-static const struct attribute_group adxrs450_attribute_group = {
- .attrs = adxrs450_attributes,
+static const struct iio_chan_spec adxrs450_channels[] = {
+ {
+ .type = IIO_GYRO,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
+ (1 << IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE)
+ }, {
+ .type = IIO_TEMP,
+ .indexed = 1,
+ .channel = 0,
+ }
};
static const struct iio_info adxrs450_info = {
- .attrs = &adxrs450_attribute_group,
.driver_module = THIS_MODULE,
+ .read_raw = &adxrs450_read_raw,
+ .write_raw = &adxrs450_write_raw,
};
static int __devinit adxrs450_probe(struct spi_device *spi)
@@ -376,6 +405,8 @@ static int __devinit adxrs450_probe(struct spi_device *spi)
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adxrs450_info;
indio_dev->modes = INDIO_DIRECT_MODE;
+ indio_dev->channels = adxrs450_channels;
+ indio_dev->name = spi->dev.driver->name;
ret = iio_device_register(indio_dev);
if (ret)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (2 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 03/24] staging:iio:gyro:adxrs450 move to iio_chan_spec registration Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-30 14:10 ` [Device-drivers-devel] " Michael Hennerich
2011-06-29 11:51 ` [PATCH 05/24] staging:iio:gyro:adxrs450 squish some trivial single call point wrappers functions Jonathan Cameron
` (20 subsequent siblings)
24 siblings, 1 reply; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
This needs confirmation that the devices is happy if another part is
talked to in between the request for a register and the read back.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adxrs450_core.c | 63 ++++++++----------------------
1 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
index a756262..2d2916c 100644
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@ -35,21 +35,8 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
u8 reg_address,
u16 *val)
{
- struct spi_message msg;
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
- struct spi_transfer xfers[] = {
- {
- .tx_buf = st->tx,
- .bits_per_word = 8,
- .len = 4,
- .cs_change = 1,
- }, {
- .rx_buf = st->rx,
- .bits_per_word = 8,
- .len = 4,
- },
- };
mutex_lock(&st->buf_lock);
st->tx[0] = ADXRS450_READ_DATA | (reg_address >> 7);
@@ -60,10 +47,13 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
if (!(hweight32(be32_to_cpu(*(u32 *)st->tx)) & 1))
st->tx[3] |= ADXRS450_P;
- spi_message_init(&msg);
- spi_message_add_tail(&xfers[0], &msg);
- spi_message_add_tail(&xfers[1], &msg);
- ret = spi_sync(st->us, &msg);
+ ret = spi_write(st->us, st->tx, 4);
+ if (ret) {
+ dev_err(&st->us->dev, "problem while reading 16 bit register 0x%02x\n",
+ reg_address);
+ goto error_ret;
+ }
+ ret = spi_read(st->us, st->rx, 4);
if (ret) {
dev_err(&st->us->dev, "problem while reading 16 bit register 0x%02x\n",
reg_address);
@@ -88,15 +78,8 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
u8 reg_address,
u16 val)
{
- struct spi_message msg;
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
- struct spi_transfer xfers = {
- .tx_buf = st->tx,
- .rx_buf = st->rx,
- .bits_per_word = 8,
- .len = 4,
- };
mutex_lock(&st->buf_lock);
st->tx[0] = ADXRS450_WRITE_DATA | reg_address >> 7;
@@ -105,14 +88,12 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
st->tx[3] = val << 1;
if (!(hweight32(be32_to_cpu(*(u32 *)st->tx)) & 1))
- st->tx[3] |= ADXRS450_P;
+ st->tx[3] |= ADXRS450_P;
- spi_message_init(&msg);
- spi_message_add_tail(&xfers, &msg);
- ret = spi_sync(st->us, &msg);
+ ret = spi_write(st->us, st->tx, 4);
if (ret)
dev_err(&st->us->dev, "problem while writing 16 bit register 0x%02x\n",
- reg_address);
+ reg_address);
msleep(1); /* enforce sequential transfer delay 0.1ms */
mutex_unlock(&st->buf_lock);
return ret;
@@ -125,21 +106,8 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
**/
static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
{
- struct spi_message msg;
struct adxrs450_state *st = iio_priv(indio_dev);
int ret;
- struct spi_transfer xfers[] = {
- {
- .tx_buf = st->tx,
- .bits_per_word = 8,
- .len = 4,
- .cs_change = 1,
- }, {
- .rx_buf = st->rx,
- .bits_per_word = 8,
- .len = 4,
- },
- };
mutex_lock(&st->buf_lock);
st->tx[0] = ADXRS450_SENSOR_DATA;
@@ -147,10 +115,13 @@ static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
st->tx[2] = 0;
st->tx[3] = 0;
- spi_message_init(&msg);
- spi_message_add_tail(&xfers[0], &msg);
- spi_message_add_tail(&xfers[1], &msg);
- ret = spi_sync(st->us, &msg);
+ ret = spi_write(st->us, st->tx, 4);
+ if (ret) {
+ dev_err(&st->us->dev, "Problem while reading sensor data\n");
+ goto error_ret;
+ }
+
+ ret = spi_read(st->us, st->rx, 4);
if (ret) {
dev_err(&st->us->dev, "Problem while reading sensor data\n");
goto error_ret;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 05/24] staging:iio:gyro:adxrs450 squish some trivial single call point wrappers functions.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (3 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 06/24] staging:iio:gyro:adis16080 convert to iio_chan_spec Jonathan Cameron
` (19 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adxrs450_core.c | 57 ++++++-----------------------
1 files changed, 12 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
index 2d2916c..89a0076 100644
--- a/drivers/staging/iio/gyro/adxrs450_core.c
+++ b/drivers/staging/iio/gyro/adxrs450_core.c
@@ -20,7 +20,6 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "../adc/adc.h"
#include "adxrs450.h"
@@ -173,41 +172,6 @@ error_ret:
return ret;
}
-static int adxrs450_read_temp(struct iio_dev *indio_dev, int *val)
-{
- int ret;
- u16 t;
- ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_TEMP1, &t);
- if (ret)
- return ret;
- *val = t;
- return 0;
-}
-
-static int adxrs450_read_quad(struct iio_dev *indio_dev, int *val)
-{
- int ret;
- s16 t;
- ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_QUAD1, &t);
- if (ret)
- return ret;
- *val = t;
- return 0;
-}
-
-static int adxrs450_read_sensor_data(struct iio_dev *indio_dev, int *val)
-{
- int ret;
- s16 t;
-
- ret = adxrs450_spi_sensor_data(indio_dev, &t);
- if (ret)
- return ret;
-
- *val = t;
- return 0;
-}
-
/* Recommended Startup Sequence by spec */
static int adxrs450_initial_setup(struct iio_dev *indio_dev)
{
@@ -298,21 +262,24 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
long mask)
{
int ret;
+ s16 t;
+ u16 ut;
switch (mask) {
case 0:
switch (chan->type) {
case IIO_GYRO:
- ret = adxrs450_read_sensor_data(indio_dev, val);
- if (ret < 0)
+ ret = adxrs450_spi_sensor_data(indio_dev, &t);
+ if (ret)
break;
- *val = ret;
+ *val = t;
ret = IIO_VAL_INT;
break;
case IIO_TEMP:
- ret = adxrs450_read_temp(indio_dev, val);
- if (ret < 0)
+ ret = adxrs450_spi_read_reg_16(indio_dev,
+ ADXRS450_TEMP1, &ut);
+ if (ret)
break;
- *val = ret;
+ *val = t;
ret = IIO_VAL_INT;
break;
default:
@@ -321,10 +288,10 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
}
break;
case (1 << IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE):
- ret = adxrs450_read_quad(indio_dev, val);
- if (ret < 0)
+ ret = adxrs450_spi_read_reg_16(indio_dev, ADXRS450_QUAD1, &t);
+ if (ret)
break;
- *val = ret;
+ *val = t;
ret = IIO_VAL_INT;
break;
default:
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 06/24] staging:iio:gyro:adis16080 convert to iio_chan_spec.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (4 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 05/24] staging:iio:gyro:adxrs450 squish some trivial single call point wrappers functions Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 07/24] staging:iio:gyro:adis16260 remove some unused headers Jonathan Cameron
` (18 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
This is a rare driver that is so simple it actually gets longer
as a result of this conversion. Oh well, swings and roundabouts.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16080_core.c | 91 ++++++++++++++++-------------
1 files changed, 50 insertions(+), 41 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16080_core.c b/drivers/staging/iio/gyro/adis16080_core.c
index ad2db4d..7f9a346 100644
--- a/drivers/staging/iio/gyro/adis16080_core.c
+++ b/drivers/staging/iio/gyro/adis16080_core.c
@@ -16,8 +16,6 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "gyro.h"
-#include "../adc/adc.h"
#define ADIS16080_DIN_GYRO (0 << 10) /* Gyroscope output */
#define ADIS16080_DIN_TEMP (1 << 10) /* Temperature output */
@@ -44,11 +42,10 @@ struct adis16080_state {
u8 buf[2] ____cacheline_aligned;
};
-static int adis16080_spi_write(struct device *dev,
+static int adis16080_spi_write(struct iio_dev *indio_dev,
u16 val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16080_state *st = iio_priv(indio_dev);
mutex_lock(&st->buf_lock);
@@ -61,11 +58,10 @@ static int adis16080_spi_write(struct device *dev,
return ret;
}
-static int adis16080_spi_read(struct device *dev,
- u16 *val)
+static int adis16080_spi_read(struct iio_dev *indio_dev,
+ u16 *val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16080_state *st = iio_priv(indio_dev);
mutex_lock(&st->buf_lock);
@@ -79,50 +75,62 @@ static int adis16080_spi_read(struct device *dev,
return ret;
}
-static ssize_t adis16080_read(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adis16080_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val,
+ int *val2,
+ long mask)
{
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- u16 val = 0;
- ssize_t ret;
-
+ int ret = -EINVAL;
+ u16 ut;
/* Take the iio_dev status lock */
+
mutex_lock(&indio_dev->mlock);
- ret = adis16080_spi_write(dev,
- this_attr->address | ADIS16080_DIN_WRITE);
- if (ret < 0)
- goto error_ret;
- ret = adis16080_spi_read(dev, &val);
-error_ret:
+ switch (mask) {
+ case 0:
+ ret = adis16080_spi_write(indio_dev,
+ chan->address |
+ ADIS16080_DIN_WRITE);
+ if (ret < 0)
+ break;
+ ret = adis16080_spi_read(indio_dev, &ut);
+ if (ret < 0)
+ break;
+ *val = ut;
+ ret = IIO_VAL_INT;
+ break;
+ }
mutex_unlock(&indio_dev->mlock);
- if (ret == 0)
- return sprintf(buf, "%d\n", val);
- else
- return ret;
+ return ret;
}
-static IIO_DEV_ATTR_GYRO_Z(adis16080_read, ADIS16080_DIN_GYRO);
-static IIO_DEVICE_ATTR(temp_raw, S_IRUGO, adis16080_read, NULL,
- ADIS16080_DIN_TEMP);
-static IIO_DEV_ATTR_IN_RAW(0, adis16080_read, ADIS16080_DIN_AIN1);
-static IIO_DEV_ATTR_IN_RAW(1, adis16080_read, ADIS16080_DIN_AIN2);
-
-static struct attribute *adis16080_attributes[] = {
- &iio_dev_attr_gyro_z_raw.dev_attr.attr,
- &iio_dev_attr_temp_raw.dev_attr.attr,
- &iio_dev_attr_in0_raw.dev_attr.attr,
- &iio_dev_attr_in1_raw.dev_attr.attr,
- NULL
-};
-static const struct attribute_group adis16080_attribute_group = {
- .attrs = adis16080_attributes,
+static const struct iio_chan_spec adis16080_channels[] = {
+ {
+ .type = IIO_GYRO,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .address = ADIS16080_DIN_GYRO,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 0,
+ .address = ADIS16080_DIN_AIN1,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 1,
+ .address = ADIS16080_DIN_AIN2,
+ }, {
+ .type = IIO_TEMP,
+ .indexed = 1,
+ .channel = 0,
+ .address = ADIS16080_DIN_TEMP,
+ }
};
static const struct iio_info adis16080_info = {
- .attrs = &adis16080_attribute_group,
+ .read_raw = &adis16080_read_raw,
.driver_module = THIS_MODULE,
};
@@ -147,6 +155,7 @@ static int __devinit adis16080_probe(struct spi_device *spi)
mutex_init(&st->buf_lock);
indio_dev->name = spi->dev.driver->name;
+ indio_dev->channels = adis16080_channels;
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adis16080_info;
indio_dev->modes = INDIO_DIRECT_MODE;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 07/24] staging:iio:gyro:adis16260 remove some unused headers
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (5 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 06/24] staging:iio:gyro:adis16080 convert to iio_chan_spec Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 08/24] staging:iio:imu:adis16400 remove " Jonathan Cameron
` (17 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
These should have gone with the iio_chan_spec conversion patch.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16260_core.c | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16260_core.c b/drivers/staging/iio/gyro/adis16260_core.c
index 801c820..7c63f27 100644
--- a/drivers/staging/iio/gyro/adis16260_core.c
+++ b/drivers/staging/iio/gyro/adis16260_core.c
@@ -21,8 +21,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "../adc/adc.h"
-#include "gyro.h"
#include "adis16260.h"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 08/24] staging:iio:imu:adis16400 remove unused headers.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (6 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 07/24] staging:iio:gyro:adis16260 remove some unused headers Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 09/24] staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups Jonathan Cameron
` (16 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
These should have gone with the iio_chan_spec conversion.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/imu/adis16400_core.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/staging/iio/imu/adis16400_core.c b/drivers/staging/iio/imu/adis16400_core.c
index fe89802..8477549 100644
--- a/drivers/staging/iio/imu/adis16400_core.c
+++ b/drivers/staging/iio/imu/adis16400_core.c
@@ -29,11 +29,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "../accel/accel.h"
-#include "../adc/adc.h"
-#include "../gyro/gyro.h"
-#include "../magnetometer/magnet.h"
-
#include "adis16400.h"
#define DRIVER_NAME "adis16400"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 09/24] staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (7 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 08/24] staging:iio:imu:adis16400 remove " Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 10/24] staging:iio:magnetometer:hmc5843 iio_chan_spec conversion Jonathan Cameron
` (15 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
iio_chan_spec conversion is straight forward.
Other changes:
* use i2c_smbus_write_byte_data in write_data
* c99 isms to setup various structures.
* move the comment about the scale factor and kill off trivial access func.
* make mode setting code use a bool rather than a ulong.
Ultimately I'd like to get rid of that mode bit entirely and handle it through
core pm routines, but have left it for now.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/magnetometer/ak8975.c | 213 ++++++++++++++---------------
1 files changed, 102 insertions(+), 111 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/ak8975.c b/drivers/staging/iio/magnetometer/ak8975.c
index 33919e8..d37730d 100644
--- a/drivers/staging/iio/magnetometer/ak8975.c
+++ b/drivers/staging/iio/magnetometer/ak8975.c
@@ -31,7 +31,6 @@
#include <linux/gpio.h>
#include "../iio.h"
-#include "magnet.h"
/*
* Register definitions, as well as various shifts and masks to get at the
@@ -93,38 +92,28 @@ struct ak8975_data {
struct mutex lock;
u8 asa[3];
long raw_to_gauss[3];
- unsigned long mode;
+ bool mode;
u8 reg_cache[AK8975_MAX_REGS];
int eoc_gpio;
int eoc_irq;
};
+static const int ak8975_index_to_reg[] = {
+ AK8975_REG_HXL, AK8975_REG_HYL, AK8975_REG_HZL,
+};
+
/*
* Helper function to write to the I2C device's registers.
*/
static int ak8975_write_data(struct i2c_client *client,
u8 reg, u8 val, u8 mask, u8 shift)
{
- u8 regval;
- struct i2c_msg msg;
- u8 w_data[2];
- int ret = 0;
-
struct ak8975_data *data = i2c_get_clientdata(client);
+ u8 regval;
+ int ret;
- regval = data->reg_cache[reg];
- regval &= ~mask;
- regval |= val << shift;
-
- w_data[0] = reg;
- w_data[1] = regval;
-
- msg.addr = client->addr;
- msg.flags = 0;
- msg.len = 2;
- msg.buf = w_data;
-
- ret = i2c_transfer(client->adapter, &msg, 1);
+ regval = (data->reg_cache[reg] & ~mask) | (val << shift);
+ ret = i2c_smbus_write_byte_data(client, reg, regval);
if (ret < 0) {
dev_err(&client->dev, "Write to device fails status %x\n", ret);
return ret;
@@ -140,21 +129,20 @@ static int ak8975_write_data(struct i2c_client *client,
static int ak8975_read_data(struct i2c_client *client,
u8 reg, u8 length, u8 *buffer)
{
- struct i2c_msg msg[2];
- u8 w_data[2];
int ret;
-
- w_data[0] = reg;
-
- msg[0].addr = client->addr;
- msg[0].flags = I2C_M_NOSTART; /* set repeated start and write */
- msg[0].len = 1;
- msg[0].buf = w_data;
-
- msg[1].addr = client->addr;
- msg[1].flags = I2C_M_RD;
- msg[1].len = length;
- msg[1].buf = buffer;
+ struct i2c_msg msg[2] = {
+ {
+ .addr = client->addr,
+ .flags = I2C_M_NOSTART,
+ .len = 1,
+ .buf = ®,
+ }, {
+ .addr = client->addr,
+ .flags = I2C_M_RD,
+ .len = length,
+ .buf = buffer,
+ }
+ };
ret = i2c_transfer(client->adapter, msg, 2);
if (ret < 0) {
@@ -204,8 +192,41 @@ static int ak8975_setup(struct i2c_client *client)
return ret;
}
- /* Precalculate scale factor for each axis and
- store in the device data. */
+/*
+ * Precalculate scale factor (in Gauss units) for each axis and
+ * store in the device data.
+ *
+ * This scale factor is axis-dependent, and is derived from 3 calibration
+ * factors ASA(x), ASA(y), and ASA(z).
+ *
+ * These ASA values are read from the sensor device at start of day, and
+ * cached in the device context struct.
+ *
+ * Adjusting the flux value with the sensitivity adjustment value should be
+ * done via the following formula:
+ *
+ * Hadj = H * ( ( ( (ASA-128)*0.5 ) / 128 ) + 1 )
+ *
+ * where H is the raw value, ASA is the sensitivity adjustment, and Hadj
+ * is the resultant adjusted value.
+ *
+ * We reduce the formula to:
+ *
+ * Hadj = H * (ASA + 128) / 256
+ *
+ * H is in the range of -4096 to 4095. The magnetometer has a range of
+ * +-1229uT. To go from the raw value to uT is:
+ *
+ * HuT = H * 1229/4096, or roughly, 3/10.
+ *
+ * Since 1uT = 100 gauss, our final scale factor becomes:
+ *
+ * Hadj = H * ((ASA + 128) / 256) * 3/10 * 100
+ * Hadj = H * ((ASA + 128) * 30 / 256
+ *
+ * Since ASA doesn't change, we cache the resultant scale factor into the
+ * device context in ak8975_setup().
+ */
data->raw_to_gauss[0] = ((data->asa[0] + 128) * 30) >> 8;
data->raw_to_gauss[1] = ((data->asa[1] + 128) * 30) >> 8;
data->raw_to_gauss[2] = ((data->asa[2] + 128) * 30) >> 8;
@@ -222,7 +243,7 @@ static ssize_t show_mode(struct device *dev, struct device_attribute *devattr,
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ak8975_data *data = iio_priv(indio_dev);
- return sprintf(buf, "%lu\n", data->mode);
+ return sprintf(buf, "%u\n", data->mode);
}
/*
@@ -235,26 +256,22 @@ static ssize_t store_mode(struct device *dev, struct device_attribute *devattr,
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ak8975_data *data = iio_priv(indio_dev);
struct i2c_client *client = data->client;
- unsigned long oval;
+ bool value;
int ret;
/* Convert mode string and do some basic sanity checking on it.
only 0 or 1 are valid. */
- if (strict_strtoul(buf, 10, &oval))
- return -EINVAL;
-
- if (oval > 1) {
- dev_err(dev, "mode value is not supported\n");
- return -EINVAL;
- }
+ ret = strtobool(buf, &value);
+ if (ret < 0)
+ return ret;
mutex_lock(&data->lock);
/* Write the mode to the device. */
- if (data->mode != oval) {
+ if (data->mode != value) {
ret = ak8975_write_data(client,
AK8975_REG_CNTL,
- (u8)oval,
+ (u8)value,
AK8975_REG_CNTL_MODE_MASK,
AK8975_REG_CNTL_MODE_SHIFT);
@@ -263,7 +280,7 @@ static ssize_t store_mode(struct device *dev, struct device_attribute *devattr,
mutex_unlock(&data->lock);
return ret;
}
- data->mode = oval;
+ data->mode = value;
}
mutex_unlock(&data->lock);
@@ -271,50 +288,6 @@ static ssize_t store_mode(struct device *dev, struct device_attribute *devattr,
return count;
}
-/*
- * Emits the scale factor to bring the raw value into Gauss units.
- *
- * This scale factor is axis-dependent, and is derived from 3 calibration
- * factors ASA(x), ASA(y), and ASA(z).
- *
- * These ASA values are read from the sensor device at start of day, and
- * cached in the device context struct.
- *
- * Adjusting the flux value with the sensitivity adjustment value should be
- * done via the following formula:
- *
- * Hadj = H * ( ( ( (ASA-128)*0.5 ) / 128 ) + 1 )
- *
- * where H is the raw value, ASA is the sensitivity adjustment, and Hadj
- * is the resultant adjusted value.
- *
- * We reduce the formula to:
- *
- * Hadj = H * (ASA + 128) / 256
- *
- * H is in the range of -4096 to 4095. The magnetometer has a range of
- * +-1229uT. To go from the raw value to uT is:
- *
- * HuT = H * 1229/4096, or roughly, 3/10.
- *
- * Since 1uT = 100 gauss, our final scale factor becomes:
- *
- * Hadj = H * ((ASA + 128) / 256) * 3/10 * 100
- * Hadj = H * ((ASA + 128) * 30 / 256
- *
- * Since ASA doesn't change, we cache the resultant scale factor into the
- * device context in ak8975_setup().
- */
-static ssize_t show_scale(struct device *dev, struct device_attribute *devattr,
- char *buf)
-{
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- struct ak8975_data *data = iio_priv(indio_dev);
- struct iio_dev_attr *this_attr = to_iio_dev_attr(devattr);
-
- return sprintf(buf, "%ld\n", data->raw_to_gauss[this_attr->address]);
-}
-
static int wait_conversion_complete_gpio(struct ak8975_data *data)
{
struct i2c_client *client = data->client;
@@ -371,13 +344,10 @@ static int wait_conversion_complete_polled(struct ak8975_data *data)
/*
* Emits the raw flux value for the x, y, or z axis.
*/
-static ssize_t show_raw(struct device *dev, struct device_attribute *devattr,
- char *buf)
+static int ak8975_read_axis(struct iio_dev *indio_dev, int index, int *val)
{
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct ak8975_data *data = iio_priv(indio_dev);
struct i2c_client *client = data->client;
- struct iio_dev_attr *this_attr = to_iio_dev_attr(devattr);
u16 meas_reg;
s16 raw;
u8 read_status;
@@ -429,7 +399,8 @@ static ssize_t show_raw(struct device *dev, struct device_attribute *devattr,
/* Read the flux value from the appropriate register
(the register is specified in the iio device attributes). */
- ret = ak8975_read_data(client, this_attr->address, 2, (u8 *)&meas_reg);
+ ret = ak8975_read_data(client, ak8975_index_to_reg[index],
+ 2, (u8 *)&meas_reg);
if (ret < 0) {
dev_err(&client->dev, "Read axis data fails\n");
goto exit;
@@ -442,30 +413,48 @@ static ssize_t show_raw(struct device *dev, struct device_attribute *devattr,
/* Clamp to valid range. */
raw = clamp_t(s16, raw, -4096, 4095);
-
- return sprintf(buf, "%d\n", raw);
+ *val = raw;
+ return IIO_VAL_INT;
exit:
mutex_unlock(&data->lock);
return ret;
}
+static int ak8975_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ struct ak8975_data *data = iio_priv(indio_dev);
+
+ switch (mask) {
+ case 0:
+ return ak8975_read_axis(indio_dev, chan->address, val);
+ case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+ *val = data->raw_to_gauss[chan->address];
+ return IIO_VAL_INT;
+ }
+ return -EINVAL;
+}
+
+#define AK8975_CHANNEL(axis, index) \
+ { \
+ .type = IIO_MAGN, \
+ .modified = 1, \
+ .channel2 = IIO_MOD_##axis, \
+ .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE), \
+ .address = index, \
+ }
+
+static const struct iio_chan_spec ak8975_channels[] = {
+ AK8975_CHANNEL(X, 0), AK8975_CHANNEL(Y, 1), AK8975_CHANNEL(Z, 2),
+};
+
static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR, show_mode, store_mode, 0);
-static IIO_DEV_ATTR_MAGN_X_SCALE(S_IRUGO, show_scale, NULL, 0);
-static IIO_DEV_ATTR_MAGN_Y_SCALE(S_IRUGO, show_scale, NULL, 1);
-static IIO_DEV_ATTR_MAGN_Z_SCALE(S_IRUGO, show_scale, NULL, 2);
-static IIO_DEV_ATTR_MAGN_X(show_raw, AK8975_REG_HXL);
-static IIO_DEV_ATTR_MAGN_Y(show_raw, AK8975_REG_HYL);
-static IIO_DEV_ATTR_MAGN_Z(show_raw, AK8975_REG_HZL);
static struct attribute *ak8975_attr[] = {
&iio_dev_attr_mode.dev_attr.attr,
- &iio_dev_attr_magn_x_scale.dev_attr.attr,
- &iio_dev_attr_magn_y_scale.dev_attr.attr,
- &iio_dev_attr_magn_z_scale.dev_attr.attr,
- &iio_dev_attr_magn_x_raw.dev_attr.attr,
- &iio_dev_attr_magn_y_raw.dev_attr.attr,
- &iio_dev_attr_magn_z_raw.dev_attr.attr,
NULL
};
@@ -475,6 +464,7 @@ static struct attribute_group ak8975_attr_group = {
static const struct iio_info ak8975_info = {
.attrs = &ak8975_attr_group,
+ .read_raw = &ak8975_read_raw,
.driver_module = THIS_MODULE,
};
@@ -530,6 +520,7 @@ static int ak8975_probe(struct i2c_client *client,
data->eoc_irq = client->irq;
data->eoc_gpio = eoc_gpio;
indio_dev->dev.parent = &client->dev;
+ indio_dev->channels = ak8975_channels;
indio_dev->info = &ak8975_info;
indio_dev->modes = INDIO_DIRECT_MODE;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 10/24] staging:iio:magnetometer:hmc5843 iio_chan_spec conversion.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (8 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 09/24] staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 11/24] staging:iio:magnetometer: remove unused header magnet.h Jonathan Cameron
` (14 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/magnetometer/hmc5843.c | 95 +++++++++++++++-------------
1 files changed, 50 insertions(+), 45 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/hmc5843.c b/drivers/staging/iio/magnetometer/hmc5843.c
index b44c273a..b1ab569 100644
--- a/drivers/staging/iio/magnetometer/hmc5843.c
+++ b/drivers/staging/iio/magnetometer/hmc5843.c
@@ -24,7 +24,6 @@
#include <linux/types.h>
#include "../iio.h"
#include "../sysfs.h"
-#include "magnet.h"
#define HMC5843_I2C_ADDRESS 0x1E
@@ -62,9 +61,9 @@
/*
* Device status
*/
-#define DATA_READY 0x01
-#define DATA_OUTPUT_LOCK 0x02
-#define VOLTAGE_REGULATOR_ENABLED 0x04
+#define DATA_READY 0x01
+#define DATA_OUTPUT_LOCK 0x02
+#define VOLTAGE_REGULATOR_ENABLED 0x04
/*
* Mode register configuration
@@ -89,22 +88,16 @@
/*
* Device Configutration
*/
-#define CONF_NORMAL 0x00
+#define CONF_NORMAL 0x00
#define CONF_POSITIVE_BIAS 0x01
#define CONF_NEGATIVE_BIAS 0x02
#define CONF_NOT_USED 0x03
#define MEAS_CONF_MASK 0x03
-static const char *regval_to_scale[] = {
- "0.0000006173",
- "0.0000007692",
- "0.0000010309",
- "0.0000012821",
- "0.0000018868",
- "0.0000021739",
- "0.0000025641",
- "0.0000035714",
+static int hmc5843_regval_to_nanoscale[] = {
+ 6173, 7692, 10309, 12821, 18868, 21739, 25641, 35714
};
+
static const int regval_to_input_field_mg[] = {
700,
1000,
@@ -115,7 +108,7 @@ static const int regval_to_input_field_mg[] = {
4500,
6500
};
-static const char *regval_to_samp_freq[] = {
+static const char * const regval_to_samp_freq[] = {
"0.5",
"1",
"2",
@@ -150,37 +143,28 @@ static s32 hmc5843_configure(struct i2c_client *client,
}
/* Return the measurement value from the specified channel */
-static ssize_t hmc5843_read_measurement(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int hmc5843_read_measurement(struct iio_dev *indio_dev,
+ int address,
+ int *val)
{
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct i2c_client *client = to_i2c_client(indio_dev->dev.parent);
- s16 coordinate_val;
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
struct hmc5843_data *data = iio_priv(indio_dev);
s32 result;
mutex_lock(&data->lock);
-
result = i2c_smbus_read_byte_data(client, HMC5843_STATUS_REG);
while (!(result & DATA_READY))
result = i2c_smbus_read_byte_data(client, HMC5843_STATUS_REG);
- result = i2c_smbus_read_word_data(client, this_attr->address);
+ result = i2c_smbus_read_word_data(client, address);
mutex_unlock(&data->lock);
if (result < 0)
return -EINVAL;
- coordinate_val = (s16)swab16((u16)result);
- return sprintf(buf, "%d\n", coordinate_val);
+ *val = (s16)swab16((u16)result);
+ return IIO_VAL_INT;
}
-static IIO_DEV_ATTR_MAGN_X(hmc5843_read_measurement,
- HMC5843_DATA_OUT_X_MSB_REG);
-static IIO_DEV_ATTR_MAGN_Y(hmc5843_read_measurement,
- HMC5843_DATA_OUT_Y_MSB_REG);
-static IIO_DEV_ATTR_MAGN_Z(hmc5843_read_measurement,
- HMC5843_DATA_OUT_Z_MSB_REG);
+
/*
* From the datasheet
@@ -336,7 +320,7 @@ static s32 hmc5843_set_rate(struct i2c_client *client,
reg_val = (data->meas_conf) | (rate << RATE_OFFSET);
if (rate >= RATE_NOT_USED) {
dev_err(&client->dev,
- "This data output rate is not supported \n");
+ "This data output rate is not supported\n");
return -EINVAL;
}
return i2c_smbus_write_byte_data(client, HMC5843_CONFIG_REG_A, reg_val);
@@ -467,28 +451,46 @@ static IIO_DEVICE_ATTR(magn_range,
set_range,
HMC5843_CONFIG_REG_B);
-static ssize_t show_scale(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int hmc5843_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
{
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct hmc5843_data *data = iio_priv(indio_dev);
- return strlen(strcpy(buf, regval_to_scale[data->range]));
+
+ switch (mask) {
+ case 0:
+ return hmc5843_read_measurement(indio_dev,
+ chan->address,
+ val);
+ case (1 << IIO_CHAN_INFO_SCALE_SHARED):
+ *val = 0;
+ *val2 = hmc5843_regval_to_nanoscale[data->range];
+ return IIO_VAL_INT_PLUS_NANO;
+ };
+ return -EINVAL;
}
-static IIO_DEVICE_ATTR(magn_scale,
- S_IRUGO,
- show_scale,
- NULL , 0);
+
+#define HMC5843_CHANNEL(axis, add) \
+ { \
+ .type = IIO_MAGN, \
+ .modified = 1, \
+ .channel2 = IIO_MOD_##axis, \
+ .info_mask = (1 << IIO_CHAN_INFO_SCALE_SHARED), \
+ .address = add \
+ }
+
+static const struct iio_chan_spec hmc5843_channels[] = {
+ HMC5843_CHANNEL(X, HMC5843_DATA_OUT_X_MSB_REG),
+ HMC5843_CHANNEL(X, HMC5843_DATA_OUT_Y_MSB_REG),
+ HMC5843_CHANNEL(X, HMC5843_DATA_OUT_Z_MSB_REG),
+};
static struct attribute *hmc5843_attributes[] = {
&iio_dev_attr_meas_conf.dev_attr.attr,
&iio_dev_attr_operating_mode.dev_attr.attr,
&iio_dev_attr_sampling_frequency.dev_attr.attr,
&iio_dev_attr_magn_range.dev_attr.attr,
- &iio_dev_attr_magn_scale.dev_attr.attr,
- &iio_dev_attr_magn_x_raw.dev_attr.attr,
- &iio_dev_attr_magn_y_raw.dev_attr.attr,
- &iio_dev_attr_magn_z_raw.dev_attr.attr,
&iio_const_attr_sampling_frequency_available.dev_attr.attr,
NULL
};
@@ -530,6 +532,7 @@ static void hmc5843_init_client(struct i2c_client *client)
static const struct iio_info hmc5843_info = {
.attrs = &hmc5843_group,
+ .read_raw = &hmc5843_read_raw,
.driver_module = THIS_MODULE,
};
@@ -558,6 +561,8 @@ static int hmc5843_probe(struct i2c_client *client,
hmc5843_init_client(client);
indio_dev->info = &hmc5843_info;
+ indio_dev->name = id->name;
+ indio_dev->channels = hmc5843_channels;
indio_dev->dev.parent = &client->dev;
indio_dev->modes = INDIO_DIRECT_MODE;
err = iio_device_register(indio_dev);
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 11/24] staging:iio:magnetometer: remove unused header magnet.h
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (9 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 10/24] staging:iio:magnetometer:hmc5843 iio_chan_spec conversion Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 12/24] staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel Jonathan Cameron
` (13 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Now all magnetomers are using iio_chan_spec there is no need for
the macros in magnet.h
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/magnetometer/magnet.h | 31 -----------------------------
1 files changed, 0 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/iio/magnetometer/magnet.h b/drivers/staging/iio/magnetometer/magnet.h
deleted file mode 100644
index 1260eb7..0000000
--- a/drivers/staging/iio/magnetometer/magnet.h
+++ /dev/null
@@ -1,31 +0,0 @@
-
-#include "../sysfs.h"
-
-/* Magnetometer types of attribute */
-
-#define IIO_DEV_ATTR_MAGN_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_X_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_x_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Y_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_y_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Z_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(magn_z_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_MAGN_X(_show, _addr) \
- IIO_DEVICE_ATTR(magn_x_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Y(_show, _addr) \
- IIO_DEVICE_ATTR(magn_y_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_MAGN_Z(_show, _addr) \
- IIO_DEVICE_ATTR(magn_z_raw, S_IRUGO, _show, NULL, _addr)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 12/24] staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (10 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 11/24] staging:iio:magnetometer: remove unused header magnet.h Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 13/24] staging:iio:gyro:adis16130 drop control of adc resolution Jonathan Cameron
` (12 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16130_core.c | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index c80e908..caf067c 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -75,15 +75,24 @@ static int adis16130_spi_read(struct device *dev, u8 reg_addr,
int ret;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16130_state *st = iio_priv(indio_dev);
+ struct spi_message msg;
+ struct spi_transfer xfer = {
+ .tx_buf = st->buf,
+ .rx_buf = st->buf,
+ };
mutex_lock(&st->buf_lock);
st->buf[0] = ADIS16130_CON_RD | reg_addr;
+ st->buf[1] = st->buf[2] = st->buf[3] = 0;
+
if (st->mode)
- ret = spi_read(st->us, st->buf, 4);
+ xfer.len = 4;
else
- ret = spi_read(st->us, st->buf, 3);
-
+ xfer.len = 3;
+ spi_message_init(&msg);
+ spi_message_add_tail(&xfer, &msg);
+ ret = spi_sync(st->us, &msg);
if (ret == 0) {
if (st->mode)
*val = (st->buf[1] << 16) |
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 13/24] staging:iio:gyro:adis16130 drop control of adc resolution.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (11 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 12/24] staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 14/24] staging:iio:gyro:adis16130 move to iio_chan_spec registration Jonathan Cameron
` (11 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
There is no clear use case for this functionality in a driver
that only supports slow reading via sysfs. The interface
use was non compliant with the abi motiving it being dropped.
It can go back in if anyone ever implements buffered reading
support for this device. Then it will be controlled as
part of the buffering abi where this should indeed be correctly
supported.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16130_core.c | 76 ++---------------------------
1 files changed, 4 insertions(+), 72 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index caf067c..6d3cd6c 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -41,34 +41,15 @@
/**
* struct adis16130_state - device instance specific data
* @us: actual spi_device to write data
- * @mode: 24 bits (1) or 16 bits (0)
* @buf_lock: mutex to protect tx and rx
* @buf: unified tx/rx buffer
**/
struct adis16130_state {
struct spi_device *us;
- u32 mode;
struct mutex buf_lock;
u8 buf[4] ____cacheline_aligned;
};
-static int adis16130_spi_write(struct device *dev, u8 reg_addr,
- u8 val)
-{
- int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- struct adis16130_state *st = iio_priv(indio_dev);
-
- mutex_lock(&st->buf_lock);
- st->buf[0] = reg_addr;
- st->buf[1] = val;
-
- ret = spi_write(st->us, st->buf, 2);
- mutex_unlock(&st->buf_lock);
-
- return ret;
-}
-
static int adis16130_spi_read(struct device *dev, u8 reg_addr,
u32 *val)
{
@@ -79,6 +60,7 @@ static int adis16130_spi_read(struct device *dev, u8 reg_addr,
struct spi_transfer xfer = {
.tx_buf = st->buf,
.rx_buf = st->buf,
+ .len = 4,
};
mutex_lock(&st->buf_lock);
@@ -86,22 +68,13 @@ static int adis16130_spi_read(struct device *dev, u8 reg_addr,
st->buf[0] = ADIS16130_CON_RD | reg_addr;
st->buf[1] = st->buf[2] = st->buf[3] = 0;
- if (st->mode)
- xfer.len = 4;
- else
- xfer.len = 3;
spi_message_init(&msg);
spi_message_add_tail(&xfer, &msg);
ret = spi_sync(st->us, &msg);
- if (ret == 0) {
- if (st->mode)
- *val = (st->buf[1] << 16) |
- (st->buf[2] << 8) |
- st->buf[3];
- else
- *val = (st->buf[1] << 8) | st->buf[2];
- }
+ ret = spi_read(st->us, st->buf, 4);
+ if (ret == 0)
+ *val = (st->buf[1] << 16) | (st->buf[2] << 8) | st->buf[3];
mutex_unlock(&st->buf_lock);
return ret;
@@ -127,54 +100,14 @@ static ssize_t adis16130_val_read(struct device *dev,
return ret;
}
-static ssize_t adis16130_bitsmode_read(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- struct adis16130_state *st = iio_priv(indio_dev);
-
- if (st->mode == 1)
- return sprintf(buf, "s24\n");
- else
- return sprintf(buf, "s16\n");
-}
-
-static ssize_t adis16130_bitsmode_write(struct device *dev,
- struct device_attribute *attr,
- const char *buf,
- size_t len)
-{
- int ret;
- u8 val;
-
- if (sysfs_streq(buf, "s16"))
- val = 0;
- else if (sysfs_streq(buf, "s24"))
- val = 1;
- else
- return -EINVAL;
-
- ret = adis16130_spi_write(dev, ADIS16130_MODE, val);
-
- return ret ? ret : len;
-}
static IIO_DEVICE_ATTR(temp_raw, S_IRUGO, adis16130_val_read, NULL,
ADIS16130_TEMPDATA);
static IIO_DEV_ATTR_GYRO_Z(adis16130_val_read, ADIS16130_RATEDATA);
-static IIO_DEVICE_ATTR(gyro_z_type, S_IWUSR | S_IRUGO, adis16130_bitsmode_read,
- adis16130_bitsmode_write,
- ADIS16130_MODE);
-
-static IIO_CONST_ATTR(gyro_z_type_available, "s16 s24");
-
static struct attribute *adis16130_attributes[] = {
&iio_dev_attr_temp_raw.dev_attr.attr,
&iio_dev_attr_gyro_z_raw.dev_attr.attr,
- &iio_dev_attr_gyro_z_type.dev_attr.attr,
- &iio_const_attr_gyro_z_type_available.dev_attr.attr,
NULL
};
@@ -208,7 +141,6 @@ static int __devinit adis16130_probe(struct spi_device *spi)
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adis16130_info;
indio_dev->modes = INDIO_DIRECT_MODE;
- st->mode = 1;
ret = iio_device_register(indio_dev);
if (ret)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 14/24] staging:iio:gyro:adis16130 move to iio_chan_spec registration.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (12 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 13/24] staging:iio:gyro:adis16130 drop control of adc resolution Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 15/24] staging:iio:gyro:adis16060 convert to iio_chan_spec Jonathan Cameron
` (10 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Simple conversion now we've dropped the type attributes.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16130_core.c | 56 +++++++++++++----------------
1 files changed, 25 insertions(+), 31 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index 6d3cd6c..7052dec 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -17,8 +17,6 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "gyro.h"
-#include "../adc/adc.h"
#define ADIS16130_CON 0x0
#define ADIS16130_CON_RD (1 << 6)
@@ -50,11 +48,9 @@ struct adis16130_state {
u8 buf[4] ____cacheline_aligned;
};
-static int adis16130_spi_read(struct device *dev, u8 reg_addr,
- u32 *val)
+static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16130_state *st = iio_priv(indio_dev);
struct spi_message msg;
struct spi_transfer xfer = {
@@ -80,43 +76,40 @@ static int adis16130_spi_read(struct device *dev, u8 reg_addr,
return ret;
}
-static ssize_t adis16130_val_read(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adis16130_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
{
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- u32 val;
- ssize_t ret;
+ int ret;
+ u32 temp;
/* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock);
- ret = adis16130_spi_read(dev, this_attr->address, &val);
+ ret = adis16130_spi_read(indio_dev, chan->address, &temp);
mutex_unlock(&indio_dev->mlock);
-
- if (ret == 0)
- return sprintf(buf, "%d\n", val);
- else
+ if (ret)
return ret;
+ *val = temp;
+ return IIO_VAL_INT;
}
-static IIO_DEVICE_ATTR(temp_raw, S_IRUGO, adis16130_val_read, NULL,
- ADIS16130_TEMPDATA);
-
-static IIO_DEV_ATTR_GYRO_Z(adis16130_val_read, ADIS16130_RATEDATA);
-
-static struct attribute *adis16130_attributes[] = {
- &iio_dev_attr_temp_raw.dev_attr.attr,
- &iio_dev_attr_gyro_z_raw.dev_attr.attr,
- NULL
-};
-
-static const struct attribute_group adis16130_attribute_group = {
- .attrs = adis16130_attributes,
+static const struct iio_chan_spec adis16130_channels[] = {
+ {
+ .type = IIO_GYRO,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .address = ADIS16130_RATEDATA,
+ }, {
+ .type = IIO_TEMP,
+ .indexed = 1,
+ .channel = 0,
+ .address = ADIS16130_TEMPDATA,
+ }
};
static const struct iio_info adis16130_info = {
- .attrs = &adis16130_attribute_group,
+ .read_raw = &adis16130_read_raw,
.driver_module = THIS_MODULE,
};
@@ -138,6 +131,7 @@ static int __devinit adis16130_probe(struct spi_device *spi)
st->us = spi;
mutex_init(&st->buf_lock);
indio_dev->name = spi->dev.driver->name;
+ indio_dev->channels = adis16130_channels;
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adis16130_info;
indio_dev->modes = INDIO_DIRECT_MODE;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 15/24] staging:iio:gyro:adis16060 convert to iio_chan_spec
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (13 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 14/24] staging:iio:gyro:adis16130 move to iio_chan_spec registration Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 16/24] staging:iio:gyro: remove gyro.h Jonathan Cameron
` (9 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Still a very odd driver. This patch has the side effect of changing
it's name slightly.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16060_core.c | 113 +++++++++++++++--------------
1 files changed, 59 insertions(+), 54 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16060_core.c b/drivers/staging/iio/gyro/adis16060_core.c
index afa52d1..d9c0cc8 100644
--- a/drivers/staging/iio/gyro/adis16060_core.c
+++ b/drivers/staging/iio/gyro/adis16060_core.c
@@ -14,11 +14,8 @@
#include <linux/slab.h>
#include <linux/sysfs.h>
-
#include "../iio.h"
#include "../sysfs.h"
-#include "gyro.h"
-#include "../adc/adc.h"
#define ADIS16060_GYRO 0x20 /* Measure Angular Rate (Gyro) */
#define ADIS16060_TEMP_OUT 0x10 /* Measure Temperature */
@@ -42,11 +39,9 @@ struct adis16060_state {
static struct iio_dev *adis16060_iio_dev;
-static int adis16060_spi_write(struct device *dev,
- u8 val)
+static int adis16060_spi_write(struct iio_dev *indio_dev, u8 val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16060_state *st = iio_priv(indio_dev);
mutex_lock(&st->buf_lock);
@@ -57,11 +52,9 @@ static int adis16060_spi_write(struct device *dev,
return ret;
}
-static int adis16060_spi_read(struct device *dev,
- u16 *val)
+static int adis16060_spi_read(struct iio_dev *indio_dev, u16 *val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16060_state *st = iio_priv(indio_dev);
mutex_lock(&st->buf_lock);
@@ -82,60 +75,71 @@ static int adis16060_spi_read(struct device *dev,
return ret;
}
-static ssize_t adis16060_read(struct device *dev,
- struct device_attribute *attr,
- char *buf)
+static int adis16060_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
{
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
- u16 val = 0;
- ssize_t ret;
-
- /* Take the iio_dev status lock */
- mutex_lock(&indio_dev->mlock);
+ u16 tval = 0;
+ int ret;
- ret = adis16060_spi_write(dev, this_attr->address);
- if (ret < 0)
- goto error_ret;
- ret = adis16060_spi_read(dev, &val);
-error_ret:
- mutex_unlock(&indio_dev->mlock);
+ switch (mask) {
+ case 0:
+ /* Take the iio_dev status lock */
+ mutex_lock(&indio_dev->mlock);
+ ret = adis16060_spi_write(indio_dev, chan->address);
+ if (ret < 0) {
+ mutex_unlock(&indio_dev->mlock);
+ return ret;
+ }
+ ret = adis16060_spi_read(indio_dev, &tval);
+ mutex_unlock(&indio_dev->mlock);
+ *val = tval;
+ return IIO_VAL_INT;
+ case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+ *val = -7;
+ *val2 = 461117;
+ return IIO_VAL_INT_PLUS_MICRO;
+ case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+ *val = 0;
+ *val2 = 34000;
+ return IIO_VAL_INT_PLUS_MICRO;
+ }
- if (ret == 0)
- return sprintf(buf, "%d\n", val);
- else
- return ret;
+ return -EINVAL;
}
-static IIO_DEV_ATTR_GYRO_Z(adis16060_read, ADIS16060_GYRO);
-static IIO_DEVICE_ATTR(temp_raw, S_IRUGO, adis16060_read, NULL,
- ADIS16060_TEMP_OUT);
-static IIO_CONST_ATTR_TEMP_SCALE("34"); /* Milli degrees C */
-static IIO_CONST_ATTR_TEMP_OFFSET("-7461.117"); /* Milli degrees C */
-static IIO_DEV_ATTR_IN_RAW(0, adis16060_read, ADIS16060_AIN1);
-static IIO_DEV_ATTR_IN_RAW(1, adis16060_read, ADIS16060_AIN2);
-static IIO_CONST_ATTR(name, "adis16060");
-
-static struct attribute *adis16060_attributes[] = {
- &iio_dev_attr_gyro_z_raw.dev_attr.attr,
- &iio_dev_attr_temp_raw.dev_attr.attr,
- &iio_const_attr_temp_scale.dev_attr.attr,
- &iio_const_attr_temp_offset.dev_attr.attr,
- &iio_dev_attr_in0_raw.dev_attr.attr,
- &iio_dev_attr_in1_raw.dev_attr.attr,
- &iio_const_attr_name.dev_attr.attr,
- NULL
-};
-
-static const struct attribute_group adis16060_attribute_group = {
- .attrs = adis16060_attributes,
-};
-
static const struct iio_info adis16060_info = {
- .attrs = &adis16060_attribute_group,
+ .read_raw = &adis16060_read_raw,
.driver_module = THIS_MODULE,
};
+static const struct iio_chan_spec adis16060_channels[] = {
+ {
+ .type = IIO_GYRO,
+ .modified = 1,
+ .channel2 = IIO_MOD_Z,
+ .address = ADIS16060_GYRO,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 0,
+ .address = ADIS16060_AIN1,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 1,
+ .address = ADIS16060_AIN2,
+ }, {
+ .type = IIO_TEMP,
+ .indexed = 1,
+ .channel = 0,
+ .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
+ (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+ .address = ADIS16060_TEMP_OUT,
+ }
+};
+
static int __devinit adis16060_r_probe(struct spi_device *spi)
{
int ret, regdone = 0;
@@ -154,6 +158,7 @@ static int __devinit adis16060_r_probe(struct spi_device *spi)
st->us_r = spi;
mutex_init(&st->buf_lock);
+ indio_dev->name = spi->dev.driver->name;
indio_dev->dev.parent = &spi->dev;
indio_dev->info = &adis16060_info;
indio_dev->modes = INDIO_DIRECT_MODE;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 16/24] staging:iio:gyro: remove gyro.h
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (14 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 15/24] staging:iio:gyro:adis16060 convert to iio_chan_spec Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 17/24] staging:iio:accel: usused header removals Jonathan Cameron
` (8 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Not longer needed now all devices with gyro channels are using
iio_chan_spec registration.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/gyro.h | 85 ---------------------------------------
1 files changed, 0 insertions(+), 85 deletions(-)
diff --git a/drivers/staging/iio/gyro/gyro.h b/drivers/staging/iio/gyro/gyro.h
deleted file mode 100644
index b5495613..0000000
--- a/drivers/staging/iio/gyro/gyro.h
+++ /dev/null
@@ -1,85 +0,0 @@
-
-#include "../sysfs.h"
-
-/* Gyroscope types of attribute */
-
-#define IIO_CONST_ATTR_GYRO_OFFSET(_string) \
- IIO_CONST_ATTR(gyro_offset, _string)
-
-#define IIO_DEV_ATTR_GYRO_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_CONST_ATTR_GYRO_SCALE(_string) \
- IIO_CONST_ATTR(gyro_scale, _string)
-
-#define IIO_DEV_ATTR_GYRO_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_scale, S_IRUGO, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_calibbias, S_IRUGO, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_calibscale, S_IRUGO, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_x_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_y_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(gyro_z_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z_QUADRATURE_CORRECTION(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_z_quadrature_correction_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_X(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_x_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Y(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_y_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_GYRO_Z(_show, _addr) \
- IIO_DEVICE_ATTR(gyro_z_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ANGL(_show, _addr) \
- IIO_DEVICE_ATTR(angl_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ANGL_X(_show, _addr) \
- IIO_DEVICE_ATTR(angl_x_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ANGL_Y(_show, _addr) \
- IIO_DEVICE_ATTR(angl_y_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ANGL_Z(_show, _addr) \
- IIO_DEVICE_ATTR(angl_z_raw, S_IRUGO, _show, NULL, _addr)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 17/24] staging:iio:accel: usused header removals.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (15 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 16/24] staging:iio:gyro: remove gyro.h Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 18/24] staging:iio:inclinometer.h remove as now unused Jonathan Cameron
` (7 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Missing from the iio_chan_spec conversion patches.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/adis16201_core.c | 4 ----
drivers/staging/iio/accel/adis16201_ring.c | 1 -
drivers/staging/iio/accel/adis16203_core.c | 3 ---
drivers/staging/iio/accel/adis16203_ring.c | 1 -
drivers/staging/iio/accel/adis16204_ring.c | 1 -
drivers/staging/iio/accel/adis16209_core.c | 3 ---
drivers/staging/iio/accel/adis16209_ring.c | 1 -
drivers/staging/iio/accel/adis16240_core.c | 2 --
drivers/staging/iio/accel/adis16240_ring.c | 1 -
drivers/staging/iio/accel/lis3l02dq_core.c | 2 --
drivers/staging/iio/accel/lis3l02dq_ring.c | 1 -
drivers/staging/iio/accel/sca3000_core.c | 1 -
drivers/staging/iio/accel/sca3000_ring.c | 1 -
13 files changed, 0 insertions(+), 22 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16201_core.c b/drivers/staging/iio/accel/adis16201_core.c
index cbc59c5..aff1118 100644
--- a/drivers/staging/iio/accel/adis16201_core.c
+++ b/drivers/staging/iio/accel/adis16201_core.c
@@ -18,10 +18,6 @@
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
-#include "inclinometer.h"
-#include "../adc/adc.h"
-
#include "adis16201.h"
enum adis16201_chan {
diff --git a/drivers/staging/iio/accel/adis16201_ring.c b/drivers/staging/iio/accel/adis16201_ring.c
index 66e708d..aa4e465 100644
--- a/drivers/staging/iio/accel/adis16201_ring.c
+++ b/drivers/staging/iio/accel/adis16201_ring.c
@@ -10,7 +10,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
#include "../trigger.h"
#include "adis16201.h"
diff --git a/drivers/staging/iio/accel/adis16203_core.c b/drivers/staging/iio/accel/adis16203_core.c
index bf19888..034115a 100644
--- a/drivers/staging/iio/accel/adis16203_core.c
+++ b/drivers/staging/iio/accel/adis16203_core.c
@@ -16,10 +16,7 @@
#include "../iio.h"
#include "../sysfs.h"
-#include "accel.h"
-#include "inclinometer.h"
#include "../ring_generic.h"
-#include "../adc/adc.h"
#include "adis16203.h"
diff --git a/drivers/staging/iio/accel/adis16203_ring.c b/drivers/staging/iio/accel/adis16203_ring.c
index d2c07c5..7ca9c25 100644
--- a/drivers/staging/iio/accel/adis16203_ring.c
+++ b/drivers/staging/iio/accel/adis16203_ring.c
@@ -13,7 +13,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
#include "../trigger.h"
#include "adis16203.h"
diff --git a/drivers/staging/iio/accel/adis16204_ring.c b/drivers/staging/iio/accel/adis16204_ring.c
index 852df06..537d463 100644
--- a/drivers/staging/iio/accel/adis16204_ring.c
+++ b/drivers/staging/iio/accel/adis16204_ring.c
@@ -13,7 +13,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
#include "../trigger.h"
#include "adis16204.h"
diff --git a/drivers/staging/iio/accel/adis16209_core.c b/drivers/staging/iio/accel/adis16209_core.c
index 55f3a7b..70a7e29 100644
--- a/drivers/staging/iio/accel/adis16209_core.c
+++ b/drivers/staging/iio/accel/adis16209_core.c
@@ -18,9 +18,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
-#include "inclinometer.h"
-#include "../adc/adc.h"
#include "adis16209.h"
diff --git a/drivers/staging/iio/accel/adis16209_ring.c b/drivers/staging/iio/accel/adis16209_ring.c
index 45017d3..77b70e3 100644
--- a/drivers/staging/iio/accel/adis16209_ring.c
+++ b/drivers/staging/iio/accel/adis16209_ring.c
@@ -13,7 +13,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
#include "../trigger.h"
#include "adis16209.h"
diff --git a/drivers/staging/iio/accel/adis16240_core.c b/drivers/staging/iio/accel/adis16240_core.c
index 4a4eafc..b9dd92d 100644
--- a/drivers/staging/iio/accel/adis16240_core.c
+++ b/drivers/staging/iio/accel/adis16240_core.c
@@ -21,8 +21,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
-#include "../adc/adc.h"
#include "adis16240.h"
diff --git a/drivers/staging/iio/accel/adis16240_ring.c b/drivers/staging/iio/accel/adis16240_ring.c
index c812a34..3f1e159 100644
--- a/drivers/staging/iio/accel/adis16240_ring.c
+++ b/drivers/staging/iio/accel/adis16240_ring.c
@@ -13,7 +13,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "accel.h"
#include "../trigger.h"
#include "adis16240.h"
diff --git a/drivers/staging/iio/accel/lis3l02dq_core.c b/drivers/staging/iio/accel/lis3l02dq_core.c
index ba5bc67..c032d60 100644
--- a/drivers/staging/iio/accel/lis3l02dq_core.c
+++ b/drivers/staging/iio/accel/lis3l02dq_core.c
@@ -26,8 +26,6 @@
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
-
#include "lis3l02dq.h"
/* At the moment the spi framework doesn't allow global setting of cs_change.
diff --git a/drivers/staging/iio/accel/lis3l02dq_ring.c b/drivers/staging/iio/accel/lis3l02dq_ring.c
index 5795f82..7305c78 100644
--- a/drivers/staging/iio/accel/lis3l02dq_ring.c
+++ b/drivers/staging/iio/accel/lis3l02dq_ring.c
@@ -12,7 +12,6 @@
#include "../sysfs.h"
#include "../ring_sw.h"
#include "../kfifo_buf.h"
-#include "accel.h"
#include "../trigger.h"
#include "lis3l02dq.h"
diff --git a/drivers/staging/iio/accel/sca3000_core.c b/drivers/staging/iio/accel/sca3000_core.c
index 4313f73..993542f 100644
--- a/drivers/staging/iio/accel/sca3000_core.c
+++ b/drivers/staging/iio/accel/sca3000_core.c
@@ -22,7 +22,6 @@
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
#include "sca3000.h"
enum sca3000_variant {
diff --git a/drivers/staging/iio/accel/sca3000_ring.c b/drivers/staging/iio/accel/sca3000_ring.c
index a704c75..db9cf98 100644
--- a/drivers/staging/iio/accel/sca3000_ring.c
+++ b/drivers/staging/iio/accel/sca3000_ring.c
@@ -24,7 +24,6 @@
#include "../sysfs.h"
#include "../ring_generic.h"
#include "../ring_hw.h"
-#include "accel.h"
#include "sca3000.h"
/* RFC / future work
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 18/24] staging:iio:inclinometer.h remove as now unused.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (16 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 17/24] staging:iio:accel: usused header removals Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 19/24] staging:iio:adc: unused header removals Jonathan Cameron
` (6 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/inclinometer.h | 25 -------------------------
1 files changed, 0 insertions(+), 25 deletions(-)
diff --git a/drivers/staging/iio/accel/inclinometer.h b/drivers/staging/iio/accel/inclinometer.h
deleted file mode 100644
index faf73d7..0000000
--- a/drivers/staging/iio/accel/inclinometer.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Inclinometer related attributes
- */
-#include "../sysfs.h"
-
-#define IIO_DEV_ATTR_INCLI_X(_show, _addr) \
- IIO_DEVICE_ATTR(incli_x_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Y(_show, _addr) \
- IIO_DEVICE_ATTR(incli_y_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Z(_show, _addr) \
- IIO_DEVICE_ATTR(incli_z_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_INCLI_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_INCLI_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(incli_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_CONST_ATTR_INCLI_SCALE(_string) \
- IIO_CONST_ATTR(incli_scale, _string)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 19/24] staging:iio:adc: unused header removals.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (17 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 18/24] staging:iio:inclinometer.h remove as now unused Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 20/24] staging:iio:various header includes that should never have been Jonathan Cameron
` (5 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
More headers now not needed after iio_chan_spec conversions.
A couple of drivers were using helpers from adc.h.
Given these were trivial, they are pushed down into the drivers.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/adc/ad7298_core.c | 1 -
drivers/staging/iio/adc/ad7476_core.c | 1 -
drivers/staging/iio/adc/ad7606_core.c | 1 -
drivers/staging/iio/adc/ad7780.c | 1 -
drivers/staging/iio/adc/ad7793.c | 1 -
drivers/staging/iio/adc/ad7887_core.c | 2 +-
drivers/staging/iio/adc/ad799x_core.c | 13 +++++++++----
drivers/staging/iio/adc/max1363_core.c | 23 +++++++++++++++++------
8 files changed, 27 insertions(+), 16 deletions(-)
diff --git a/drivers/staging/iio/adc/ad7298_core.c b/drivers/staging/iio/adc/ad7298_core.c
index b8e4ae2..21d1931 100644
--- a/drivers/staging/iio/adc/ad7298_core.c
+++ b/drivers/staging/iio/adc/ad7298_core.c
@@ -18,7 +18,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "adc.h"
#include "ad7298.h"
diff --git a/drivers/staging/iio/adc/ad7476_core.c b/drivers/staging/iio/adc/ad7476_core.c
index 768f3ec..a2a4bf7 100644
--- a/drivers/staging/iio/adc/ad7476_core.c
+++ b/drivers/staging/iio/adc/ad7476_core.c
@@ -17,7 +17,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "adc.h"
#include "ad7476.h"
diff --git a/drivers/staging/iio/adc/ad7606_core.c b/drivers/staging/iio/adc/ad7606_core.c
index 459371a..dcdb180 100644
--- a/drivers/staging/iio/adc/ad7606_core.c
+++ b/drivers/staging/iio/adc/ad7606_core.c
@@ -20,7 +20,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "adc.h"
#include "ad7606.h"
diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c
index e0c7b6c..f90cdea 100644
--- a/drivers/staging/iio/adc/ad7780.c
+++ b/drivers/staging/iio/adc/ad7780.c
@@ -20,7 +20,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "adc.h"
#include "ad7780.h"
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 90f6c03..ab6f109 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -22,7 +22,6 @@
#include "../ring_generic.h"
#include "../ring_sw.h"
#include "../trigger.h"
-#include "adc.h"
#include "ad7793.h"
diff --git a/drivers/staging/iio/adc/ad7887_core.c b/drivers/staging/iio/adc/ad7887_core.c
index 3d9121e..a7da9e6 100644
--- a/drivers/staging/iio/adc/ad7887_core.c
+++ b/drivers/staging/iio/adc/ad7887_core.c
@@ -17,7 +17,7 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "adc.h"
+
#include "ad7887.h"
diff --git a/drivers/staging/iio/adc/ad799x_core.c b/drivers/staging/iio/adc/ad799x_core.c
index 92cfe2e..d42d61d 100644
--- a/drivers/staging/iio/adc/ad799x_core.c
+++ b/drivers/staging/iio/adc/ad799x_core.c
@@ -34,9 +34,8 @@
#include "../iio.h"
#include "../sysfs.h"
-
#include "../ring_generic.h"
-#include "adc.h"
+
#include "ad799x.h"
/*
@@ -336,8 +335,14 @@ static irqreturn_t ad799x_event_handler(int irq, void *private)
if (status & (1 << i))
iio_push_event(indio_dev, 0,
i & 0x1 ?
- IIO_EVENT_CODE_IN_HIGH_THRESH(i >> 1) :
- IIO_EVENT_CODE_IN_LOW_THRESH(i >> 1),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+ (i >> 1),
+ IIO_EV_TYPE_THRESH,
+ IIO_EV_DIR_RISING) :
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN,
+ (i >> 1),
+ IIO_EV_TYPE_THRESH,
+ IIO_EV_DIR_FALLING),
iio_get_time_ns());
}
diff --git a/drivers/staging/iio/adc/max1363_core.c b/drivers/staging/iio/adc/max1363_core.c
index 72b0917..3fee89e 100644
--- a/drivers/staging/iio/adc/max1363_core.c
+++ b/drivers/staging/iio/adc/max1363_core.c
@@ -33,9 +33,8 @@
#include "../iio.h"
#include "../sysfs.h"
-
#include "../ring_generic.h"
-#include "adc.h"
+
#include "max1363.h"
#define MAX1363_MODE_SINGLE(_num, _mask) { \
@@ -592,10 +591,22 @@ static int max1363_write_thresh(struct iio_dev *indio_dev,
}
static const int max1363_event_codes[] = {
- IIO_EVENT_CODE_IN_LOW_THRESH(3), IIO_EVENT_CODE_IN_HIGH_THRESH(3),
- IIO_EVENT_CODE_IN_LOW_THRESH(2), IIO_EVENT_CODE_IN_HIGH_THRESH(2),
- IIO_EVENT_CODE_IN_LOW_THRESH(1), IIO_EVENT_CODE_IN_HIGH_THRESH(1),
- IIO_EVENT_CODE_IN_LOW_THRESH(0), IIO_EVENT_CODE_IN_HIGH_THRESH(0)
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 0,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 1,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 2,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 3,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_FALLING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 0,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 1,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 2,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
+ IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, 3,
+ IIO_EV_TYPE_THRESH, IIO_EV_DIR_RISING),
};
static irqreturn_t max1363_event_handler(int irq, void *private)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 20/24] staging:iio:various header includes that should never have been.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (18 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 19/24] staging:iio:adc: unused header removals Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 21/24] staging:iio:accel:adis16204: use peak_raw info_mask element + push some defs down from header Jonathan Cameron
` (4 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
I will assume these were cut and pastes messup.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/gyro/adis16260_ring.c | 1 -
drivers/staging/iio/imu/adis16400_ring.c | 1 -
drivers/staging/iio/meter/ade7758_ring.c | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
diff --git a/drivers/staging/iio/gyro/adis16260_ring.c b/drivers/staging/iio/gyro/adis16260_ring.c
index a4df8b3..e9cff3b 100644
--- a/drivers/staging/iio/gyro/adis16260_ring.c
+++ b/drivers/staging/iio/gyro/adis16260_ring.c
@@ -13,7 +13,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
#include "../trigger.h"
#include "adis16260.h"
diff --git a/drivers/staging/iio/imu/adis16400_ring.c b/drivers/staging/iio/imu/adis16400_ring.c
index 3612373..d07c86b 100644
--- a/drivers/staging/iio/imu/adis16400_ring.c
+++ b/drivers/staging/iio/imu/adis16400_ring.c
@@ -14,7 +14,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
#include "../trigger.h"
#include "adis16400.h"
diff --git a/drivers/staging/iio/meter/ade7758_ring.c b/drivers/staging/iio/meter/ade7758_ring.c
index b89b7f8..e7a04b4 100644
--- a/drivers/staging/iio/meter/ade7758_ring.c
+++ b/drivers/staging/iio/meter/ade7758_ring.c
@@ -21,7 +21,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_sw.h"
-#include "../accel/accel.h"
#include "../trigger.h"
#include "ade7758.h"
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 21/24] staging:iio:accel:adis16204: use peak_raw info_mask element + push some defs down from header.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (19 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 20/24] staging:iio:various header includes that should never have been Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 22/24] staging:iio:accel:adis16220 iio_chan_spec conversion Jonathan Cameron
` (3 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Currently this is the only driver using some of the defines in accel.h.
If these become common we'll just add them to the channel_spec options,
for now push down into this driver.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/adis16204_core.c | 47 ++++++++++++++++------------
1 files changed, 27 insertions(+), 20 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16204_core.c b/drivers/staging/iio/accel/adis16204_core.c
index cfd09b3..c5a46fd 100644
--- a/drivers/staging/iio/accel/adis16204_core.c
+++ b/drivers/staging/iio/accel/adis16204_core.c
@@ -21,8 +21,6 @@
#include "../iio.h"
#include "../sysfs.h"
#include "../ring_generic.h"
-#include "accel.h"
-#include "../adc/adc.h"
#include "adis16204.h"
@@ -299,12 +297,15 @@ static int adis16204_initial_setup(struct iio_dev *indio_dev)
err_ret:
return ret;
}
+
+/* Unique to this driver currently */
+#define IIO_DEV_ATTR_ACCEL_XY(_show, _addr) \
+ IIO_DEVICE_ATTR(accel_xy, S_IRUGO, _show, NULL, _addr)
+#define IIO_DEV_ATTR_ACCEL_XYPEAK(_show, _addr) \
+ IIO_DEVICE_ATTR(accel_xypeak, S_IRUGO, _show, NULL, _addr)
+
static IIO_DEV_ATTR_ACCEL_XY(adis16204_read_14bit_signed,
ADIS16204_XY_RSS_OUT);
-static IIO_DEV_ATTR_ACCEL_XPEAK(adis16204_read_14bit_signed,
- ADIS16204_X_PEAK_OUT);
-static IIO_DEV_ATTR_ACCEL_YPEAK(adis16204_read_14bit_signed,
- ADIS16204_Y_PEAK_OUT);
static IIO_DEV_ATTR_ACCEL_XYPEAK(adis16204_read_14bit_signed,
ADIS16204_XY_PEAK_OUT);
static IIO_CONST_ATTR(accel_xy_scale, "0.017125");
@@ -319,13 +320,16 @@ enum adis16204_channel {
accel_y,
};
-static u8 adis16204_addresses[5][2] = {
+static u8 adis16204_addresses[5][3] = {
[in_supply] = { ADIS16204_SUPPLY_OUT },
[in_aux] = { ADIS16204_AUX_ADC },
[temp] = { ADIS16204_TEMP_OUT },
- [accel_x] = { ADIS16204_XACCL_OUT, ADIS16204_XACCL_NULL },
- [accel_y] = { ADIS16204_XACCL_OUT, ADIS16204_YACCL_NULL },
+ [accel_x] = { ADIS16204_XACCL_OUT, ADIS16204_XACCL_NULL,
+ ADIS16204_X_PEAK_OUT },
+ [accel_y] = { ADIS16204_XACCL_OUT, ADIS16204_YACCL_NULL,
+ ADIS16204_Y_PEAK_OUT },
};
+
static int adis16204_read_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int *val, int *val2,
@@ -335,6 +339,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
int bits;
u8 addr;
s16 val16;
+ int addrind;
switch (mask) {
case 0:
@@ -385,15 +390,16 @@ static int adis16204_read_raw(struct iio_dev *indio_dev,
*val = 25;
return IIO_VAL_INT;
case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
- switch (chan->type) {
- case IIO_ACCEL:
+ case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):
+ if (mask == (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE)) {
bits = 12;
- break;
- default:
- return -EINVAL;
- };
+ addrind = 1;
+ } else { /* PEAK_SEPARATE */
+ bits = 14;
+ addrind = 2;
+ }
mutex_lock(&indio_dev->mlock);
- addr = adis16204_addresses[chan->address][1];
+ addr = adis16204_addresses[chan->address][addrind];
ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);
if (ret) {
mutex_unlock(&indio_dev->mlock);
@@ -449,21 +455,22 @@ static struct iio_chan_spec adis16204_channels[] = {
IIO_ST('u', 12, 16, 0), 0),
IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
(1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
- (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+ (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
+ (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
accel_x, ADIS16204_SCAN_ACC_X,
IIO_ST('s', 14, 16, 0), 0),
IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,
(1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
- (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
+ (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
+ (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
accel_y, ADIS16204_SCAN_ACC_Y,
IIO_ST('s', 14, 16, 0), 0),
IIO_CHAN_SOFT_TIMESTAMP(5),
};
+
static struct attribute *adis16204_attributes[] = {
&iio_dev_attr_reset.dev_attr.attr,
&iio_dev_attr_accel_xy.dev_attr.attr,
- &iio_dev_attr_accel_xpeak.dev_attr.attr,
- &iio_dev_attr_accel_ypeak.dev_attr.attr,
&iio_dev_attr_accel_xypeak.dev_attr.attr,
&iio_const_attr_accel_xy_scale.dev_attr.attr,
NULL
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 22/24] staging:iio:accel:adis16220 iio_chan_spec conversion.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (20 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 21/24] staging:iio:accel:adis16204: use peak_raw info_mask element + push some defs down from header Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 23/24] staging:iio:accel remove unused accel.h header Jonathan Cameron
` (2 subsequent siblings)
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
I still have numerous issues with this driver and it
needs a substantial rewrite.
Whilst doing this patch at least one bug has been fixed (temp
reading didn't have an address) and a number of missing channel
info elements added.
Untested!
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/adis16220_core.c | 340 +++++++++++++++++-----------
1 files changed, 209 insertions(+), 131 deletions(-)
diff --git a/drivers/staging/iio/accel/adis16220_core.c b/drivers/staging/iio/accel/adis16220_core.c
index bf9ba07..590bb4b 100644
--- a/drivers/staging/iio/accel/adis16220_core.c
+++ b/drivers/staging/iio/accel/adis16220_core.c
@@ -6,9 +6,6 @@
* Licensed under the GPL-2 or later.
*/
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/gpio.h>
#include <linux/delay.h>
#include <linux/mutex.h>
#include <linux/device.h>
@@ -16,12 +13,9 @@
#include <linux/spi/spi.h>
#include <linux/slab.h>
#include <linux/sysfs.h>
-#include <linux/list.h>
#include "../iio.h"
#include "../sysfs.h"
-#include "accel.h"
-#include "../adc/adc.h"
#include "adis16220.h"
@@ -29,16 +23,15 @@
/**
* adis16220_spi_write_reg_8() - write single byte to a register
- * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @indio_dev: iio device associated with child of actual device
* @reg_address: the address of the register to be written
* @val: the value to write
**/
-static int adis16220_spi_write_reg_8(struct device *dev,
+static int adis16220_spi_write_reg_8(struct iio_dev *indio_dev,
u8 reg_address,
u8 val)
{
int ret;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_priv(indio_dev);
mutex_lock(&st->buf_lock);
@@ -53,18 +46,17 @@ static int adis16220_spi_write_reg_8(struct device *dev,
/**
* adis16220_spi_write_reg_16() - write 2 bytes to a pair of registers
- * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @indio_dev: iio device associated with child of actual device
* @reg_address: the address of the lower of the two registers. Second register
* is assumed to have address one greater.
* @val: value to be written
**/
-static int adis16220_spi_write_reg_16(struct device *dev,
+static int adis16220_spi_write_reg_16(struct iio_dev *indio_dev,
u8 lower_reg_address,
u16 value)
{
int ret;
struct spi_message msg;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_priv(indio_dev);
struct spi_transfer xfers[] = {
{
@@ -77,7 +69,6 @@ static int adis16220_spi_write_reg_16(struct device *dev,
.tx_buf = st->tx + 2,
.bits_per_word = 8,
.len = 2,
- .cs_change = 1,
.delay_usecs = 35,
},
};
@@ -99,17 +90,16 @@ static int adis16220_spi_write_reg_16(struct device *dev,
/**
* adis16220_spi_read_reg_16() - read 2 bytes from a 16-bit register
- * @dev: device associated with child of actual device (iio_dev or iio_trig)
+ * @indio_dev: iio device associated with child of actual device
* @reg_address: the address of the lower of the two registers. Second register
* is assumed to have address one greater.
* @val: somewhere to pass back the value read
**/
-static int adis16220_spi_read_reg_16(struct device *dev,
- u8 lower_reg_address,
- u16 *val)
+static int adis16220_spi_read_reg_16(struct iio_dev *indio_dev,
+ u8 lower_reg_address,
+ u16 *val)
{
struct spi_message msg;
- struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16220_state *st = iio_priv(indio_dev);
int ret;
struct spi_transfer xfers[] = {
@@ -149,52 +139,23 @@ error_ret:
return ret;
}
-static ssize_t adis16220_spi_read_signed(struct device *dev,
- struct device_attribute *attr,
- char *buf,
- unsigned bits)
-{
- int ret;
- s16 val = 0;
- unsigned shift = 16 - bits;
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-
- ret = adis16220_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
- if (ret)
- return ret;
-
- val = ((s16)(val << shift) >> shift);
- return sprintf(buf, "%d\n", val);
-}
-
-static ssize_t adis16220_read_12bit_unsigned(struct device *dev,
- struct device_attribute *attr,
- char *buf)
-{
- int ret;
- u16 val = 0;
- struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
-
- ret = adis16220_spi_read_reg_16(dev, this_attr->address, &val);
- if (ret)
- return ret;
-
- return sprintf(buf, "%u\n", val & 0x0FFF);
-}
-
static ssize_t adis16220_read_16bit(struct device *dev,
struct device_attribute *attr,
char *buf)
{
+ struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
struct iio_dev *indio_dev = dev_get_drvdata(dev);
ssize_t ret;
+ s16 val = 0;
/* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock);
- ret = adis16220_spi_read_signed(dev, attr, buf, 16);
+ ret = adis16220_spi_read_reg_16(indio_dev, this_attr->address,
+ (u16 *)&val);
mutex_unlock(&indio_dev->mlock);
-
- return ret;
+ if (ret)
+ return ret;
+ return sprintf(buf, "%d\n", val);
}
static ssize_t adis16220_write_16bit(struct device *dev,
@@ -202,6 +163,7 @@ static ssize_t adis16220_write_16bit(struct device *dev,
const char *buf,
size_t len)
{
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret;
long val;
@@ -209,34 +171,34 @@ static ssize_t adis16220_write_16bit(struct device *dev,
ret = strict_strtol(buf, 10, &val);
if (ret)
goto error_ret;
- ret = adis16220_spi_write_reg_16(dev, this_attr->address, val);
+ ret = adis16220_spi_write_reg_16(indio_dev, this_attr->address, val);
error_ret:
return ret ? ret : len;
}
-static int adis16220_capture(struct device *dev)
+static int adis16220_capture(struct iio_dev *indio_dev)
{
int ret;
- ret = adis16220_spi_write_reg_16(dev,
+ ret = adis16220_spi_write_reg_16(indio_dev,
ADIS16220_GLOB_CMD,
0xBF08); /* initiates a manual data capture */
if (ret)
- dev_err(dev, "problem beginning capture");
+ dev_err(&indio_dev->dev, "problem beginning capture");
msleep(10); /* delay for capture to finish */
return ret;
}
-static int adis16220_reset(struct device *dev)
+static int adis16220_reset(struct iio_dev *indio_dev)
{
int ret;
- ret = adis16220_spi_write_reg_8(dev,
+ ret = adis16220_spi_write_reg_8(indio_dev,
ADIS16220_GLOB_CMD,
ADIS16220_GLOB_CMD_SW_RESET);
if (ret)
- dev_err(dev, "problem resetting device");
+ dev_err(&indio_dev->dev, "problem resetting device");
return ret;
}
@@ -245,72 +207,84 @@ static ssize_t adis16220_write_reset(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
- if (len < 1)
- return -1;
- switch (buf[0]) {
- case '1':
- case 'y':
- case 'Y':
- return adis16220_reset(dev) == 0 ? len : -EIO;
- }
- return -1;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ bool val;
+ int ret;
+
+ ret = strtobool(buf, &val);
+ if (ret)
+ return ret;
+ if (!val)
+ return -EINVAL;
+
+ ret = adis16220_reset(indio_dev);
+ if (ret)
+ return ret;
+ return len;
}
static ssize_t adis16220_write_capture(struct device *dev,
struct device_attribute *attr,
const char *buf, size_t len)
{
- if (len < 1)
- return -1;
- switch (buf[0]) {
- case '1':
- case 'y':
- case 'Y':
- return adis16220_capture(dev) == 0 ? len : -EIO;
- }
- return -1;
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
+ bool val;
+ int ret;
+
+ ret = strtobool(buf, &val);
+ if (ret)
+ return ret;
+ if (!val)
+ return -EINVAL;
+ ret = adis16220_capture(indio_dev);
+ if (ret)
+ return ret;
+
+ return len;
}
-static int adis16220_check_status(struct device *dev)
+static int adis16220_check_status(struct iio_dev *indio_dev)
{
u16 status;
int ret;
- ret = adis16220_spi_read_reg_16(dev, ADIS16220_DIAG_STAT, &status);
+ ret = adis16220_spi_read_reg_16(indio_dev, ADIS16220_DIAG_STAT,
+ &status);
if (ret < 0) {
- dev_err(dev, "Reading status failed\n");
+ dev_err(&indio_dev->dev, "Reading status failed\n");
goto error_ret;
}
ret = status & 0x7F;
if (status & ADIS16220_DIAG_STAT_VIOLATION)
- dev_err(dev, "Capture period violation/interruption\n");
+ dev_err(&indio_dev->dev,
+ "Capture period violation/interruption\n");
if (status & ADIS16220_DIAG_STAT_SPI_FAIL)
- dev_err(dev, "SPI failure\n");
+ dev_err(&indio_dev->dev, "SPI failure\n");
if (status & ADIS16220_DIAG_STAT_FLASH_UPT)
- dev_err(dev, "Flash update failed\n");
+ dev_err(&indio_dev->dev, "Flash update failed\n");
if (status & ADIS16220_DIAG_STAT_POWER_HIGH)
- dev_err(dev, "Power supply above 3.625V\n");
+ dev_err(&indio_dev->dev, "Power supply above 3.625V\n");
if (status & ADIS16220_DIAG_STAT_POWER_LOW)
- dev_err(dev, "Power supply below 3.15V\n");
+ dev_err(&indio_dev->dev, "Power supply below 3.15V\n");
error_ret:
return ret;
}
-static int adis16220_self_test(struct device *dev)
+static int adis16220_self_test(struct iio_dev *indio_dev)
{
int ret;
- ret = adis16220_spi_write_reg_16(dev,
+ ret = adis16220_spi_write_reg_16(indio_dev,
ADIS16220_MSC_CTRL,
ADIS16220_MSC_CTRL_SELF_TEST_EN);
if (ret) {
- dev_err(dev, "problem starting self test");
+ dev_err(&indio_dev->dev, "problem starting self test");
goto err_ret;
}
- adis16220_check_status(dev);
+ adis16220_check_status(indio_dev);
err_ret:
return ret;
@@ -319,24 +293,23 @@ err_ret:
static int adis16220_initial_setup(struct iio_dev *indio_dev)
{
int ret;
- struct device *dev = &indio_dev->dev;
/* Do self test */
- ret = adis16220_self_test(dev);
+ ret = adis16220_self_test(indio_dev);
if (ret) {
- dev_err(dev, "self test failure");
+ dev_err(&indio_dev->dev, "self test failure");
goto err_ret;
}
/* Read status register to check the result */
- ret = adis16220_check_status(dev);
+ ret = adis16220_check_status(indio_dev);
if (ret) {
- adis16220_reset(dev);
- dev_err(dev, "device not playing ball -> reset");
+ adis16220_reset(indio_dev);
+ dev_err(&indio_dev->dev, "device not playing ball -> reset");
msleep(ADIS16220_STARTUP_DELAY);
- ret = adis16220_check_status(dev);
+ ret = adis16220_check_status(indio_dev);
if (ret) {
- dev_err(dev, "giving up");
+ dev_err(&indio_dev->dev, "giving up");
goto err_ret;
}
}
@@ -381,7 +354,7 @@ static ssize_t adis16220_capture_buffer_read(struct iio_dev *indio_dev,
count = ADIS16220_CAPTURE_SIZE - off;
/* write the begin position of capture buffer */
- ret = adis16220_spi_write_reg_16(&indio_dev->dev,
+ ret = adis16220_spi_write_reg_16(indio_dev,
ADIS16220_CAPT_PNTR,
off > 1);
if (ret)
@@ -480,24 +453,6 @@ static struct bin_attribute adc2_bin = {
.size = ADIS16220_CAPTURE_SIZE,
};
-static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16220_read_12bit_unsigned,
- ADIS16220_CAPT_SUPPLY);
-static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.0012207");
-static IIO_DEV_ATTR_ACCEL(adis16220_read_16bit, ADIS16220_CAPT_BUFA);
-static IIO_DEVICE_ATTR(accel_peak_raw, S_IRUGO, adis16220_read_16bit,
- NULL, ADIS16220_CAPT_PEAKA);
-static IIO_DEV_ATTR_ACCEL_OFFSET(S_IWUSR | S_IRUGO,
- adis16220_read_16bit,
- adis16220_write_16bit,
- ADIS16220_ACCL_NULL);
-static IIO_CONST_ATTR_ACCEL_SCALE("0.18704223545");
-static IIO_DEV_ATTR_TEMP_RAW(adis16220_read_12bit_unsigned);
-static IIO_CONST_ATTR_TEMP_OFFSET("25");
-static IIO_CONST_ATTR_TEMP_SCALE("-0.47");
-
-static IIO_DEV_ATTR_IN_RAW(1, adis16220_read_16bit, ADIS16220_CAPT_BUF1);
-static IIO_DEV_ATTR_IN_RAW(2, adis16220_read_16bit, ADIS16220_CAPT_BUF2);
-
static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL,
adis16220_write_reset, 0);
@@ -514,21 +469,142 @@ static IIO_DEV_ATTR_CAPTURE_COUNT(S_IWUSR | S_IRUGO,
adis16220_write_16bit,
ADIS16220_CAPT_PNTR);
-static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("100200");
+enum adis16220_channel {
+ in_supply, in_1, in_2, accel, temp
+};
+
+struct adis16220_address_spec {
+ u8 addr;
+ u8 bits;
+ bool sign;
+};
+
+/* Address / bits / signed */
+static const struct adis16220_address_spec adis16220_addresses[][3] = {
+ [in_supply] = { { ADIS16220_CAPT_SUPPLY, 12, 0 }, },
+ [in_1] = { { ADIS16220_CAPT_BUF1, 16, 1 },
+ { ADIS16220_AIN1_NULL, 16, 1 },
+ { ADIS16220_CAPT_PEAK1, 16, 1 }, },
+ [in_2] = { { ADIS16220_CAPT_BUF2, 16, 1 },
+ { ADIS16220_AIN2_NULL, 16, 1 },
+ { ADIS16220_CAPT_PEAK2, 16, 1 }, },
+ [accel] = { { ADIS16220_CAPT_BUFA, 16, 1 },
+ { ADIS16220_ACCL_NULL, 16, 1 },
+ { ADIS16220_CAPT_PEAKA, 16, 1 }, },
+ [temp] = { { ADIS16220_CAPT_TEMP, 12, 0 }, }
+};
+
+static int adis16220_read_raw(struct iio_dev *indio_dev,
+ struct iio_chan_spec const *chan,
+ int *val, int *val2,
+ long mask)
+{
+ int ret = -EINVAL;
+ int addrind = 0;
+ u16 uval;
+ s16 sval;
+ u8 bits;
+
+ switch (mask) {
+ case 0:
+ addrind = 0;
+ break;
+ case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
+ if (chan->type == IIO_TEMP) {
+ *val = 25;
+ return IIO_VAL_INT;
+ }
+ addrind = 1;
+ break;
+ case (1 << IIO_CHAN_INFO_PEAK_SEPARATE):
+ addrind = 2;
+ break;
+ case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
+ *val = 0;
+ switch (chan->type) {
+ case IIO_TEMP:
+ *val2 = -470000;
+ return IIO_VAL_INT_PLUS_MICRO;
+ case IIO_ACCEL:
+ *val2 = 1887042;
+ return IIO_VAL_INT_PLUS_MICRO;
+ case IIO_IN:
+ if (chan->channel == 0)
+ *val2 = 0012221;
+ else /* Should really be dependent on VDD */
+ *val2 = 305;
+ return IIO_VAL_INT_PLUS_MICRO;
+ default:
+ return -EINVAL;
+ }
+ default:
+ return -EINVAL;
+ }
+ if (adis16220_addresses[chan->address][addrind].sign) {
+ ret = adis16220_spi_read_reg_16(indio_dev,
+ adis16220_addresses[chan
+ ->address]
+ [addrind].addr,
+ &sval);
+ if (ret)
+ return ret;
+ bits = adis16220_addresses[chan->address][addrind].bits;
+ sval &= (1 << bits) - 1;
+ sval = (s16)(sval << (16 - bits)) >> (16 - bits);
+ *val = sval;
+ return IIO_VAL_INT;
+ } else {
+ ret = adis16220_spi_read_reg_16(indio_dev,
+ adis16220_addresses[chan
+ ->address]
+ [addrind].addr,
+ &uval);
+ if (ret)
+ return ret;
+ bits = adis16220_addresses[chan->address][addrind].bits;
+ uval &= (1 << bits) - 1;
+ *val = uval;
+ return IIO_VAL_INT;
+ }
+}
+
+static const struct iio_chan_spec adis16220_channels[] = {
+ {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 0,
+ .extend_name = "supply",
+ .info_mask = (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+ .address = in_supply,
+ }, {
+ .type = IIO_ACCEL,
+ .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
+ (1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
+ (1 << IIO_CHAN_INFO_PEAK_SEPARATE),
+ .address = accel,
+ }, {
+ .type = IIO_TEMP,
+ .indexed = 1,
+ .channel = 0,
+ .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
+ (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+ .address = temp,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 1,
+ .info_mask = (1 << IIO_CHAN_INFO_OFFSET_SEPARATE) |
+ (1 << IIO_CHAN_INFO_SCALE_SEPARATE),
+ .address = in_1,
+ }, {
+ .type = IIO_IN,
+ .indexed = 1,
+ .channel = 2,
+ .address = in_2,
+ }
+};
static struct attribute *adis16220_attributes[] = {
- &iio_dev_attr_in0_supply_raw.dev_attr.attr,
- &iio_const_attr_in0_supply_scale.dev_attr.attr,
- &iio_dev_attr_accel_raw.dev_attr.attr,
- &iio_dev_attr_accel_offset.dev_attr.attr,
- &iio_dev_attr_accel_peak_raw.dev_attr.attr,
- &iio_const_attr_accel_scale.dev_attr.attr,
- &iio_dev_attr_temp_raw.dev_attr.attr,
- &iio_dev_attr_in1_raw.dev_attr.attr,
- &iio_dev_attr_in2_raw.dev_attr.attr,
- &iio_const_attr_temp_offset.dev_attr.attr,
- &iio_const_attr_temp_scale.dev_attr.attr,
- &iio_const_attr_sampling_frequency_available.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr,
&iio_dev_attr_capture.dev_attr.attr,
&iio_dev_attr_capture_count.dev_attr.attr,
@@ -542,7 +618,9 @@ static const struct attribute_group adis16220_attribute_group = {
static const struct iio_info adis16220_info = {
.attrs = &adis16220_attribute_group,
.driver_module = THIS_MODULE,
+ .read_raw = &adis16220_read_raw,
};
+
static int __devinit adis16220_probe(struct spi_device *spi)
{
int ret, regdone = 0;
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 23/24] staging:iio:accel remove unused accel.h header.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (21 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 22/24] staging:iio:accel:adis16220 iio_chan_spec conversion Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-29 11:51 ` [PATCH 24/24] staging:iio:adc remove unused adc.h Jonathan Cameron
2011-06-30 14:53 ` [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
The chan spec conversions and a small amount of pushdown of defines
mean this header is no longer used.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/accel/accel.h | 87 -------------------------------------
1 files changed, 0 insertions(+), 87 deletions(-)
diff --git a/drivers/staging/iio/accel/accel.h b/drivers/staging/iio/accel/accel.h
deleted file mode 100644
index 50651f8..0000000
--- a/drivers/staging/iio/accel/accel.h
+++ /dev/null
@@ -1,87 +0,0 @@
-
-#include "../sysfs.h"
-
-/* Accelerometer types of attribute */
-#define IIO_DEV_ATTR_ACCEL_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_X_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_x_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Y_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_y_offset, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Z_OFFSET(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_z_offset, _mode, _show, _store, _addr)
-
-#define IIO_CONST_ATTR_ACCEL_SCALE(_string) \
- IIO_CONST_ATTR(accel_scale, _string)
-
-#define IIO_DEV_ATTR_ACCEL_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_X_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_x_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Y_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_y_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Z_SCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_z_scale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_X_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_x_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Y_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_y_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Z_CALIBBIAS(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_z_calibbias, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_X_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_x_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Y_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_y_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Z_CALIBSCALE(_mode, _show, _store, _addr) \
- IIO_DEVICE_ATTR(accel_z_calibscale, _mode, _show, _store, _addr)
-
-#define IIO_DEV_ATTR_ACCEL(_show, _addr) \
- IIO_DEVICE_ATTR(accel_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_X(_show, _addr) \
- IIO_DEVICE_ATTR(accel_x_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Y(_show, _addr) \
- IIO_DEVICE_ATTR(accel_y_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_Z(_show, _addr) \
- IIO_DEVICE_ATTR(accel_z_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_XY(_show, _addr) \
- IIO_DEVICE_ATTR(accel_xy, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_PEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_peak, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_XPEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_xpeak, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_YPEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_ypeak, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_ZPEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_zpeak, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_XYPEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_xypeak, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_ACCEL_XYZPEAK(_show, _addr) \
- IIO_DEVICE_ATTR(accel_xyzpeak, S_IRUGO, _show, NULL, _addr)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* [PATCH 24/24] staging:iio:adc remove unused adc.h.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (22 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 23/24] staging:iio:accel remove unused accel.h header Jonathan Cameron
@ 2011-06-29 11:51 ` Jonathan Cameron
2011-06-30 14:53 ` [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-29 11:51 UTC (permalink / raw)
To: linux-iio; +Cc: device-drivers-devel, ldewangan, shubhrajyoti, Jonathan Cameron
Another header unused after chan_spec conversions.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
---
drivers/staging/iio/adc/adc.h | 42 -----------------------------------------
1 files changed, 0 insertions(+), 42 deletions(-)
diff --git a/drivers/staging/iio/adc/adc.h b/drivers/staging/iio/adc/adc.h
deleted file mode 100644
index 40c5949..0000000
--- a/drivers/staging/iio/adc/adc.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * adc.h - sysfs attributes associated with ADCs
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * Copyright (c) 2008 Jonathan Cameron <jic23@cam.ac.uk>
- *
- */
-
-/* Deprecated */
-#define IIO_DEV_ATTR_ADC(_num, _show, _addr) \
- IIO_DEVICE_ATTR(adc_##_num, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_IN_RAW(_num, _show, _addr) \
- IIO_DEVICE_ATTR(in##_num##_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_IN_NAMED_RAW(_num, _name, _show, _addr) \
- IIO_DEVICE_ATTR(in##_num##_##_name##_raw, S_IRUGO, _show, NULL, _addr)
-
-#define IIO_DEV_ATTR_IN_DIFF_RAW(_nump, _numn, _show, _addr) \
- IIO_DEVICE_ATTR_NAMED(in##_nump##min##_numn##_raw, \
- in##_nump-in##_numn##_raw, \
- S_IRUGO, \
- _show, \
- NULL, \
- _addr)
-
-
-#define IIO_CONST_ATTR_IN_NAMED_OFFSET(_num, _name, _string) \
- IIO_CONST_ATTR(in##_num##_##_name##_offset, _string)
-
-#define IIO_CONST_ATTR_IN_NAMED_SCALE(_num, _name, _string) \
- IIO_CONST_ATTR(in##_num##_##_name##_scale, _string)
-
-#define IIO_EVENT_CODE_IN_HIGH_THRESH(a) \
- IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH, \
- IIO_EV_DIR_RISING)
-#define IIO_EVENT_CODE_IN_LOW_THRESH(a) \
- IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH, \
- IIO_EV_DIR_FALLING)
--
1.7.3.4
^ permalink raw reply related [flat|nested] 27+ messages in thread
* Re: [Device-drivers-devel] [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write.
2011-06-29 11:51 ` [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write Jonathan Cameron
@ 2011-06-30 14:10 ` Michael Hennerich
0 siblings, 0 replies; 27+ messages in thread
From: Michael Hennerich @ 2011-06-30 14:10 UTC (permalink / raw)
To: Jonathan Cameron
Cc: linux-iio@vger.kernel.org, ldewangan@nvidia.com,
shubhrajyoti@ti.com, device-drivers-devel@blackfin.uclinux.org
On 06/29/2011 01:51 PM, Jonathan Cameron wrote:
> This needs confirmation that the devices is happy if another part is
> talked to in between the request for a register and the read back.
I don't see a reason why this could break.
Acked-by: Michael Hennerich <michael.hennerich@analog.com>
> Signed-off-by: Jonathan Cameron<jic23@cam.ac.uk>
> ---
> drivers/staging/iio/gyro/adxrs450_core.c | 63 ++++++++----------------------
> 1 files changed, 17 insertions(+), 46 deletions(-)
>
> diff --git a/drivers/staging/iio/gyro/adxrs450_core.c b/drivers/staging/iio/gyro/adxrs450_core.c
> index a756262..2d2916c 100644
> --- a/drivers/staging/iio/gyro/adxrs450_core.c
> +++ b/drivers/staging/iio/gyro/adxrs450_core.c
> @@ -35,21 +35,8 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
> u8 reg_address,
> u16 *val)
> {
> - struct spi_message msg;
> struct adxrs450_state *st = iio_priv(indio_dev);
> int ret;
> - struct spi_transfer xfers[] = {
> - {
> - .tx_buf = st->tx,
> - .bits_per_word = 8,
> - .len = 4,
> - .cs_change = 1,
> - }, {
> - .rx_buf = st->rx,
> - .bits_per_word = 8,
> - .len = 4,
> - },
> - };
>
> mutex_lock(&st->buf_lock);
> st->tx[0] = ADXRS450_READ_DATA | (reg_address>> 7);
> @@ -60,10 +47,13 @@ static int adxrs450_spi_read_reg_16(struct iio_dev *indio_dev,
> if (!(hweight32(be32_to_cpu(*(u32 *)st->tx))& 1))
> st->tx[3] |= ADXRS450_P;
>
> - spi_message_init(&msg);
> - spi_message_add_tail(&xfers[0],&msg);
> - spi_message_add_tail(&xfers[1],&msg);
> - ret = spi_sync(st->us,&msg);
> + ret = spi_write(st->us, st->tx, 4);
> + if (ret) {
> + dev_err(&st->us->dev, "problem while reading 16 bit register 0x%02x\n",
> + reg_address);
> + goto error_ret;
> + }
> + ret = spi_read(st->us, st->rx, 4);
> if (ret) {
> dev_err(&st->us->dev, "problem while reading 16 bit register 0x%02x\n",
> reg_address);
> @@ -88,15 +78,8 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
> u8 reg_address,
> u16 val)
> {
> - struct spi_message msg;
> struct adxrs450_state *st = iio_priv(indio_dev);
> int ret;
> - struct spi_transfer xfers = {
> - .tx_buf = st->tx,
> - .rx_buf = st->rx,
> - .bits_per_word = 8,
> - .len = 4,
> - };
>
> mutex_lock(&st->buf_lock);
> st->tx[0] = ADXRS450_WRITE_DATA | reg_address>> 7;
> @@ -105,14 +88,12 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
> st->tx[3] = val<< 1;
>
> if (!(hweight32(be32_to_cpu(*(u32 *)st->tx))& 1))
> - st->tx[3] |= ADXRS450_P;
> + st->tx[3] |= ADXRS450_P;
>
> - spi_message_init(&msg);
> - spi_message_add_tail(&xfers,&msg);
> - ret = spi_sync(st->us,&msg);
> + ret = spi_write(st->us, st->tx, 4);
> if (ret)
> dev_err(&st->us->dev, "problem while writing 16 bit register 0x%02x\n",
> - reg_address);
> + reg_address);
> msleep(1); /* enforce sequential transfer delay 0.1ms */
> mutex_unlock(&st->buf_lock);
> return ret;
> @@ -125,21 +106,8 @@ static int adxrs450_spi_write_reg_16(struct iio_dev *indio_dev,
> **/
> static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
> {
> - struct spi_message msg;
> struct adxrs450_state *st = iio_priv(indio_dev);
> int ret;
> - struct spi_transfer xfers[] = {
> - {
> - .tx_buf = st->tx,
> - .bits_per_word = 8,
> - .len = 4,
> - .cs_change = 1,
> - }, {
> - .rx_buf = st->rx,
> - .bits_per_word = 8,
> - .len = 4,
> - },
> - };
>
> mutex_lock(&st->buf_lock);
> st->tx[0] = ADXRS450_SENSOR_DATA;
> @@ -147,10 +115,13 @@ static int adxrs450_spi_sensor_data(struct iio_dev *indio_dev, s16 *val)
> st->tx[2] = 0;
> st->tx[3] = 0;
>
> - spi_message_init(&msg);
> - spi_message_add_tail(&xfers[0],&msg);
> - spi_message_add_tail(&xfers[1],&msg);
> - ret = spi_sync(st->us,&msg);
> + ret = spi_write(st->us, st->tx, 4);
> + if (ret) {
> + dev_err(&st->us->dev, "Problem while reading sensor data\n");
> + goto error_ret;
> + }
> +
> + ret = spi_read(st->us, st->rx, 4);
> if (ret) {
> dev_err(&st->us->dev, "Problem while reading sensor data\n");
> goto error_ret;
--
Greetings,
Michael
--
Analog Devices GmbH Wilhelm-Wagenfeld-Str. 6 80807 Muenchen
Sitz der Gesellschaft: Muenchen; Registergericht: Muenchen HRB 40368;
Geschaeftsfuehrer:Dr.Carsten Suckrow, Thomas Wessel, William A. Martin,
Margaret Seif
^ permalink raw reply [flat|nested] 27+ messages in thread
* Re: [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup.
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
` (23 preceding siblings ...)
2011-06-29 11:51 ` [PATCH 24/24] staging:iio:adc remove unused adc.h Jonathan Cameron
@ 2011-06-30 14:53 ` Jonathan Cameron
24 siblings, 0 replies; 27+ messages in thread
From: Jonathan Cameron @ 2011-06-30 14:53 UTC (permalink / raw)
To: Jonathan Cameron; +Cc: linux-iio, device-drivers-devel, ldewangan, shubhrajyoti
Sorry all. I've messed up the channel conversion patches in this series by
actually failing to set num_channels in any of them.
Will fix and repost and check I haven't made this particularly incompetent mistake
in previous patches...
Jonathan
> This series is intended to remove the last few users of accel.h, gyro.h, magnet.h
> and adc.h.
>
> There are a fair few cleanps along the way including some bug fixes.
>
> A few of these drivers are still in 'interesting' condition, but this
> is at least a step in the right direction. Taking them further probably
> requires test hardware. Note this set is build tested only.
> (obviously for simple header removal that's enough, but others could do with
> testing if anyone has the hardware).
>
> All comments welcome.
>
> At some point we'll want to do the same for dds, resolver, dac and light.
> If anyone else wants to take one of those, feel free. *looks around hopefuly*
>
>
> This sits on top of
>
> staging:iio:triggers introduce iio_trigger_ops to take const bits out of iio_trig_structure.
> + the dev_data removal patch and the tsl2583 one that Jon is testing.
>
> Thanks all - looking like 3.1 is going to be a cleanup cycle for IIO
> rather than anything particularly ground breaking. Of course it's
> relatively early days yet!
>
> Thanks,
>
> Jonathan
>
> Jonathan Cameron (24):
> staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec.
> staging:iio: add quadrature correction to chan info types.
> staging:iio:gyro:adxrs450 move to iio_chan_spec registration
> staging:iio:gyro:adxrs450 make more use of spi_read and spi_write.
> staging:iio:gyro:adxrs450 squish some trivial single call point
> wrappers functions.
> staging:iio:gyro:adis16080 convert to iio_chan_spec.
> staging:iio:gyro:adis16260 remove some unused headers
> staging:iio:imu:adis16400 remove unused headers.
> staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups.
> staging:iio:magnetometer:hmc5843 iio_chan_spec conversion.
> staging:iio:magnetometer: remove unused header magnet.h
> staging:iio:gyro:adis16130 fix adis16130_spi_read which was never
> selecting the channel
> staging:iio:gyro:adis16130 drop control of adc resolution.
> staging:iio:gyro:adis16130 move to iio_chan_spec registration.
> staging:iio:gyro:adis16060 convert to iio_chan_spec
> staging:iio:gyro: remove gyro.h
> staging:iio:accel: usused header removals.
> staging:iio:inclinometer.h remove as now unused.
> staging:iio:adc: unused header removals.
> staging:iio:various header includes that should never have been.
> staging:iio:accel:adis16204: use peak_raw info_mask element + push
> some defs down from header.
> staging:iio:accel:adis16220 iio_chan_spec conversion.
> staging:iio:accel remove unused accel.h header.
> staging:iio:adc remove unused adc.h.
>
> drivers/staging/iio/accel/accel.h | 87 -------
> drivers/staging/iio/accel/adis16201_core.c | 4 -
> drivers/staging/iio/accel/adis16201_ring.c | 1 -
> drivers/staging/iio/accel/adis16203_core.c | 3 -
> drivers/staging/iio/accel/adis16203_ring.c | 1 -
> drivers/staging/iio/accel/adis16204_core.c | 47 +++--
> drivers/staging/iio/accel/adis16204_ring.c | 1 -
> drivers/staging/iio/accel/adis16209_core.c | 3 -
> drivers/staging/iio/accel/adis16209_ring.c | 1 -
> drivers/staging/iio/accel/adis16220_core.c | 340 +++++++++++++++++-----------
> drivers/staging/iio/accel/adis16240_core.c | 2 -
> drivers/staging/iio/accel/adis16240_ring.c | 1 -
> drivers/staging/iio/accel/inclinometer.h | 25 --
> drivers/staging/iio/accel/kxsd9.c | 267 +++++++++-------------
> drivers/staging/iio/accel/lis3l02dq_core.c | 2 -
> drivers/staging/iio/accel/lis3l02dq_ring.c | 1 -
> drivers/staging/iio/accel/sca3000_core.c | 1 -
> drivers/staging/iio/accel/sca3000_ring.c | 1 -
> drivers/staging/iio/adc/ad7298_core.c | 1 -
> drivers/staging/iio/adc/ad7476_core.c | 1 -
> drivers/staging/iio/adc/ad7606_core.c | 1 -
> drivers/staging/iio/adc/ad7780.c | 1 -
> drivers/staging/iio/adc/ad7793.c | 1 -
> drivers/staging/iio/adc/ad7887_core.c | 2 +-
> drivers/staging/iio/adc/ad799x_core.c | 13 +-
> drivers/staging/iio/adc/adc.h | 42 ----
> drivers/staging/iio/adc/max1363_core.c | 23 ++-
> drivers/staging/iio/gyro/adis16060_core.c | 113 +++++-----
> drivers/staging/iio/gyro/adis16080_core.c | 91 ++++----
> drivers/staging/iio/gyro/adis16130_core.c | 143 ++++---------
> drivers/staging/iio/gyro/adis16260_core.c | 2 -
> drivers/staging/iio/gyro/adis16260_ring.c | 1 -
> drivers/staging/iio/gyro/adxrs450_core.c | 251 +++++++++------------
> drivers/staging/iio/gyro/gyro.h | 85 -------
> drivers/staging/iio/iio.h | 3 +
> drivers/staging/iio/imu/adis16400_core.c | 5 -
> drivers/staging/iio/imu/adis16400_ring.c | 1 -
> drivers/staging/iio/industrialio-core.c | 2 +
> drivers/staging/iio/magnetometer/ak8975.c | 213 +++++++++---------
> drivers/staging/iio/magnetometer/hmc5843.c | 95 ++++----
> drivers/staging/iio/magnetometer/magnet.h | 31 ---
> drivers/staging/iio/meter/ade7758_ring.c | 1 -
> 42 files changed, 782 insertions(+), 1128 deletions(-)
> delete mode 100644 drivers/staging/iio/accel/accel.h
> delete mode 100644 drivers/staging/iio/accel/inclinometer.h
> delete mode 100644 drivers/staging/iio/adc/adc.h
> delete mode 100644 drivers/staging/iio/gyro/gyro.h
> delete mode 100644 drivers/staging/iio/magnetometer/magnet.h
>
^ permalink raw reply [flat|nested] 27+ messages in thread
end of thread, other threads:[~2011-06-30 14:53 UTC | newest]
Thread overview: 27+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-06-29 11:51 [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
2011-06-29 11:51 ` [PATCH 01/24] staging:iio:accel:kxsd9 cleanup and conversion to iio_chan_spec Jonathan Cameron
2011-06-29 11:51 ` [PATCH 02/24] staging:iio: add quadrature correction to chan info types Jonathan Cameron
2011-06-29 11:51 ` [PATCH 03/24] staging:iio:gyro:adxrs450 move to iio_chan_spec registration Jonathan Cameron
2011-06-29 11:51 ` [PATCH 04/24] staging:iio:gyro:adxrs450 make more use of spi_read and spi_write Jonathan Cameron
2011-06-30 14:10 ` [Device-drivers-devel] " Michael Hennerich
2011-06-29 11:51 ` [PATCH 05/24] staging:iio:gyro:adxrs450 squish some trivial single call point wrappers functions Jonathan Cameron
2011-06-29 11:51 ` [PATCH 06/24] staging:iio:gyro:adis16080 convert to iio_chan_spec Jonathan Cameron
2011-06-29 11:51 ` [PATCH 07/24] staging:iio:gyro:adis16260 remove some unused headers Jonathan Cameron
2011-06-29 11:51 ` [PATCH 08/24] staging:iio:imu:adis16400 remove " Jonathan Cameron
2011-06-29 11:51 ` [PATCH 09/24] staging:iio:magnetometer:ak8975 convert to iio_chan_spec + cleanups Jonathan Cameron
2011-06-29 11:51 ` [PATCH 10/24] staging:iio:magnetometer:hmc5843 iio_chan_spec conversion Jonathan Cameron
2011-06-29 11:51 ` [PATCH 11/24] staging:iio:magnetometer: remove unused header magnet.h Jonathan Cameron
2011-06-29 11:51 ` [PATCH 12/24] staging:iio:gyro:adis16130 fix adis16130_spi_read which was never selecting the channel Jonathan Cameron
2011-06-29 11:51 ` [PATCH 13/24] staging:iio:gyro:adis16130 drop control of adc resolution Jonathan Cameron
2011-06-29 11:51 ` [PATCH 14/24] staging:iio:gyro:adis16130 move to iio_chan_spec registration Jonathan Cameron
2011-06-29 11:51 ` [PATCH 15/24] staging:iio:gyro:adis16060 convert to iio_chan_spec Jonathan Cameron
2011-06-29 11:51 ` [PATCH 16/24] staging:iio:gyro: remove gyro.h Jonathan Cameron
2011-06-29 11:51 ` [PATCH 17/24] staging:iio:accel: usused header removals Jonathan Cameron
2011-06-29 11:51 ` [PATCH 18/24] staging:iio:inclinometer.h remove as now unused Jonathan Cameron
2011-06-29 11:51 ` [PATCH 19/24] staging:iio:adc: unused header removals Jonathan Cameron
2011-06-29 11:51 ` [PATCH 20/24] staging:iio:various header includes that should never have been Jonathan Cameron
2011-06-29 11:51 ` [PATCH 21/24] staging:iio:accel:adis16204: use peak_raw info_mask element + push some defs down from header Jonathan Cameron
2011-06-29 11:51 ` [PATCH 22/24] staging:iio:accel:adis16220 iio_chan_spec conversion Jonathan Cameron
2011-06-29 11:51 ` [PATCH 23/24] staging:iio:accel remove unused accel.h header Jonathan Cameron
2011-06-29 11:51 ` [PATCH 24/24] staging:iio:adc remove unused adc.h Jonathan Cameron
2011-06-30 14:53 ` [PATCH 00/24] staging:iio: move chan_spec conversions and general cleanup Jonathan Cameron
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.