Skip to content

L
linux
Commit cf96ffd8 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files
Options

staging:iio:accel:adis16201 move to chan_spec based setup. 

Mainly motivated by wish to remove the remaing users of the
scan helpers.

Some minor cleanups done whilst here.

Untested.

V2: IIO_CHAN macro used.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent cbcdf4dd
Hide whitespace changes
Inline Side-by-side
Showing with 220 additions and 328 deletions
drivers/staging/iio/accel/adis16201.h
View file @ cf96ffd8
...@@ -79,7 +79,7 @@ struct adis16201_state { ...@@ -79,7 +79,7 @@ struct adis16201_state {
struct mutex buf_lock; struct mutex buf_lock;
}; };
int adis16201_set_irq(struct device *dev, bool enable); int adis16201_set_irq(struct iio_dev *indio_dev, bool enable);
#ifdef CONFIG_IIO_RING_BUFFER #ifdef CONFIG_IIO_RING_BUFFER
enum adis16201_scan { enum adis16201_scan {
...@@ -102,8 +102,6 @@ ssize_t adis16201_read_data_from_ring(struct device *dev, ...@@ -102,8 +102,6 @@ ssize_t adis16201_read_data_from_ring(struct device *dev,
int adis16201_configure_ring(struct iio_dev *indio_dev); int adis16201_configure_ring(struct iio_dev *indio_dev);
void adis16201_unconfigure_ring(struct iio_dev *indio_dev); void adis16201_unconfigure_ring(struct iio_dev *indio_dev);
int adis16201_initialize_ring(struct iio_ring_buffer *ring);
void adis16201_uninitialize_ring(struct iio_ring_buffer *ring);
#else /* CONFIG_IIO_RING_BUFFER */ #else /* CONFIG_IIO_RING_BUFFER */
static inline void adis16201_remove_trigger(struct iio_dev *indio_dev) static inline void adis16201_remove_trigger(struct iio_dev *indio_dev)
......
drivers/staging/iio/accel/adis16201_core.c
View file @ cf96ffd8
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
* Licensed under the GPL-2 or later. * 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/delay.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
...@@ -16,20 +13,28 @@ ...@@ -16,20 +13,28 @@
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/list.h>
#include "../iio.h" #include "../iio.h"
#include "../sysfs.h" #include "../sysfs.h"
#include "../ring_generic.h"
#include "accel.h" #include "accel.h"
#include "inclinometer.h" #include "inclinometer.h"
#include "../gyro/gyro.h"
#include "../adc/adc.h" #include "../adc/adc.h"
#include "adis16201.h" #include "adis16201.h"
#define DRIVER_NAME "adis16201" #define DRIVER_NAME "adis16201"
static int adis16201_check_status(struct device *dev); enum adis16201_chan {
in_supply,
temp,
accel_x,
accel_y,
incli_x,
incli_y,
in_aux,
};
/** /**
* adis16201_spi_write_reg_8() - write single byte to a register * adis16201_spi_write_reg_8() - write single byte to a register
...@@ -57,18 +62,17 @@ static int adis16201_spi_write_reg_8(struct device *dev, ...@@ -57,18 +62,17 @@ static int adis16201_spi_write_reg_8(struct device *dev,
/** /**
* adis16201_spi_write_reg_16() - write 2 bytes to a pair of registers * adis16201_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 * @reg_address: the address of the lower of the two registers. Second register
* is assumed to have address one greater. * is assumed to have address one greater.
* @val: value to be written * @val: value to be written
**/ **/
static int adis16201_spi_write_reg_16(struct device *dev, static int adis16201_spi_write_reg_16(struct iio_dev *indio_dev,
u8 lower_reg_address, u8 lower_reg_address,
u16 value) u16 value)
{ {
int ret; int ret;
struct spi_message msg; struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16201_state *st = iio_dev_get_devdata(indio_dev); struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
struct spi_transfer xfers[] = { struct spi_transfer xfers[] = {
{ {
...@@ -80,7 +84,6 @@ static int adis16201_spi_write_reg_16(struct device *dev, ...@@ -80,7 +84,6 @@ static int adis16201_spi_write_reg_16(struct device *dev,
.tx_buf = st->tx + 2, .tx_buf = st->tx + 2,
.bits_per_word = 8, .bits_per_word = 8,
.len = 2, .len = 2,
.cs_change = 1,
}, },
}; };
...@@ -101,17 +104,16 @@ static int adis16201_spi_write_reg_16(struct device *dev, ...@@ -101,17 +104,16 @@ static int adis16201_spi_write_reg_16(struct device *dev,
/** /**
* adis16201_spi_read_reg_16() - read 2 bytes from a 16-bit register * adis16201_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 * @reg_address: the address of the lower of the two registers. Second register
* is assumed to have address one greater. * is assumed to have address one greater.
* @val: somewhere to pass back the value read * @val: somewhere to pass back the value read
**/ **/
static int adis16201_spi_read_reg_16(struct device *dev, static int adis16201_spi_read_reg_16(struct iio_dev *indio_dev,
u8 lower_reg_address, u8 lower_reg_address,
u16 *val) u16 *val)
{ {
struct spi_message msg; struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16201_state *st = iio_dev_get_devdata(indio_dev); struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
int ret; int ret;
struct spi_transfer xfers[] = { struct spi_transfer xfers[] = {
...@@ -125,7 +127,6 @@ static int adis16201_spi_read_reg_16(struct device *dev, ...@@ -125,7 +127,6 @@ static int adis16201_spi_read_reg_16(struct device *dev,
.rx_buf = st->rx, .rx_buf = st->rx,
.bits_per_word = 8, .bits_per_word = 8,
.len = 2, .len = 2,
.cs_change = 1,
.delay_usecs = 20, .delay_usecs = 20,
}, },
}; };
...@@ -150,160 +151,6 @@ static int adis16201_spi_read_reg_16(struct device *dev, ...@@ -150,160 +151,6 @@ static int adis16201_spi_read_reg_16(struct device *dev,
return ret; return ret;
} }
static ssize_t adis16201_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 = adis16201_spi_read_reg_16(dev, this_attr->address, &val);
if (ret)
return ret;
if (val & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(dev);
if (ret)
return ret;
}
return sprintf(buf, "%u\n", val & 0x0FFF);
}
static ssize_t adis16201_read_temp(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
ssize_t ret;
u16 val;
/* Take the iio_dev status lock */
mutex_lock(&indio_dev->mlock);
ret = adis16201_spi_read_reg_16(dev, ADIS16201_TEMP_OUT, (u16 *)&val);
if (ret)
goto error_ret;
if (val & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(dev);
if (ret)
goto error_ret;
}
val &= 0xFFF;
ret = sprintf(buf, "%d\n", val);
error_ret:
mutex_unlock(&indio_dev->mlock);
return ret;
}
static ssize_t adis16201_read_9bit_signed(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
s16 val = 0;
ssize_t ret;
mutex_lock(&indio_dev->mlock);
ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
if (!ret) {
if (val & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(dev);
if (ret)
goto error_ret;
}
val = ((s16)(val << 7) >> 7);
ret = sprintf(buf, "%d\n", val);
}
error_ret:
mutex_unlock(&indio_dev->mlock);
return ret;
}
static ssize_t adis16201_read_12bit_signed(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
s16 val = 0;
ssize_t ret;
mutex_lock(&indio_dev->mlock);
ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
if (!ret) {
if (val & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(dev);
if (ret)
goto error_ret;
}
val = ((s16)(val << 4) >> 4);
ret = sprintf(buf, "%d\n", val);
}
error_ret:
mutex_unlock(&indio_dev->mlock);
return ret;
}
static ssize_t adis16201_read_14bit_signed(struct device *dev,
struct device_attribute *attr,
char *buf)
{
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
s16 val = 0;
ssize_t ret;
mutex_lock(&indio_dev->mlock);
ret = adis16201_spi_read_reg_16(dev, this_attr->address, (u16 *)&val);
if (!ret) {
if (val & ADIS16201_ERROR_ACTIVE) {
ret = adis16201_check_status(dev);
if (ret)
goto error_ret;
}
val = ((s16)(val << 2) >> 2);
ret = sprintf(buf, "%d\n", val);
}
error_ret:
mutex_unlock(&indio_dev->mlock);
return ret;
}
static ssize_t adis16201_write_16bit(struct device *dev,
struct device_attribute *attr,
const char *buf,
size_t len)
{
struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
int ret;
long val;
ret = strict_strtol(buf, 10, &val);
if (ret)
goto error_ret;
ret = adis16201_spi_write_reg_16(dev, this_attr->address, val);
error_ret:
return ret ? ret : len;
}
static int adis16201_reset(struct device *dev) static int adis16201_reset(struct device *dev)
{ {
int ret; int ret;
...@@ -331,12 +178,12 @@ static ssize_t adis16201_write_reset(struct device *dev, ...@@ -331,12 +178,12 @@ static ssize_t adis16201_write_reset(struct device *dev,
return -EINVAL; return -EINVAL;
} }
int adis16201_set_irq(struct device *dev, bool enable) int adis16201_set_irq(struct iio_dev *indio_dev, bool enable)
{ {
int ret = 0; int ret = 0;
u16 msc; u16 msc;
ret = adis16201_spi_read_reg_16(dev, ADIS16201_MSC_CTRL, &msc); ret = adis16201_spi_read_reg_16(indio_dev, ADIS16201_MSC_CTRL, &msc);
if (ret) if (ret)
goto error_ret; goto error_ret;
...@@ -347,20 +194,21 @@ int adis16201_set_irq(struct device *dev, bool enable) ...@@ -347,20 +194,21 @@ int adis16201_set_irq(struct device *dev, bool enable)
else else
msc &= ~ADIS16201_MSC_CTRL_DATA_RDY_EN; msc &= ~ADIS16201_MSC_CTRL_DATA_RDY_EN;
ret = adis16201_spi_write_reg_16(dev, ADIS16201_MSC_CTRL, msc); ret = adis16201_spi_write_reg_16(indio_dev, ADIS16201_MSC_CTRL, msc);
error_ret: error_ret:
return ret; return ret;
} }
static int adis16201_check_status(struct device *dev) static int adis16201_check_status(struct iio_dev *indio_dev)
{ {
u16 status; u16 status;
int ret; int ret;
ret = adis16201_spi_read_reg_16(dev, ADIS16201_DIAG_STAT, &status); ret = adis16201_spi_read_reg_16(indio_dev,
ADIS16201_DIAG_STAT, &status);
if (ret < 0) { if (ret < 0) {
dev_err(dev, "Reading status failed\n"); dev_err(&indio_dev->dev, "Reading status failed\n");
goto error_ret; goto error_ret;
} }
ret = status & 0xF; ret = status & 0xF;
...@@ -368,30 +216,30 @@ static int adis16201_check_status(struct device *dev) ...@@ -368,30 +216,30 @@ static int adis16201_check_status(struct device *dev)
ret = -EFAULT; ret = -EFAULT;
if (status & ADIS16201_DIAG_STAT_SPI_FAIL) if (status & ADIS16201_DIAG_STAT_SPI_FAIL)
dev_err(dev, "SPI failure\n"); dev_err(&indio_dev->dev, "SPI failure\n");
if (status & ADIS16201_DIAG_STAT_FLASH_UPT) if (status & ADIS16201_DIAG_STAT_FLASH_UPT)
dev_err(dev, "Flash update failed\n"); dev_err(&indio_dev->dev, "Flash update failed\n");
if (status & ADIS16201_DIAG_STAT_POWER_HIGH) if (status & ADIS16201_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 & ADIS16201_DIAG_STAT_POWER_LOW) if (status & ADIS16201_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: error_ret:
return ret; return ret;
} }
static int adis16201_self_test(struct device *dev) static int adis16201_self_test(struct iio_dev *indio_dev)
{ {
int ret; int ret;
ret = adis16201_spi_write_reg_16(dev, ret = adis16201_spi_write_reg_16(indio_dev,
ADIS16201_MSC_CTRL, ADIS16201_MSC_CTRL,
ADIS16201_MSC_CTRL_SELF_TEST_EN); ADIS16201_MSC_CTRL_SELF_TEST_EN);
if (ret) { if (ret) {
dev_err(dev, "problem starting self test"); dev_err(&indio_dev->dev, "problem starting self test");
goto err_ret; goto err_ret;
} }
ret = adis16201_check_status(dev); ret = adis16201_check_status(indio_dev);
err_ret: err_ret:
return ret; return ret;
...@@ -403,26 +251,26 @@ static int adis16201_initial_setup(struct adis16201_state *st) ...@@ -403,26 +251,26 @@ static int adis16201_initial_setup(struct adis16201_state *st)
struct device *dev = &st->indio_dev->dev; struct device *dev = &st->indio_dev->dev;
/* Disable IRQ */ /* Disable IRQ */
ret = adis16201_set_irq(dev, false); ret = adis16201_set_irq(st->indio_dev, false);
if (ret) { if (ret) {
dev_err(dev, "disable irq failed"); dev_err(dev, "disable irq failed");
goto err_ret; goto err_ret;
} }
/* Do self test */ /* Do self test */
ret = adis16201_self_test(dev); ret = adis16201_self_test(st->indio_dev);
if (ret) { if (ret) {
dev_err(dev, "self test failure"); dev_err(dev, "self test failure");
goto err_ret; goto err_ret;
} }
/* Read status register to check the result */ /* Read status register to check the result */
ret = adis16201_check_status(dev); ret = adis16201_check_status(st->indio_dev);
if (ret) { if (ret) {
adis16201_reset(dev); adis16201_reset(dev);
dev_err(dev, "device not playing ball -> reset"); dev_err(dev, "device not playing ball -> reset");
msleep(ADIS16201_STARTUP_DELAY); msleep(ADIS16201_STARTUP_DELAY);
ret = adis16201_check_status(dev); ret = adis16201_check_status(st->indio_dev);
if (ret) { if (ret) {
dev_err(dev, "giving up"); dev_err(dev, "giving up");
goto err_ret; goto err_ret;
...@@ -436,66 +284,172 @@ static int adis16201_initial_setup(struct adis16201_state *st) ...@@ -436,66 +284,172 @@ static int adis16201_initial_setup(struct adis16201_state *st)
return ret; return ret;
} }
static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16201_read_12bit_unsigned, static u8 adis16201_addresses[7][2] = {
ADIS16201_SUPPLY_OUT); [in_supply] = { ADIS16201_SUPPLY_OUT, },
static IIO_CONST_ATTR(in0_supply_scale, "0.00122"); [temp] = { ADIS16201_TEMP_OUT },
static IIO_DEV_ATTR_IN_RAW(1, adis16201_read_12bit_unsigned, [accel_x] = { ADIS16201_XACCL_OUT, ADIS16201_XACCL_OFFS },
ADIS16201_AUX_ADC); [accel_y] = { ADIS16201_YACCL_OUT, ADIS16201_YACCL_OFFS },
static IIO_CONST_ATTR(in1_scale, "0.00061"); [in_aux] = { ADIS16201_AUX_ADC },
[incli_x] = { ADIS16201_XINCL_OUT },
static IIO_DEV_ATTR_ACCEL_X(adis16201_read_14bit_signed, [incli_y] = { ADIS16201_YINCL_OUT },
ADIS16201_XACCL_OUT); };
static IIO_DEV_ATTR_ACCEL_Y(adis16201_read_14bit_signed,
ADIS16201_YACCL_OUT); static int adis16201_read_raw(struct iio_dev *indio_dev,
static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO, struct iio_chan_spec const *chan,
adis16201_read_12bit_signed, int *val, int *val2,
adis16201_write_16bit, long mask)
ADIS16201_XACCL_OFFS); {
static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO, int ret;
adis16201_read_12bit_signed, int bits;
adis16201_write_16bit, u8 addr;
ADIS16201_YACCL_OFFS); s16 val16;
static IIO_CONST_ATTR(accel_scale, "0.4625");
switch (mask) {
static IIO_DEV_ATTR_INCLI_X(adis16201_read_14bit_signed, case 0:
ADIS16201_XINCL_OUT); mutex_lock(&indio_dev->mlock);
static IIO_DEV_ATTR_INCLI_Y(adis16201_read_14bit_signed, addr = adis16201_addresses[chan->address][0];
ADIS16201_YINCL_OUT); ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
static IIO_DEV_ATTR_INCLI_X_OFFSET(S_IWUSR | S_IRUGO, if (ret)
adis16201_read_9bit_signed, return ret;
adis16201_write_16bit,
ADIS16201_XACCL_OFFS); if (val16 & ADIS16201_ERROR_ACTIVE) {
static IIO_DEV_ATTR_INCLI_Y_OFFSET(S_IWUSR | S_IRUGO, ret = adis16201_check_status(indio_dev);
adis16201_read_9bit_signed, if (ret)
adis16201_write_16bit, return ret;
ADIS16201_YACCL_OFFS); }
static IIO_CONST_ATTR(incli_scale, "0.1"); val16 = val16 & ((1 << chan->scan_type.realbits) - 1);
if (chan->scan_type.sign == 's')
static IIO_DEV_ATTR_TEMP_RAW(adis16201_read_temp); val16 = (s16)(val16 <<
static IIO_CONST_ATTR(temp_offset, "25"); (16 - chan->scan_type.realbits)) >>
static IIO_CONST_ATTR(temp_scale, "-0.47"); (16 - chan->scan_type.realbits);
*val = val16;
mutex_unlock(&indio_dev->mlock);
return IIO_VAL_INT;
case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
case (1 << IIO_CHAN_INFO_SCALE_SHARED):
switch (chan->type) {
case IIO_IN:
*val = 0;
if (chan->channel == 0)
*val2 = 1220;
else
*val2 = 610;
return IIO_VAL_INT_PLUS_MICRO;
case IIO_TEMP:
*val = 0;
*val2 = -470000;
return IIO_VAL_INT_PLUS_MICRO;
case IIO_ACCEL:
*val = 0;
*val2 = 462500;
return IIO_VAL_INT_PLUS_MICRO;
case IIO_INCLI:
*val = 0;
*val2 = 100000;
return IIO_VAL_INT_PLUS_MICRO;
default:
return -EINVAL;
}
break;
case (1 << IIO_CHAN_INFO_OFFSET_SEPARATE):
*val = 25;
return IIO_VAL_INT;
case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
switch (chan->type) {
case IIO_ACCEL:
bits = 12;
break;
case IIO_INCLI:
bits = 9;
break;
default:
return -EINVAL;
};
mutex_lock(&indio_dev->mlock);
addr = adis16201_addresses[chan->address][1];
ret = adis16201_spi_read_reg_16(indio_dev, addr, &val16);
if (ret) {
mutex_unlock(&indio_dev->mlock);
return ret;
}
val16 &= (1 << bits) - 1;
val16 = (s16)(val16 << (16 - bits)) >> (16 - bits);
*val = val16;
mutex_unlock(&indio_dev->mlock);
return IIO_VAL_INT;
}
return -EINVAL;
}
static int adis16201_write_raw(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
int val,
int val2,
long mask)
{
int bits;
s16 val16;
u8 addr;
switch (mask) {
case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
switch (chan->type) {
case IIO_ACCEL:
bits = 12;
break;
case IIO_INCLI:
bits = 9;
break;
default:
return -EINVAL;
};
val16 = val & ((1 << bits) - 1);
addr = adis16201_addresses[chan->address][1];
return adis16201_spi_write_reg_16(indio_dev, addr, val16);
}
return -EINVAL;
}
static struct iio_chan_spec adis16201_channels[] = {
IIO_CHAN(IIO_IN, 0, 1, 0, "supply", 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SEPARATE),
in_supply, ADIS16201_SCAN_SUPPLY,
IIO_ST('u', 12, 16, 0), 0),
IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,
(1 << IIO_CHAN_INFO_SCALE_SEPARATE) |
(1 << IIO_CHAN_INFO_OFFSET_SEPARATE),
temp, ADIS16201_SCAN_TEMP,
IIO_ST('u', 12, 16, 0), 0),
IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,
(1 << IIO_CHAN_INFO_SCALE_SHARED) |
(1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
accel_x, ADIS16201_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_SHARED) |
(1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
accel_y, ADIS16201_SCAN_ACC_Y,
IIO_ST('s', 14, 16, 0), 0),
IIO_CHAN(IIO_IN, 0, 1, 0, NULL, 1, 0,
(1 << IIO_CHAN_INFO_SCALE_SEPARATE),
in_aux, ADIS16201_SCAN_AUX_ADC,
IIO_ST('u', 12, 16, 0), 0),
IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,
(1 << IIO_CHAN_INFO_SCALE_SHARED) |
(1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
incli_x, ADIS16201_SCAN_INCLI_X,
IIO_ST('s', 14, 16, 0), 0),
IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,
(1 << IIO_CHAN_INFO_SCALE_SHARED) |
(1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE),
incli_y, ADIS16201_SCAN_INCLI_Y,
IIO_ST('s', 14, 16, 0), 0),
IIO_CHAN_SOFT_TIMESTAMP(7)
};
static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0); static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16201_write_reset, 0);
static struct attribute *adis16201_attributes[] = { static struct attribute *adis16201_attributes[] = {
&iio_dev_attr_in0_supply_raw.dev_attr.attr,
&iio_const_attr_in0_supply_scale.dev_attr.attr,
&iio_dev_attr_temp_raw.dev_attr.attr,
&iio_const_attr_temp_offset.dev_attr.attr,
&iio_const_attr_temp_scale.dev_attr.attr,
&iio_dev_attr_reset.dev_attr.attr, &iio_dev_attr_reset.dev_attr.attr,
&iio_dev_attr_in1_raw.dev_attr.attr,
&iio_const_attr_in1_scale.dev_attr.attr,
&iio_dev_attr_accel_x_raw.dev_attr.attr,
&iio_dev_attr_accel_y_raw.dev_attr.attr,
&iio_dev_attr_accel_x_offset.dev_attr.attr,
&iio_dev_attr_accel_y_offset.dev_attr.attr,
&iio_const_attr_accel_scale.dev_attr.attr,
&iio_dev_attr_incli_x_raw.dev_attr.attr,
&iio_dev_attr_incli_y_raw.dev_attr.attr,
&iio_dev_attr_incli_x_offset.dev_attr.attr,
&iio_dev_attr_incli_y_offset.dev_attr.attr,
&iio_const_attr_incli_scale.dev_attr.attr,
NULL NULL
}; };
...@@ -537,6 +491,10 @@ static int __devinit adis16201_probe(struct spi_device *spi) ...@@ -537,6 +491,10 @@ static int __devinit adis16201_probe(struct spi_device *spi)
st->indio_dev->name = spi->dev.driver->name; st->indio_dev->name = spi->dev.driver->name;
st->indio_dev->dev.parent = &spi->dev; st->indio_dev->dev.parent = &spi->dev;
st->indio_dev->attrs = &adis16201_attribute_group; st->indio_dev->attrs = &adis16201_attribute_group;
st->indio_dev->channels = adis16201_channels;
st->indio_dev->num_channels = ARRAY_SIZE(adis16201_channels);
st->indio_dev->read_raw = &adis16201_read_raw;
st->indio_dev->write_raw = &adis16201_write_raw;
st->indio_dev->dev_data = (void *)(st); st->indio_dev->dev_data = (void *)(st);
st->indio_dev->driver_module = THIS_MODULE; st->indio_dev->driver_module = THIS_MODULE;
st->indio_dev->modes = INDIO_DIRECT_MODE; st->indio_dev->modes = INDIO_DIRECT_MODE;
...@@ -550,7 +508,9 @@ static int __devinit adis16201_probe(struct spi_device *spi) ...@@ -550,7 +508,9 @@ static int __devinit adis16201_probe(struct spi_device *spi)
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
regdone = 1; regdone = 1;
ret = adis16201_initialize_ring(st->indio_dev->ring); ret = iio_ring_buffer_register_ex(st->indio_dev->ring, 0,
adis16201_channels,
ARRAY_SIZE(adis16201_channels));
if (ret) { if (ret) {
printk(KERN_ERR "failed to initialize the ring\n"); printk(KERN_ERR "failed to initialize the ring\n");
goto error_unreg_ring_funcs; goto error_unreg_ring_funcs;
...@@ -571,7 +531,7 @@ static int __devinit adis16201_probe(struct spi_device *spi) ...@@ -571,7 +531,7 @@ static int __devinit adis16201_probe(struct spi_device *spi)
error_remove_trigger: error_remove_trigger:
adis16201_remove_trigger(st->indio_dev); adis16201_remove_trigger(st->indio_dev);
error_uninitialize_ring: error_uninitialize_ring:
adis16201_uninitialize_ring(st->indio_dev->ring); iio_ring_buffer_unregister(st->indio_dev->ring);
error_unreg_ring_funcs: error_unreg_ring_funcs:
adis16201_unconfigure_ring(st->indio_dev); adis16201_unconfigure_ring(st->indio_dev);
error_free_dev: error_free_dev:
...@@ -594,10 +554,8 @@ static int adis16201_remove(struct spi_device *spi) ...@@ -594,10 +554,8 @@ static int adis16201_remove(struct spi_device *spi)
struct adis16201_state *st = spi_get_drvdata(spi); struct adis16201_state *st = spi_get_drvdata(spi);
struct iio_dev *indio_dev = st->indio_dev; struct iio_dev *indio_dev = st->indio_dev;
flush_scheduled_work();
adis16201_remove_trigger(indio_dev); adis16201_remove_trigger(indio_dev);
adis16201_uninitialize_ring(indio_dev->ring); iio_ring_buffer_unregister(indio_dev->ring);
iio_device_unregister(indio_dev); iio_device_unregister(indio_dev);
adis16201_unconfigure_ring(indio_dev); adis16201_unconfigure_ring(indio_dev);
kfree(st->tx); kfree(st->tx);
......
drivers/staging/iio/accel/adis16201_ring.c
View file @ cf96ffd8
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/gpio.h>
#include <linux/workqueue.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/list.h>
#include "../iio.h" #include "../iio.h"
#include "../sysfs.h" #include "../sysfs.h"
...@@ -17,63 +14,15 @@ ...@@ -17,63 +14,15 @@
#include "../trigger.h" #include "../trigger.h"
#include "adis16201.h" #include "adis16201.h"
static IIO_SCAN_EL_C(in_supply, ADIS16201_SCAN_SUPPLY, ADIS16201_SUPPLY_OUT, NULL);
static IIO_CONST_ATTR_SCAN_EL_TYPE(in_supply, u, 12, 16);
static IIO_SCAN_EL_C(accel_x, ADIS16201_SCAN_ACC_X, ADIS16201_XACCL_OUT, NULL);
static IIO_SCAN_EL_C(accel_y, ADIS16201_SCAN_ACC_Y, ADIS16201_YACCL_OUT, NULL);
static IIO_CONST_ATTR_SCAN_EL_TYPE(accel, s, 14, 16);
static IIO_SCAN_EL_C(in0, ADIS16201_SCAN_AUX_ADC, ADIS16201_AUX_ADC, NULL);
static IIO_CONST_ATTR_SCAN_EL_TYPE(in0, u, 12, 16);
static IIO_SCAN_EL_C(temp, ADIS16201_SCAN_TEMP, ADIS16201_TEMP_OUT, NULL);
static IIO_CONST_ATTR_SCAN_EL_TYPE(temp, u, 12, 16);
static IIO_SCAN_EL_C(incli_x, ADIS16201_SCAN_INCLI_X,
ADIS16201_XINCL_OUT, NULL);
static IIO_SCAN_EL_C(incli_y, ADIS16201_SCAN_INCLI_Y,
ADIS16201_YINCL_OUT, NULL);
static IIO_CONST_ATTR_SCAN_EL_TYPE(incli, s, 14, 16);
static IIO_SCAN_EL_TIMESTAMP(7);
static IIO_CONST_ATTR_SCAN_EL_TYPE(timestamp, s, 64, 64);
static struct attribute *adis16201_scan_el_attrs[] = {
&iio_scan_el_in_supply.dev_attr.attr,
&iio_const_attr_in_supply_index.dev_attr.attr,
&iio_const_attr_in_supply_type.dev_attr.attr,
&iio_scan_el_accel_x.dev_attr.attr,
&iio_const_attr_accel_x_index.dev_attr.attr,
&iio_scan_el_accel_y.dev_attr.attr,
&iio_const_attr_accel_y_index.dev_attr.attr,
&iio_const_attr_accel_type.dev_attr.attr,
&iio_scan_el_in0.dev_attr.attr,
&iio_const_attr_in0_index.dev_attr.attr,
&iio_const_attr_in0_type.dev_attr.attr,
&iio_scan_el_temp.dev_attr.attr,
&iio_const_attr_temp_index.dev_attr.attr,
&iio_const_attr_temp_type.dev_attr.attr,
&iio_scan_el_incli_x.dev_attr.attr,
&iio_const_attr_incli_x_index.dev_attr.attr,
&iio_scan_el_incli_y.dev_attr.attr,
&iio_const_attr_incli_y_index.dev_attr.attr,
&iio_const_attr_incli_type.dev_attr.attr,
&iio_scan_el_timestamp.dev_attr.attr,
&iio_const_attr_timestamp_index.dev_attr.attr,
&iio_const_attr_timestamp_type.dev_attr.attr,
NULL,
};
static struct attribute_group adis16201_scan_el_group = {
.attrs = adis16201_scan_el_attrs,
.name = "scan_elements",
};
/** /**
* adis16201_read_ring_data() read data registers which will be placed into ring * adis16201_read_ring_data() read data registers which will be placed into ring
* @dev: device associated with child of actual device (iio_dev or iio_trig) * @dev: device associated with child of actual device (iio_dev or iio_trig)
* @rx: somewhere to pass back the value read * @rx: somewhere to pass back the value read
**/ **/
static int adis16201_read_ring_data(struct device *dev, u8 *rx) static int adis16201_read_ring_data(struct iio_dev *indio_dev, u8 *rx)
{ {
struct spi_message msg; struct spi_message msg;
struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct adis16201_state *st = iio_dev_get_devdata(indio_dev); struct adis16201_state *st = iio_dev_get_devdata(indio_dev);
struct spi_transfer xfers[ADIS16201_OUTPUTS + 1]; struct spi_transfer xfers[ADIS16201_OUTPUTS + 1];
int ret; int ret;
...@@ -90,7 +39,8 @@ static int adis16201_read_ring_data(struct device *dev, u8 *rx) ...@@ -90,7 +39,8 @@ static int adis16201_read_ring_data(struct device *dev, u8 *rx)
xfers[i].len = 2; xfers[i].len = 2;
xfers[i].delay_usecs = 20; xfers[i].delay_usecs = 20;
xfers[i].tx_buf = st->tx + 2 * i; xfers[i].tx_buf = st->tx + 2 * i;
st->tx[2 * i] = ADIS16201_READ_REG(ADIS16201_SUPPLY_OUT + 2 * i); st->tx[2 * i] = ADIS16201_READ_REG(ADIS16201_SUPPLY_OUT +
2 * i);
st->tx[2 * i + 1] = 0; st->tx[2 * i + 1] = 0;
if (i >= 1) if (i >= 1)
xfers[i].rx_buf = rx + 2 * (i - 1); xfers[i].rx_buf = rx + 2 * (i - 1);
...@@ -127,7 +77,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) ...@@ -127,7 +77,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
} }
if (ring->scan_count) if (ring->scan_count)
if (adis16201_read_ring_data(&st->indio_dev->dev, st->rx) >= 0) if (adis16201_read_ring_data(st->indio_dev, st->rx) >= 0)
for (; i < ring->scan_count; i++) for (; i < ring->scan_count; i++)
data[i] = be16_to_cpup( data[i] = be16_to_cpup(
(__be16 *)&(st->rx[i*2])); (__be16 *)&(st->rx[i*2]));
...@@ -136,9 +86,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p) ...@@ -136,9 +86,7 @@ static irqreturn_t adis16201_trigger_handler(int irq, void *p)
if (ring->scan_timestamp) if (ring->scan_timestamp)
*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp; *((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;
ring->access.store_to(ring, ring->access.store_to(ring, (u8 *)data, pf->timestamp);
(u8 *)data,
pf->timestamp);
iio_trigger_notify_done(st->indio_dev->trig); iio_trigger_notify_done(st->indio_dev->trig);
kfree(data); kfree(data);
...@@ -167,7 +115,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) ...@@ -167,7 +115,6 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
/* Effectively select the ring buffer implementation */ /* Effectively select the ring buffer implementation */
iio_ring_sw_register_funcs(&ring->access); iio_ring_sw_register_funcs(&ring->access);
ring->bpe = 2; ring->bpe = 2;
ring->scan_el_attrs = &adis16201_scan_el_group;
ring->scan_timestamp = true; ring->scan_timestamp = true;
ring->preenable = &iio_sw_ring_preenable; ring->preenable = &iio_sw_ring_preenable;
ring->postenable = &iio_triggered_ring_postenable; ring->postenable = &iio_triggered_ring_postenable;
...@@ -175,13 +122,13 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) ...@@ -175,13 +122,13 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
ring->owner = THIS_MODULE; ring->owner = THIS_MODULE;
/* Set default scan mode */ /* Set default scan mode */
iio_scan_mask_set(ring, iio_scan_el_in_supply.number); iio_scan_mask_set(ring, ADIS16201_SCAN_SUPPLY);
iio_scan_mask_set(ring, iio_scan_el_accel_x.number); iio_scan_mask_set(ring, ADIS16201_SCAN_ACC_X);
iio_scan_mask_set(ring, iio_scan_el_accel_y.number); iio_scan_mask_set(ring, ADIS16201_SCAN_ACC_Y);
iio_scan_mask_set(ring, iio_scan_el_temp.number); iio_scan_mask_set(ring, ADIS16201_SCAN_AUX_ADC);
iio_scan_mask_set(ring, iio_scan_el_in0.number); iio_scan_mask_set(ring, ADIS16201_SCAN_TEMP);
iio_scan_mask_set(ring, iio_scan_el_incli_x.number); iio_scan_mask_set(ring, ADIS16201_SCAN_INCLI_X);
iio_scan_mask_set(ring, iio_scan_el_incli_y.number); iio_scan_mask_set(ring, ADIS16201_SCAN_INCLI_Y);
indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL); indio_dev->pollfunc = kzalloc(sizeof(*indio_dev->pollfunc), GFP_KERNEL);
if (indio_dev->pollfunc == NULL) { if (indio_dev->pollfunc == NULL) {
...@@ -207,13 +154,3 @@ int adis16201_configure_ring(struct iio_dev *indio_dev) ...@@ -207,13 +154,3 @@ int adis16201_configure_ring(struct iio_dev *indio_dev)
iio_sw_rb_free(indio_dev->ring); iio_sw_rb_free(indio_dev->ring);
return ret; return ret;
} }
int adis16201_initialize_ring(struct iio_ring_buffer *ring)
{
return iio_ring_buffer_register(ring, 0);
}
void adis16201_uninitialize_ring(struct iio_ring_buffer *ring)
{
iio_ring_buffer_unregister(ring);
}
drivers/staging/iio/accel/adis16201_trigger.c
View file @ cf96ffd8
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/list.h>
#include <linux/spi/spi.h> #include <linux/spi/spi.h>
#include "../iio.h" #include "../iio.h"
...@@ -33,7 +32,7 @@ static int adis16201_data_rdy_trigger_set_state(struct iio_trigger *trig, ...@@ -33,7 +32,7 @@ static int adis16201_data_rdy_trigger_set_state(struct iio_trigger *trig,
struct iio_dev *indio_dev = st->indio_dev; struct iio_dev *indio_dev = st->indio_dev;
dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state); dev_dbg(&indio_dev->dev, "%s (%d)\n", __func__, state);
return adis16201_set_irq(&st->indio_dev->dev, state); return adis16201_set_irq(st->indio_dev, state);
} }
int adis16201_probe_trigger(struct iio_dev *indio_dev) int adis16201_probe_trigger(struct iio_dev *indio_dev)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7