Second round of IIO new stuff and cleanups for the 3.11 cycle.
1) Pressure sensor support in the st sensors driver - LPS331AP currently. 2) Graduation of generic interrupt from staging with some related cleanup. 3) A number of platform_set_drvdata on remove removals. 4) 2 conditional build changes to prevent device tree structures from being built in when device tree isn't enabled. These just save a bit of space rather than being strictly required at the moment. 5) A couple of strict_strtoul -> kstrtoul conversions. -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) iQIcBAABAgAGBQJRsvRVAAoJEFSFNJnE9BaI6ZsQAIIdtuKkv8W5MFf/RBJjWCGw 2dTwapKFEBAFNSIfq2xdMZd1kGaaQELfDQmPfXzaKlR2scFxHfiFXddiDe7ZHBbr vyd4suDR9vXI9D1HOhG9QVzZcSEXWZ+fyoageUYygJ22I8ubq0EdBHzYM5Bdv+aJ 5bCquKMkCeDO/Usf/HxGSgf/xUTfOjzynUmSvn+76xcZ1ZkUIY1K3UTm3tg9eev0 R11AY3uAzrjjs/iqNlbiTgXxpmIdT69StE5EDvrUEQrVkJFERgpITQIwti+ws9Uo jEhfR5vGymTYCRud8wuVA3ps416McSIQdPtluHcupIAtA95NnSeYx3bJnPB6NkOc TA4EFqzhXpEHr3oIb6bCfzS9eWazNfCdHF9U0oDUOKKgYSZ7YUski84t3c7lrMCs gV3qqNNpnC+BqwW9gO7BEWKZFmDcyZtZEHAKEKor9peG7n8Wib7pUb7rpxEtekee oljYxVnGBw+qZnupQlbAj9+TeGMiyPEPGvFFo7VeokOJuKfFBro0+j2mdjXoaP5v 4eEM/UDw0Rv8hxqMJLsGGBovkbbOWFNOEeb+GNlxv/MZJ/85yw4OQHHYTpuiqwcw H9HrGpvkex2DPn1+L5bVA95FyrqAJ70biUv2cvtg4UrrA68NRpmt+YB8enfbgUl1 nsiMIWq0hq9fdv50jH7O =zY7L -----END PGP SIGNATURE----- Merge tag 'iio-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next Jonathan writes: Second round of IIO new stuff and cleanups for the 3.11 cycle. 1) Pressure sensor support in the st sensors driver - LPS331AP currently. 2) Graduation of generic interrupt from staging with some related cleanup. 3) A number of platform_set_drvdata on remove removals. 4) 2 conditional build changes to prevent device tree structures from being built in when device tree isn't enabled. These just save a bit of space rather than being strictly required at the moment. 5) A couple of strict_strtoul -> kstrtoul conversions.
This commit is contained in:
commit
451372066d
|
@ -73,5 +73,6 @@ source "drivers/iio/magnetometer/Kconfig"
|
||||||
if IIO_TRIGGER
|
if IIO_TRIGGER
|
||||||
source "drivers/iio/trigger/Kconfig"
|
source "drivers/iio/trigger/Kconfig"
|
||||||
endif #IIO_TRIGGER
|
endif #IIO_TRIGGER
|
||||||
|
source "drivers/iio/pressure/Kconfig"
|
||||||
|
|
||||||
endif # IIO
|
endif # IIO
|
||||||
|
|
|
@ -22,3 +22,4 @@ obj-y += imu/
|
||||||
obj-y += light/
|
obj-y += light/
|
||||||
obj-y += magnetometer/
|
obj-y += magnetometer/
|
||||||
obj-y += trigger/
|
obj-y += trigger/
|
||||||
|
obj-y += pressure/
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include <linux/iio/common/st_sensors.h>
|
#include <linux/iio/common/st_sensors.h>
|
||||||
#include "st_accel.h"
|
#include "st_accel.h"
|
||||||
|
|
||||||
|
#define ST_ACCEL_NUMBER_DATA_CHANNELS 3
|
||||||
|
|
||||||
/* DEFAULT VALUE FOR SENSORS */
|
/* DEFAULT VALUE FOR SENSORS */
|
||||||
#define ST_ACCEL_DEFAULT_OUT_X_L_ADDR 0x28
|
#define ST_ACCEL_DEFAULT_OUT_X_L_ADDR 0x28
|
||||||
#define ST_ACCEL_DEFAULT_OUT_Y_L_ADDR 0x2a
|
#define ST_ACCEL_DEFAULT_OUT_Y_L_ADDR 0x2a
|
||||||
|
@ -125,22 +127,34 @@
|
||||||
#define ST_ACCEL_3_MULTIREAD_BIT false
|
#define ST_ACCEL_3_MULTIREAD_BIT false
|
||||||
|
|
||||||
static const struct iio_chan_spec st_accel_12bit_channels[] = {
|
static const struct iio_chan_spec st_accel_12bit_channels[] = {
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
|
ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 12, 16,
|
||||||
ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
|
ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 12, 16,
|
||||||
|
ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 12, 16,
|
||||||
|
ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
|
||||||
IIO_CHAN_SOFT_TIMESTAMP(3)
|
IIO_CHAN_SOFT_TIMESTAMP(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct iio_chan_spec st_accel_16bit_channels[] = {
|
static const struct iio_chan_spec st_accel_16bit_channels[] = {
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
|
ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
|
ST_ACCEL_DEFAULT_OUT_X_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
|
||||||
|
ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
|
||||||
|
ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),
|
||||||
IIO_CHAN_SOFT_TIMESTAMP(3)
|
IIO_CHAN_SOFT_TIMESTAMP(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -442,6 +456,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto st_accel_common_probe_error;
|
goto st_accel_common_probe_error;
|
||||||
|
|
||||||
|
adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;
|
||||||
adata->multiread_bit = adata->sensor->multi_read_bit;
|
adata->multiread_bit = adata->sensor->multi_read_bit;
|
||||||
indio_dev->channels = adata->sensor->ch;
|
indio_dev->channels = adata->sensor->ch;
|
||||||
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
||||||
|
|
|
@ -774,11 +774,13 @@ static int at91_adc_remove(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF
|
||||||
static const struct of_device_id at91_adc_dt_ids[] = {
|
static const struct of_device_id at91_adc_dt_ids[] = {
|
||||||
{ .compatible = "atmel,at91sam9260-adc" },
|
{ .compatible = "atmel,at91sam9260-adc" },
|
||||||
{},
|
{},
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
|
MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
|
||||||
|
#endif
|
||||||
|
|
||||||
static struct platform_driver at91_adc_driver = {
|
static struct platform_driver at91_adc_driver = {
|
||||||
.probe = at91_adc_probe,
|
.probe = at91_adc_probe,
|
||||||
|
|
|
@ -660,7 +660,7 @@ static ssize_t max1363_monitor_store_freq(struct device *dev,
|
||||||
unsigned long val;
|
unsigned long val;
|
||||||
bool found = false;
|
bool found = false;
|
||||||
|
|
||||||
ret = strict_strtoul(buf, 10, &val);
|
ret = kstrtoul(buf, 10, &val);
|
||||||
if (ret)
|
if (ret)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
for (i = 0; i < ARRAY_SIZE(max1363_monitor_speeds); i++)
|
for (i = 0; i < ARRAY_SIZE(max1363_monitor_speeds); i++)
|
||||||
|
|
|
@ -24,11 +24,20 @@
|
||||||
|
|
||||||
int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
|
int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
|
||||||
{
|
{
|
||||||
|
u8 *addr;
|
||||||
int i, n = 0, len;
|
int i, n = 0, len;
|
||||||
u8 addr[ST_SENSORS_NUMBER_DATA_CHANNELS];
|
|
||||||
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
||||||
|
unsigned int num_data_channels = sdata->num_data_channels;
|
||||||
|
unsigned int byte_for_channel =
|
||||||
|
indio_dev->channels[0].scan_type.storagebits >> 3;
|
||||||
|
|
||||||
for (i = 0; i < ST_SENSORS_NUMBER_DATA_CHANNELS; i++) {
|
addr = kmalloc(num_data_channels, GFP_KERNEL);
|
||||||
|
if (!addr) {
|
||||||
|
len = -ENOMEM;
|
||||||
|
goto st_sensors_get_buffer_element_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i = 0; i < num_data_channels; i++) {
|
||||||
if (test_bit(i, indio_dev->active_scan_mask)) {
|
if (test_bit(i, indio_dev->active_scan_mask)) {
|
||||||
addr[n] = indio_dev->channels[i].address;
|
addr[n] = indio_dev->channels[i].address;
|
||||||
n++;
|
n++;
|
||||||
|
@ -37,52 +46,58 @@ int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf)
|
||||||
switch (n) {
|
switch (n) {
|
||||||
case 1:
|
case 1:
|
||||||
len = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
len = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
||||||
addr[0], ST_SENSORS_BYTE_FOR_CHANNEL, buf,
|
addr[0], byte_for_channel, buf, sdata->multiread_bit);
|
||||||
sdata->multiread_bit);
|
|
||||||
break;
|
break;
|
||||||
case 2:
|
case 2:
|
||||||
if ((addr[1] - addr[0]) == ST_SENSORS_BYTE_FOR_CHANNEL) {
|
if ((addr[1] - addr[0]) == byte_for_channel) {
|
||||||
len = sdata->tf->read_multiple_byte(&sdata->tb,
|
len = sdata->tf->read_multiple_byte(&sdata->tb,
|
||||||
sdata->dev, addr[0],
|
sdata->dev, addr[0], byte_for_channel * n,
|
||||||
ST_SENSORS_BYTE_FOR_CHANNEL*n,
|
|
||||||
buf, sdata->multiread_bit);
|
buf, sdata->multiread_bit);
|
||||||
} else {
|
} else {
|
||||||
u8 rx_array[ST_SENSORS_BYTE_FOR_CHANNEL*
|
u8 *rx_array;
|
||||||
ST_SENSORS_NUMBER_DATA_CHANNELS];
|
rx_array = kmalloc(byte_for_channel * num_data_channels,
|
||||||
|
GFP_KERNEL);
|
||||||
|
if (!rx_array) {
|
||||||
|
len = -ENOMEM;
|
||||||
|
goto st_sensors_free_memory;
|
||||||
|
}
|
||||||
|
|
||||||
len = sdata->tf->read_multiple_byte(&sdata->tb,
|
len = sdata->tf->read_multiple_byte(&sdata->tb,
|
||||||
sdata->dev, addr[0],
|
sdata->dev, addr[0],
|
||||||
ST_SENSORS_BYTE_FOR_CHANNEL*
|
byte_for_channel * num_data_channels,
|
||||||
ST_SENSORS_NUMBER_DATA_CHANNELS,
|
|
||||||
rx_array, sdata->multiread_bit);
|
rx_array, sdata->multiread_bit);
|
||||||
if (len < 0)
|
if (len < 0) {
|
||||||
goto read_data_channels_error;
|
kfree(rx_array);
|
||||||
|
goto st_sensors_free_memory;
|
||||||
|
}
|
||||||
|
|
||||||
for (i = 0; i < n * ST_SENSORS_NUMBER_DATA_CHANNELS;
|
for (i = 0; i < n * num_data_channels; i++) {
|
||||||
i++) {
|
|
||||||
if (i < n)
|
if (i < n)
|
||||||
buf[i] = rx_array[i];
|
buf[i] = rx_array[i];
|
||||||
else
|
else
|
||||||
buf[i] = rx_array[n + i];
|
buf[i] = rx_array[n + i];
|
||||||
}
|
}
|
||||||
len = ST_SENSORS_BYTE_FOR_CHANNEL*n;
|
kfree(rx_array);
|
||||||
|
len = byte_for_channel * n;
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 3:
|
case 3:
|
||||||
len = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
len = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
||||||
addr[0], ST_SENSORS_BYTE_FOR_CHANNEL*
|
addr[0], byte_for_channel * num_data_channels,
|
||||||
ST_SENSORS_NUMBER_DATA_CHANNELS,
|
|
||||||
buf, sdata->multiread_bit);
|
buf, sdata->multiread_bit);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
len = -EINVAL;
|
len = -EINVAL;
|
||||||
goto read_data_channels_error;
|
goto st_sensors_free_memory;
|
||||||
}
|
}
|
||||||
if (len != ST_SENSORS_BYTE_FOR_CHANNEL*n) {
|
if (len != byte_for_channel * n) {
|
||||||
len = -EIO;
|
len = -EIO;
|
||||||
goto read_data_channels_error;
|
goto st_sensors_free_memory;
|
||||||
}
|
}
|
||||||
|
|
||||||
read_data_channels_error:
|
st_sensors_free_memory:
|
||||||
|
kfree(addr);
|
||||||
|
st_sensors_get_buffer_element_error:
|
||||||
return len;
|
return len;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(st_sensors_get_buffer_element);
|
EXPORT_SYMBOL(st_sensors_get_buffer_element);
|
||||||
|
|
|
@ -20,6 +20,11 @@
|
||||||
|
|
||||||
#define ST_SENSORS_WAI_ADDRESS 0x0f
|
#define ST_SENSORS_WAI_ADDRESS 0x0f
|
||||||
|
|
||||||
|
static inline u32 st_sensors_get_unaligned_le24(const u8 *p)
|
||||||
|
{
|
||||||
|
return ((s32)((p[0] | p[1] << 8 | p[2] << 16) << 8) >> 8);
|
||||||
|
}
|
||||||
|
|
||||||
static int st_sensors_write_data_with_mask(struct iio_dev *indio_dev,
|
static int st_sensors_write_data_with_mask(struct iio_dev *indio_dev,
|
||||||
u8 reg_addr, u8 mask, u8 data)
|
u8 reg_addr, u8 mask, u8 data)
|
||||||
{
|
{
|
||||||
|
@ -112,7 +117,8 @@ st_sensors_match_odr_error:
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int st_sensors_set_fullscale(struct iio_dev *indio_dev, unsigned int fs)
|
static int st_sensors_set_fullscale(struct iio_dev *indio_dev,
|
||||||
|
unsigned int fs)
|
||||||
{
|
{
|
||||||
int err, i = 0;
|
int err, i = 0;
|
||||||
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
||||||
|
@ -273,21 +279,33 @@ st_sensors_match_scale_error:
|
||||||
EXPORT_SYMBOL(st_sensors_set_fullscale_by_gain);
|
EXPORT_SYMBOL(st_sensors_set_fullscale_by_gain);
|
||||||
|
|
||||||
static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
|
static int st_sensors_read_axis_data(struct iio_dev *indio_dev,
|
||||||
u8 ch_addr, int *data)
|
struct iio_chan_spec const *ch, int *data)
|
||||||
{
|
{
|
||||||
int err;
|
int err;
|
||||||
u8 outdata[ST_SENSORS_BYTE_FOR_CHANNEL];
|
u8 *outdata;
|
||||||
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
struct st_sensor_data *sdata = iio_priv(indio_dev);
|
||||||
|
unsigned int byte_for_channel = ch->scan_type.storagebits >> 3;
|
||||||
|
|
||||||
|
outdata = kmalloc(byte_for_channel, GFP_KERNEL);
|
||||||
|
if (!outdata) {
|
||||||
|
err = -EINVAL;
|
||||||
|
goto st_sensors_read_axis_data_error;
|
||||||
|
}
|
||||||
|
|
||||||
err = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
err = sdata->tf->read_multiple_byte(&sdata->tb, sdata->dev,
|
||||||
ch_addr, ST_SENSORS_BYTE_FOR_CHANNEL,
|
ch->address, byte_for_channel,
|
||||||
outdata, sdata->multiread_bit);
|
outdata, sdata->multiread_bit);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto read_error;
|
goto st_sensors_free_memory;
|
||||||
|
|
||||||
|
if (byte_for_channel == 2)
|
||||||
*data = (s16)get_unaligned_le16(outdata);
|
*data = (s16)get_unaligned_le16(outdata);
|
||||||
|
else if (byte_for_channel == 3)
|
||||||
|
*data = (s32)st_sensors_get_unaligned_le24(outdata);
|
||||||
|
|
||||||
read_error:
|
st_sensors_free_memory:
|
||||||
|
kfree(outdata);
|
||||||
|
st_sensors_read_axis_data_error:
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -307,7 +325,7 @@ int st_sensors_read_info_raw(struct iio_dev *indio_dev,
|
||||||
goto read_error;
|
goto read_error;
|
||||||
|
|
||||||
msleep((sdata->sensor->bootime * 1000) / sdata->odr);
|
msleep((sdata->sensor->bootime * 1000) / sdata->odr);
|
||||||
err = st_sensors_read_axis_data(indio_dev, ch->address, val);
|
err = st_sensors_read_axis_data(indio_dev, ch, val);
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto read_error;
|
goto read_error;
|
||||||
|
|
||||||
|
|
|
@ -27,6 +27,8 @@
|
||||||
#include <linux/iio/common/st_sensors.h>
|
#include <linux/iio/common/st_sensors.h>
|
||||||
#include "st_gyro.h"
|
#include "st_gyro.h"
|
||||||
|
|
||||||
|
#define ST_GYRO_NUMBER_DATA_CHANNELS 3
|
||||||
|
|
||||||
/* DEFAULT VALUE FOR SENSORS */
|
/* DEFAULT VALUE FOR SENSORS */
|
||||||
#define ST_GYRO_DEFAULT_OUT_X_L_ADDR 0x28
|
#define ST_GYRO_DEFAULT_OUT_X_L_ADDR 0x28
|
||||||
#define ST_GYRO_DEFAULT_OUT_Y_L_ADDR 0x2a
|
#define ST_GYRO_DEFAULT_OUT_Y_L_ADDR 0x2a
|
||||||
|
@ -86,14 +88,17 @@
|
||||||
#define ST_GYRO_2_MULTIREAD_BIT true
|
#define ST_GYRO_2_MULTIREAD_BIT true
|
||||||
|
|
||||||
static const struct iio_chan_spec st_gyro_16bit_channels[] = {
|
static const struct iio_chan_spec st_gyro_16bit_channels[] = {
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_X,
|
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
|
||||||
IIO_MOD_X, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
|
||||||
ST_GYRO_DEFAULT_OUT_X_L_ADDR),
|
ST_GYRO_DEFAULT_OUT_X_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_Y,
|
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
|
||||||
IIO_MOD_Y, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
|
||||||
ST_GYRO_DEFAULT_OUT_Y_L_ADDR),
|
ST_GYRO_DEFAULT_OUT_Y_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL, ST_SENSORS_SCAN_Z,
|
ST_SENSORS_LSM_CHANNELS(IIO_ANGL_VEL,
|
||||||
IIO_MOD_Z, IIO_LE, ST_SENSORS_DEFAULT_16_REALBITS,
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
|
||||||
ST_GYRO_DEFAULT_OUT_Z_L_ADDR),
|
ST_GYRO_DEFAULT_OUT_Z_L_ADDR),
|
||||||
IIO_CHAN_SOFT_TIMESTAMP(3)
|
IIO_CHAN_SOFT_TIMESTAMP(3)
|
||||||
};
|
};
|
||||||
|
@ -310,6 +315,7 @@ int st_gyro_common_probe(struct iio_dev *indio_dev)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto st_gyro_common_probe_error;
|
goto st_gyro_common_probe_error;
|
||||||
|
|
||||||
|
gdata->num_data_channels = ST_GYRO_NUMBER_DATA_CHANNELS;
|
||||||
gdata->multiread_bit = gdata->sensor->multi_read_bit;
|
gdata->multiread_bit = gdata->sensor->multi_read_bit;
|
||||||
indio_dev->channels = gdata->sensor->ch;
|
indio_dev->channels = gdata->sensor->ch;
|
||||||
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
||||||
|
|
|
@ -26,6 +26,8 @@
|
||||||
#include <linux/iio/common/st_sensors.h>
|
#include <linux/iio/common/st_sensors.h>
|
||||||
#include "st_magn.h"
|
#include "st_magn.h"
|
||||||
|
|
||||||
|
#define ST_MAGN_NUMBER_DATA_CHANNELS 3
|
||||||
|
|
||||||
/* DEFAULT VALUE FOR SENSORS */
|
/* DEFAULT VALUE FOR SENSORS */
|
||||||
#define ST_MAGN_DEFAULT_OUT_X_L_ADDR 0X04
|
#define ST_MAGN_DEFAULT_OUT_X_L_ADDR 0X04
|
||||||
#define ST_MAGN_DEFAULT_OUT_Y_L_ADDR 0X08
|
#define ST_MAGN_DEFAULT_OUT_Y_L_ADDR 0X08
|
||||||
|
@ -113,22 +115,34 @@
|
||||||
#define ST_MAGN_2_OUT_Z_L_ADDR 0x2c
|
#define ST_MAGN_2_OUT_Z_L_ADDR 0x2c
|
||||||
|
|
||||||
static const struct iio_chan_spec st_magn_16bit_channels[] = {
|
static const struct iio_chan_spec st_magn_16bit_channels[] = {
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_X_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
|
ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_Y_L_ADDR),
|
ST_MAGN_DEFAULT_OUT_X_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_DEFAULT_OUT_Z_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
|
||||||
|
ST_MAGN_DEFAULT_OUT_Y_L_ADDR),
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
|
||||||
|
ST_MAGN_DEFAULT_OUT_Z_L_ADDR),
|
||||||
IIO_CHAN_SOFT_TIMESTAMP(3)
|
IIO_CHAN_SOFT_TIMESTAMP(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
|
static const struct iio_chan_spec st_magn_2_16bit_channels[] = {
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_X_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,
|
ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_Y_L_ADDR),
|
ST_MAGN_2_OUT_X_L_ADDR),
|
||||||
ST_SENSORS_LSM_CHANNELS(IIO_MAGN, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
ST_SENSORS_DEFAULT_16_REALBITS, ST_MAGN_2_OUT_Z_L_ADDR),
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,
|
||||||
|
ST_MAGN_2_OUT_Y_L_ADDR),
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_MAGN,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,
|
||||||
|
ST_MAGN_2_OUT_Z_L_ADDR),
|
||||||
IIO_CHAN_SOFT_TIMESTAMP(3)
|
IIO_CHAN_SOFT_TIMESTAMP(3)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -344,6 +358,7 @@ int st_magn_common_probe(struct iio_dev *indio_dev)
|
||||||
if (err < 0)
|
if (err < 0)
|
||||||
goto st_magn_common_probe_error;
|
goto st_magn_common_probe_error;
|
||||||
|
|
||||||
|
mdata->num_data_channels = ST_MAGN_NUMBER_DATA_CHANNELS;
|
||||||
mdata->multiread_bit = mdata->sensor->multi_read_bit;
|
mdata->multiread_bit = mdata->sensor->multi_read_bit;
|
||||||
indio_dev->channels = mdata->sensor->ch;
|
indio_dev->channels = mdata->sensor->ch;
|
||||||
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;
|
||||||
|
|
|
@ -0,0 +1,35 @@
|
||||||
|
#
|
||||||
|
# Pressure drivers
|
||||||
|
#
|
||||||
|
menu "Pressure Sensors"
|
||||||
|
|
||||||
|
config IIO_ST_PRESS
|
||||||
|
tristate "STMicroelectronics pressures Driver"
|
||||||
|
depends on (I2C || SPI_MASTER) && SYSFS
|
||||||
|
select IIO_ST_SENSORS_CORE
|
||||||
|
select IIO_ST_PRESS_I2C if (I2C)
|
||||||
|
select IIO_ST_PRESS_SPI if (SPI_MASTER)
|
||||||
|
select IIO_TRIGGERED_BUFFER if (IIO_BUFFER)
|
||||||
|
help
|
||||||
|
Say yes here to build support for STMicroelectronics pressures:
|
||||||
|
LPS331AP.
|
||||||
|
|
||||||
|
This driver can also be built as a module. If so, will be created
|
||||||
|
these modules:
|
||||||
|
- st_pressure (core functions for the driver [it is mandatory]);
|
||||||
|
- st_pressure_i2c (necessary for the I2C devices [optional*]);
|
||||||
|
- st_pressure_spi (necessary for the SPI devices [optional*]);
|
||||||
|
|
||||||
|
(*) one of these is necessary to do something.
|
||||||
|
|
||||||
|
config IIO_ST_PRESS_I2C
|
||||||
|
tristate
|
||||||
|
depends on IIO_ST_PRESS
|
||||||
|
depends on IIO_ST_SENSORS_I2C
|
||||||
|
|
||||||
|
config IIO_ST_PRESS_SPI
|
||||||
|
tristate
|
||||||
|
depends on IIO_ST_PRESS
|
||||||
|
depends on IIO_ST_SENSORS_SPI
|
||||||
|
|
||||||
|
endmenu
|
|
@ -0,0 +1,10 @@
|
||||||
|
#
|
||||||
|
# Makefile for industrial I/O pressure drivers
|
||||||
|
#
|
||||||
|
|
||||||
|
obj-$(CONFIG_IIO_ST_PRESS) += st_pressure.o
|
||||||
|
st_pressure-y := st_pressure_core.o
|
||||||
|
st_pressure-$(CONFIG_IIO_BUFFER) += st_pressure_buffer.o
|
||||||
|
|
||||||
|
obj-$(CONFIG_IIO_ST_PRESS_I2C) += st_pressure_i2c.o
|
||||||
|
obj-$(CONFIG_IIO_ST_PRESS_SPI) += st_pressure_spi.o
|
|
@ -0,0 +1,39 @@
|
||||||
|
/*
|
||||||
|
* STMicroelectronics pressures driver
|
||||||
|
*
|
||||||
|
* Copyright 2013 STMicroelectronics Inc.
|
||||||
|
*
|
||||||
|
* Denis Ciocca <denis.ciocca@st.com>
|
||||||
|
* v. 1.0.0
|
||||||
|
* Licensed under the GPL-2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ST_PRESS_H
|
||||||
|
#define ST_PRESS_H
|
||||||
|
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/iio/common/st_sensors.h>
|
||||||
|
|
||||||
|
#define LPS331AP_PRESS_DEV_NAME "lps331ap"
|
||||||
|
|
||||||
|
int st_press_common_probe(struct iio_dev *indio_dev);
|
||||||
|
void st_press_common_remove(struct iio_dev *indio_dev);
|
||||||
|
|
||||||
|
#ifdef CONFIG_IIO_BUFFER
|
||||||
|
int st_press_allocate_ring(struct iio_dev *indio_dev);
|
||||||
|
void st_press_deallocate_ring(struct iio_dev *indio_dev);
|
||||||
|
int st_press_trig_set_state(struct iio_trigger *trig, bool state);
|
||||||
|
#define ST_PRESS_TRIGGER_SET_STATE (&st_press_trig_set_state)
|
||||||
|
#else /* CONFIG_IIO_BUFFER */
|
||||||
|
static inline int st_press_allocate_ring(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static inline void st_press_deallocate_ring(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
#define ST_PRESS_TRIGGER_SET_STATE NULL
|
||||||
|
#endif /* CONFIG_IIO_BUFFER */
|
||||||
|
|
||||||
|
#endif /* ST_PRESS_H */
|
|
@ -0,0 +1,105 @@
|
||||||
|
/*
|
||||||
|
* STMicroelectronics pressures driver
|
||||||
|
*
|
||||||
|
* Copyright 2013 STMicroelectronics Inc.
|
||||||
|
*
|
||||||
|
* Denis Ciocca <denis.ciocca@st.com>
|
||||||
|
*
|
||||||
|
* Licensed under the GPL-2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/stat.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
|
#include <linux/i2c.h>
|
||||||
|
#include <linux/delay.h>
|
||||||
|
#include <linux/iio/iio.h>
|
||||||
|
#include <linux/iio/buffer.h>
|
||||||
|
#include <linux/iio/trigger_consumer.h>
|
||||||
|
#include <linux/iio/triggered_buffer.h>
|
||||||
|
|
||||||
|
#include <linux/iio/common/st_sensors.h>
|
||||||
|
#include "st_pressure.h"
|
||||||
|
|
||||||
|
int st_press_trig_set_state(struct iio_trigger *trig, bool state)
|
||||||
|
{
|
||||||
|
struct iio_dev *indio_dev = iio_trigger_get_drvdata(trig);
|
||||||
|
|
||||||
|
return st_sensors_set_dataready_irq(indio_dev, state);
|
||||||
|
}
|
||||||
|
|
||||||
|
static int st_press_buffer_preenable(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
|
||||||
|
err = st_sensors_set_enable(indio_dev, true);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_set_enable_error;
|
||||||
|
|
||||||
|
err = iio_sw_buffer_preenable(indio_dev);
|
||||||
|
|
||||||
|
st_press_set_enable_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int st_press_buffer_postenable(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
struct st_sensor_data *pdata = iio_priv(indio_dev);
|
||||||
|
|
||||||
|
pdata->buffer_data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);
|
||||||
|
if (pdata->buffer_data == NULL) {
|
||||||
|
err = -ENOMEM;
|
||||||
|
goto allocate_memory_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = iio_triggered_buffer_postenable(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_buffer_postenable_error;
|
||||||
|
|
||||||
|
return err;
|
||||||
|
|
||||||
|
st_press_buffer_postenable_error:
|
||||||
|
kfree(pdata->buffer_data);
|
||||||
|
allocate_memory_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int st_press_buffer_predisable(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
struct st_sensor_data *pdata = iio_priv(indio_dev);
|
||||||
|
|
||||||
|
err = iio_triggered_buffer_predisable(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_buffer_predisable_error;
|
||||||
|
|
||||||
|
err = st_sensors_set_enable(indio_dev, false);
|
||||||
|
|
||||||
|
st_press_buffer_predisable_error:
|
||||||
|
kfree(pdata->buffer_data);
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct iio_buffer_setup_ops st_press_buffer_setup_ops = {
|
||||||
|
.preenable = &st_press_buffer_preenable,
|
||||||
|
.postenable = &st_press_buffer_postenable,
|
||||||
|
.predisable = &st_press_buffer_predisable,
|
||||||
|
};
|
||||||
|
|
||||||
|
int st_press_allocate_ring(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,
|
||||||
|
&st_sensors_trigger_handler, &st_press_buffer_setup_ops);
|
||||||
|
}
|
||||||
|
|
||||||
|
void st_press_deallocate_ring(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
iio_triggered_buffer_cleanup(indio_dev);
|
||||||
|
}
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
||||||
|
MODULE_DESCRIPTION("STMicroelectronics pressures buffer");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -0,0 +1,272 @@
|
||||||
|
/*
|
||||||
|
* STMicroelectronics pressures driver
|
||||||
|
*
|
||||||
|
* Copyright 2013 STMicroelectronics Inc.
|
||||||
|
*
|
||||||
|
* Denis Ciocca <denis.ciocca@st.com>
|
||||||
|
*
|
||||||
|
* Licensed under the GPL-2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/errno.h>
|
||||||
|
#include <linux/types.h>
|
||||||
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
|
#include <linux/i2c.h>
|
||||||
|
#include <linux/gpio.h>
|
||||||
|
#include <linux/irq.h>
|
||||||
|
#include <linux/delay.h>
|
||||||
|
#include <linux/iio/iio.h>
|
||||||
|
#include <linux/iio/sysfs.h>
|
||||||
|
#include <linux/iio/trigger.h>
|
||||||
|
#include <linux/iio/buffer.h>
|
||||||
|
#include <asm/unaligned.h>
|
||||||
|
|
||||||
|
#include <linux/iio/common/st_sensors.h>
|
||||||
|
#include "st_pressure.h"
|
||||||
|
|
||||||
|
#define ST_PRESS_MBAR_TO_KPASCAL(x) (x * 10)
|
||||||
|
#define ST_PRESS_NUMBER_DATA_CHANNELS 1
|
||||||
|
|
||||||
|
/* DEFAULT VALUE FOR SENSORS */
|
||||||
|
#define ST_PRESS_DEFAULT_OUT_XL_ADDR 0x28
|
||||||
|
#define ST_TEMP_DEFAULT_OUT_L_ADDR 0x2b
|
||||||
|
|
||||||
|
/* FULLSCALE */
|
||||||
|
#define ST_PRESS_FS_AVL_1260MB 1260
|
||||||
|
|
||||||
|
/* CUSTOM VALUES FOR SENSOR 1 */
|
||||||
|
#define ST_PRESS_1_WAI_EXP 0xbb
|
||||||
|
#define ST_PRESS_1_ODR_ADDR 0x20
|
||||||
|
#define ST_PRESS_1_ODR_MASK 0x70
|
||||||
|
#define ST_PRESS_1_ODR_AVL_1HZ_VAL 0x01
|
||||||
|
#define ST_PRESS_1_ODR_AVL_7HZ_VAL 0x05
|
||||||
|
#define ST_PRESS_1_ODR_AVL_13HZ_VAL 0x06
|
||||||
|
#define ST_PRESS_1_ODR_AVL_25HZ_VAL 0x07
|
||||||
|
#define ST_PRESS_1_PW_ADDR 0x20
|
||||||
|
#define ST_PRESS_1_PW_MASK 0x80
|
||||||
|
#define ST_PRESS_1_FS_ADDR 0x23
|
||||||
|
#define ST_PRESS_1_FS_MASK 0x30
|
||||||
|
#define ST_PRESS_1_FS_AVL_1260_VAL 0x00
|
||||||
|
#define ST_PRESS_1_FS_AVL_1260_GAIN ST_PRESS_MBAR_TO_KPASCAL(244141)
|
||||||
|
#define ST_PRESS_1_FS_AVL_TEMP_GAIN 2083000
|
||||||
|
#define ST_PRESS_1_BDU_ADDR 0x20
|
||||||
|
#define ST_PRESS_1_BDU_MASK 0x04
|
||||||
|
#define ST_PRESS_1_DRDY_IRQ_ADDR 0x22
|
||||||
|
#define ST_PRESS_1_DRDY_IRQ_MASK 0x04
|
||||||
|
#define ST_PRESS_1_MULTIREAD_BIT true
|
||||||
|
#define ST_PRESS_1_TEMP_OFFSET 42500
|
||||||
|
|
||||||
|
static const struct iio_chan_spec st_press_channels[] = {
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_PRESSURE,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),
|
||||||
|
ST_SENSORS_SCAN_X, 0, IIO_NO_MOD, 'u', IIO_LE, 24, 24,
|
||||||
|
ST_PRESS_DEFAULT_OUT_XL_ADDR),
|
||||||
|
ST_SENSORS_LSM_CHANNELS(IIO_TEMP,
|
||||||
|
BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) |
|
||||||
|
BIT(IIO_CHAN_INFO_OFFSET),
|
||||||
|
-1, 0, IIO_NO_MOD, 's', IIO_LE, 16, 16,
|
||||||
|
ST_TEMP_DEFAULT_OUT_L_ADDR),
|
||||||
|
IIO_CHAN_SOFT_TIMESTAMP(1)
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct st_sensors st_press_sensors[] = {
|
||||||
|
{
|
||||||
|
.wai = ST_PRESS_1_WAI_EXP,
|
||||||
|
.sensors_supported = {
|
||||||
|
[0] = LPS331AP_PRESS_DEV_NAME,
|
||||||
|
},
|
||||||
|
.ch = (struct iio_chan_spec *)st_press_channels,
|
||||||
|
.odr = {
|
||||||
|
.addr = ST_PRESS_1_ODR_ADDR,
|
||||||
|
.mask = ST_PRESS_1_ODR_MASK,
|
||||||
|
.odr_avl = {
|
||||||
|
{ 1, ST_PRESS_1_ODR_AVL_1HZ_VAL, },
|
||||||
|
{ 7, ST_PRESS_1_ODR_AVL_7HZ_VAL, },
|
||||||
|
{ 13, ST_PRESS_1_ODR_AVL_13HZ_VAL, },
|
||||||
|
{ 25, ST_PRESS_1_ODR_AVL_25HZ_VAL, },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
.pw = {
|
||||||
|
.addr = ST_PRESS_1_PW_ADDR,
|
||||||
|
.mask = ST_PRESS_1_PW_MASK,
|
||||||
|
.value_on = ST_SENSORS_DEFAULT_POWER_ON_VALUE,
|
||||||
|
.value_off = ST_SENSORS_DEFAULT_POWER_OFF_VALUE,
|
||||||
|
},
|
||||||
|
.fs = {
|
||||||
|
.addr = ST_PRESS_1_FS_ADDR,
|
||||||
|
.mask = ST_PRESS_1_FS_MASK,
|
||||||
|
.fs_avl = {
|
||||||
|
[0] = {
|
||||||
|
.num = ST_PRESS_FS_AVL_1260MB,
|
||||||
|
.value = ST_PRESS_1_FS_AVL_1260_VAL,
|
||||||
|
.gain = ST_PRESS_1_FS_AVL_1260_GAIN,
|
||||||
|
.gain2 = ST_PRESS_1_FS_AVL_TEMP_GAIN,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
.bdu = {
|
||||||
|
.addr = ST_PRESS_1_BDU_ADDR,
|
||||||
|
.mask = ST_PRESS_1_BDU_MASK,
|
||||||
|
},
|
||||||
|
.drdy_irq = {
|
||||||
|
.addr = ST_PRESS_1_DRDY_IRQ_ADDR,
|
||||||
|
.mask = ST_PRESS_1_DRDY_IRQ_MASK,
|
||||||
|
},
|
||||||
|
.multi_read_bit = ST_PRESS_1_MULTIREAD_BIT,
|
||||||
|
.bootime = 2,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
static int st_press_read_raw(struct iio_dev *indio_dev,
|
||||||
|
struct iio_chan_spec const *ch, int *val,
|
||||||
|
int *val2, long mask)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
struct st_sensor_data *pdata = iio_priv(indio_dev);
|
||||||
|
|
||||||
|
switch (mask) {
|
||||||
|
case IIO_CHAN_INFO_RAW:
|
||||||
|
err = st_sensors_read_info_raw(indio_dev, ch, val);
|
||||||
|
if (err < 0)
|
||||||
|
goto read_error;
|
||||||
|
|
||||||
|
return IIO_VAL_INT;
|
||||||
|
case IIO_CHAN_INFO_SCALE:
|
||||||
|
*val = 0;
|
||||||
|
|
||||||
|
switch (ch->type) {
|
||||||
|
case IIO_PRESSURE:
|
||||||
|
*val2 = pdata->current_fullscale->gain;
|
||||||
|
break;
|
||||||
|
case IIO_TEMP:
|
||||||
|
*val2 = pdata->current_fullscale->gain2;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
err = -EINVAL;
|
||||||
|
goto read_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
return IIO_VAL_INT_PLUS_NANO;
|
||||||
|
case IIO_CHAN_INFO_OFFSET:
|
||||||
|
switch (ch->type) {
|
||||||
|
case IIO_TEMP:
|
||||||
|
*val = 425;
|
||||||
|
*val2 = 10;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
err = -EINVAL;
|
||||||
|
goto read_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
return IIO_VAL_FRACTIONAL;
|
||||||
|
default:
|
||||||
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
read_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static ST_SENSOR_DEV_ATTR_SAMP_FREQ();
|
||||||
|
static ST_SENSORS_DEV_ATTR_SAMP_FREQ_AVAIL();
|
||||||
|
|
||||||
|
static struct attribute *st_press_attributes[] = {
|
||||||
|
&iio_dev_attr_sampling_frequency_available.dev_attr.attr,
|
||||||
|
&iio_dev_attr_sampling_frequency.dev_attr.attr,
|
||||||
|
NULL,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct attribute_group st_press_attribute_group = {
|
||||||
|
.attrs = st_press_attributes,
|
||||||
|
};
|
||||||
|
|
||||||
|
static const struct iio_info press_info = {
|
||||||
|
.driver_module = THIS_MODULE,
|
||||||
|
.attrs = &st_press_attribute_group,
|
||||||
|
.read_raw = &st_press_read_raw,
|
||||||
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_IIO_TRIGGER
|
||||||
|
static const struct iio_trigger_ops st_press_trigger_ops = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.set_trigger_state = ST_PRESS_TRIGGER_SET_STATE,
|
||||||
|
};
|
||||||
|
#define ST_PRESS_TRIGGER_OPS (&st_press_trigger_ops)
|
||||||
|
#else
|
||||||
|
#define ST_PRESS_TRIGGER_OPS NULL
|
||||||
|
#endif
|
||||||
|
|
||||||
|
int st_press_common_probe(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
int err;
|
||||||
|
struct st_sensor_data *pdata = iio_priv(indio_dev);
|
||||||
|
|
||||||
|
indio_dev->modes = INDIO_DIRECT_MODE;
|
||||||
|
indio_dev->info = &press_info;
|
||||||
|
|
||||||
|
err = st_sensors_check_device_support(indio_dev,
|
||||||
|
ARRAY_SIZE(st_press_sensors), st_press_sensors);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_common_probe_error;
|
||||||
|
|
||||||
|
pdata->num_data_channels = ST_PRESS_NUMBER_DATA_CHANNELS;
|
||||||
|
pdata->multiread_bit = pdata->sensor->multi_read_bit;
|
||||||
|
indio_dev->channels = pdata->sensor->ch;
|
||||||
|
indio_dev->num_channels = ARRAY_SIZE(st_press_channels);
|
||||||
|
|
||||||
|
pdata->current_fullscale = (struct st_sensor_fullscale_avl *)
|
||||||
|
&pdata->sensor->fs.fs_avl[0];
|
||||||
|
pdata->odr = pdata->sensor->odr.odr_avl[0].hz;
|
||||||
|
|
||||||
|
err = st_sensors_init_sensor(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_common_probe_error;
|
||||||
|
|
||||||
|
if (pdata->get_irq_data_ready(indio_dev) > 0) {
|
||||||
|
err = st_press_allocate_ring(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_common_probe_error;
|
||||||
|
|
||||||
|
err = st_sensors_allocate_trigger(indio_dev,
|
||||||
|
ST_PRESS_TRIGGER_OPS);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_probe_trigger_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
err = iio_device_register(indio_dev);
|
||||||
|
if (err)
|
||||||
|
goto st_press_device_register_error;
|
||||||
|
|
||||||
|
return err;
|
||||||
|
|
||||||
|
st_press_device_register_error:
|
||||||
|
if (pdata->get_irq_data_ready(indio_dev) > 0)
|
||||||
|
st_sensors_deallocate_trigger(indio_dev);
|
||||||
|
st_press_probe_trigger_error:
|
||||||
|
if (pdata->get_irq_data_ready(indio_dev) > 0)
|
||||||
|
st_press_deallocate_ring(indio_dev);
|
||||||
|
st_press_common_probe_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(st_press_common_probe);
|
||||||
|
|
||||||
|
void st_press_common_remove(struct iio_dev *indio_dev)
|
||||||
|
{
|
||||||
|
struct st_sensor_data *pdata = iio_priv(indio_dev);
|
||||||
|
|
||||||
|
iio_device_unregister(indio_dev);
|
||||||
|
if (pdata->get_irq_data_ready(indio_dev) > 0) {
|
||||||
|
st_sensors_deallocate_trigger(indio_dev);
|
||||||
|
st_press_deallocate_ring(indio_dev);
|
||||||
|
}
|
||||||
|
iio_device_free(indio_dev);
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL(st_press_common_remove);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
||||||
|
MODULE_DESCRIPTION("STMicroelectronics pressures driver");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -0,0 +1,77 @@
|
||||||
|
/*
|
||||||
|
* STMicroelectronics pressures driver
|
||||||
|
*
|
||||||
|
* Copyright 2013 STMicroelectronics Inc.
|
||||||
|
*
|
||||||
|
* Denis Ciocca <denis.ciocca@st.com>
|
||||||
|
*
|
||||||
|
* Licensed under the GPL-2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/i2c.h>
|
||||||
|
#include <linux/iio/iio.h>
|
||||||
|
|
||||||
|
#include <linux/iio/common/st_sensors.h>
|
||||||
|
#include <linux/iio/common/st_sensors_i2c.h>
|
||||||
|
#include "st_pressure.h"
|
||||||
|
|
||||||
|
static int st_press_i2c_probe(struct i2c_client *client,
|
||||||
|
const struct i2c_device_id *id)
|
||||||
|
{
|
||||||
|
struct iio_dev *indio_dev;
|
||||||
|
struct st_sensor_data *pdata;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
indio_dev = iio_device_alloc(sizeof(*pdata));
|
||||||
|
if (indio_dev == NULL) {
|
||||||
|
err = -ENOMEM;
|
||||||
|
goto iio_device_alloc_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
pdata = iio_priv(indio_dev);
|
||||||
|
pdata->dev = &client->dev;
|
||||||
|
|
||||||
|
st_sensors_i2c_configure(indio_dev, client, pdata);
|
||||||
|
|
||||||
|
err = st_press_common_probe(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_common_probe_error;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
st_press_common_probe_error:
|
||||||
|
iio_device_free(indio_dev);
|
||||||
|
iio_device_alloc_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int st_press_i2c_remove(struct i2c_client *client)
|
||||||
|
{
|
||||||
|
st_press_common_remove(i2c_get_clientdata(client));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct i2c_device_id st_press_id_table[] = {
|
||||||
|
{ LPS331AP_PRESS_DEV_NAME },
|
||||||
|
{},
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(i2c, st_press_id_table);
|
||||||
|
|
||||||
|
static struct i2c_driver st_press_driver = {
|
||||||
|
.driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.name = "st-press-i2c",
|
||||||
|
},
|
||||||
|
.probe = st_press_i2c_probe,
|
||||||
|
.remove = st_press_i2c_remove,
|
||||||
|
.id_table = st_press_id_table,
|
||||||
|
};
|
||||||
|
module_i2c_driver(st_press_driver);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
||||||
|
MODULE_DESCRIPTION("STMicroelectronics pressures i2c driver");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
* STMicroelectronics pressures driver
|
||||||
|
*
|
||||||
|
* Copyright 2013 STMicroelectronics Inc.
|
||||||
|
*
|
||||||
|
* Denis Ciocca <denis.ciocca@st.com>
|
||||||
|
*
|
||||||
|
* Licensed under the GPL-2.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
#include <linux/spi/spi.h>
|
||||||
|
#include <linux/iio/iio.h>
|
||||||
|
|
||||||
|
#include <linux/iio/common/st_sensors.h>
|
||||||
|
#include <linux/iio/common/st_sensors_spi.h>
|
||||||
|
#include "st_pressure.h"
|
||||||
|
|
||||||
|
static int st_press_spi_probe(struct spi_device *spi)
|
||||||
|
{
|
||||||
|
struct iio_dev *indio_dev;
|
||||||
|
struct st_sensor_data *pdata;
|
||||||
|
int err;
|
||||||
|
|
||||||
|
indio_dev = iio_device_alloc(sizeof(*pdata));
|
||||||
|
if (indio_dev == NULL) {
|
||||||
|
err = -ENOMEM;
|
||||||
|
goto iio_device_alloc_error;
|
||||||
|
}
|
||||||
|
|
||||||
|
pdata = iio_priv(indio_dev);
|
||||||
|
pdata->dev = &spi->dev;
|
||||||
|
|
||||||
|
st_sensors_spi_configure(indio_dev, spi, pdata);
|
||||||
|
|
||||||
|
err = st_press_common_probe(indio_dev);
|
||||||
|
if (err < 0)
|
||||||
|
goto st_press_common_probe_error;
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
st_press_common_probe_error:
|
||||||
|
iio_device_free(indio_dev);
|
||||||
|
iio_device_alloc_error:
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int st_press_spi_remove(struct spi_device *spi)
|
||||||
|
{
|
||||||
|
st_press_common_remove(spi_get_drvdata(spi));
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct spi_device_id st_press_id_table[] = {
|
||||||
|
{ LPS331AP_PRESS_DEV_NAME },
|
||||||
|
{},
|
||||||
|
};
|
||||||
|
MODULE_DEVICE_TABLE(spi, st_press_id_table);
|
||||||
|
|
||||||
|
static struct spi_driver st_press_driver = {
|
||||||
|
.driver = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
.name = "st-press-spi",
|
||||||
|
},
|
||||||
|
.probe = st_press_spi_probe,
|
||||||
|
.remove = st_press_spi_remove,
|
||||||
|
.id_table = st_press_id_table,
|
||||||
|
};
|
||||||
|
module_spi_driver(st_press_driver);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Denis Ciocca <denis.ciocca@st.com>");
|
||||||
|
MODULE_DESCRIPTION("STMicroelectronics pressures spi driver");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -3,6 +3,15 @@
|
||||||
#
|
#
|
||||||
menu "Triggers - standalone"
|
menu "Triggers - standalone"
|
||||||
|
|
||||||
|
config IIO_INTERRUPT_TRIGGER
|
||||||
|
tristate "Generic interrupt trigger"
|
||||||
|
help
|
||||||
|
Provides support for using an interrupt of any type as an IIO
|
||||||
|
trigger. This may be provided by a gpio driver for example.
|
||||||
|
|
||||||
|
To compile this driver as a module, choose M here: the
|
||||||
|
module will be called iio-trig-interrupt.
|
||||||
|
|
||||||
config IIO_SYSFS_TRIGGER
|
config IIO_SYSFS_TRIGGER
|
||||||
tristate "SYSFS trigger"
|
tristate "SYSFS trigger"
|
||||||
depends on SYSFS
|
depends on SYSFS
|
||||||
|
|
|
@ -2,4 +2,5 @@
|
||||||
# Makefile for triggers not associated with iio-devices
|
# Makefile for triggers not associated with iio-devices
|
||||||
#
|
#
|
||||||
|
|
||||||
|
obj-$(CONFIG_IIO_INTERRUPT_TRIGGER) += iio-trig-interrupt.o
|
||||||
obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o
|
obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o
|
||||||
|
|
|
@ -0,0 +1,121 @@
|
||||||
|
/*
|
||||||
|
* Industrial I/O - generic interrupt based trigger support
|
||||||
|
*
|
||||||
|
* Copyright (c) 2008-2013 Jonathan Cameron
|
||||||
|
*
|
||||||
|
* 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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/module.h>
|
||||||
|
#include <linux/platform_device.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
|
#include <linux/slab.h>
|
||||||
|
|
||||||
|
#include <linux/iio/iio.h>
|
||||||
|
#include <linux/iio/trigger.h>
|
||||||
|
|
||||||
|
|
||||||
|
struct iio_interrupt_trigger_info {
|
||||||
|
unsigned int irq;
|
||||||
|
};
|
||||||
|
|
||||||
|
static irqreturn_t iio_interrupt_trigger_poll(int irq, void *private)
|
||||||
|
{
|
||||||
|
/* Timestamp not currently provided */
|
||||||
|
iio_trigger_poll(private, 0);
|
||||||
|
return IRQ_HANDLED;
|
||||||
|
}
|
||||||
|
|
||||||
|
static const struct iio_trigger_ops iio_interrupt_trigger_ops = {
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
};
|
||||||
|
|
||||||
|
static int iio_interrupt_trigger_probe(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct iio_interrupt_trigger_info *trig_info;
|
||||||
|
struct iio_trigger *trig;
|
||||||
|
unsigned long irqflags;
|
||||||
|
struct resource *irq_res;
|
||||||
|
int irq, ret = 0;
|
||||||
|
|
||||||
|
irq_res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
|
||||||
|
|
||||||
|
if (irq_res == NULL)
|
||||||
|
return -ENODEV;
|
||||||
|
|
||||||
|
irqflags = (irq_res->flags & IRQF_TRIGGER_MASK) | IRQF_SHARED;
|
||||||
|
|
||||||
|
irq = irq_res->start;
|
||||||
|
|
||||||
|
trig = iio_trigger_alloc("irqtrig%d", irq);
|
||||||
|
if (!trig) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto error_ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
trig_info = kzalloc(sizeof(*trig_info), GFP_KERNEL);
|
||||||
|
if (!trig_info) {
|
||||||
|
ret = -ENOMEM;
|
||||||
|
goto error_put_trigger;
|
||||||
|
}
|
||||||
|
iio_trigger_set_drvdata(trig, trig_info);
|
||||||
|
trig_info->irq = irq;
|
||||||
|
trig->ops = &iio_interrupt_trigger_ops;
|
||||||
|
ret = request_irq(irq, iio_interrupt_trigger_poll,
|
||||||
|
irqflags, trig->name, trig);
|
||||||
|
if (ret) {
|
||||||
|
dev_err(&pdev->dev,
|
||||||
|
"request IRQ-%d failed", irq);
|
||||||
|
goto error_free_trig_info;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = iio_trigger_register(trig);
|
||||||
|
if (ret)
|
||||||
|
goto error_release_irq;
|
||||||
|
platform_set_drvdata(pdev, trig);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
/* First clean up the partly allocated trigger */
|
||||||
|
error_release_irq:
|
||||||
|
free_irq(irq, trig);
|
||||||
|
error_free_trig_info:
|
||||||
|
kfree(trig_info);
|
||||||
|
error_put_trigger:
|
||||||
|
iio_trigger_put(trig);
|
||||||
|
error_ret:
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int iio_interrupt_trigger_remove(struct platform_device *pdev)
|
||||||
|
{
|
||||||
|
struct iio_trigger *trig;
|
||||||
|
struct iio_interrupt_trigger_info *trig_info;
|
||||||
|
|
||||||
|
trig = platform_get_drvdata(pdev);
|
||||||
|
trig_info = iio_trigger_get_drvdata(trig);
|
||||||
|
iio_trigger_unregister(trig);
|
||||||
|
free_irq(trig_info->irq, trig);
|
||||||
|
kfree(trig_info);
|
||||||
|
iio_trigger_put(trig);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
static struct platform_driver iio_interrupt_trigger_driver = {
|
||||||
|
.probe = iio_interrupt_trigger_probe,
|
||||||
|
.remove = iio_interrupt_trigger_remove,
|
||||||
|
.driver = {
|
||||||
|
.name = "iio_interrupt_trigger",
|
||||||
|
.owner = THIS_MODULE,
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
module_platform_driver(iio_interrupt_trigger_driver);
|
||||||
|
|
||||||
|
MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
|
||||||
|
MODULE_DESCRIPTION("Interrupt trigger for the iio subsystem");
|
||||||
|
MODULE_LICENSE("GPL v2");
|
|
@ -34,7 +34,7 @@ static ssize_t iio_sysfs_trig_add(struct device *dev,
|
||||||
int ret;
|
int ret;
|
||||||
unsigned long input;
|
unsigned long input;
|
||||||
|
|
||||||
ret = strict_strtoul(buf, 10, &input);
|
ret = kstrtoul(buf, 10, &input);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = iio_sysfs_trigger_probe(input);
|
ret = iio_sysfs_trigger_probe(input);
|
||||||
|
@ -53,7 +53,7 @@ static ssize_t iio_sysfs_trig_remove(struct device *dev,
|
||||||
int ret;
|
int ret;
|
||||||
unsigned long input;
|
unsigned long input;
|
||||||
|
|
||||||
ret = strict_strtoul(buf, 10, &input);
|
ret = kstrtoul(buf, 10, &input);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
ret = iio_sysfs_trigger_remove(input);
|
ret = iio_sysfs_trigger_remove(input);
|
||||||
|
|
|
@ -112,8 +112,6 @@ static int ad7606_par_remove(struct platform_device *pdev)
|
||||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||||
release_mem_region(res->start, resource_size(res));
|
release_mem_region(res->start, resource_size(res));
|
||||||
|
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -215,7 +215,6 @@ static int lpc32xx_adc_remove(struct platform_device *pdev)
|
||||||
|
|
||||||
iio_device_unregister(iodev);
|
iio_device_unregister(iodev);
|
||||||
free_irq(irq, info);
|
free_irq(irq, info);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
clk_put(info->clk);
|
clk_put(info->clk);
|
||||||
iounmap(info->adc_base);
|
iounmap(info->adc_base);
|
||||||
iio_device_free(iodev);
|
iio_device_free(iodev);
|
||||||
|
|
|
@ -407,7 +407,6 @@ static int spear_adc_remove(struct platform_device *pdev)
|
||||||
struct spear_adc_info *info = iio_priv(iodev);
|
struct spear_adc_info *info = iio_priv(iodev);
|
||||||
|
|
||||||
iio_device_unregister(iodev);
|
iio_device_unregister(iodev);
|
||||||
platform_set_drvdata(pdev, NULL);
|
|
||||||
clk_disable_unprepare(info->clk);
|
clk_disable_unprepare(info->clk);
|
||||||
clk_put(info->clk);
|
clk_put(info->clk);
|
||||||
iounmap(info->adc_base_spear6xx);
|
iounmap(info->adc_base_spear6xx);
|
||||||
|
@ -416,11 +415,13 @@ static int spear_adc_remove(struct platform_device *pdev)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef CONFIG_OF
|
||||||
static const struct of_device_id spear_adc_dt_ids[] = {
|
static const struct of_device_id spear_adc_dt_ids[] = {
|
||||||
{ .compatible = "st,spear600-adc", },
|
{ .compatible = "st,spear600-adc", },
|
||||||
{ /* sentinel */ }
|
{ /* sentinel */ }
|
||||||
};
|
};
|
||||||
MODULE_DEVICE_TABLE(of, spear_adc_dt_ids);
|
MODULE_DEVICE_TABLE(of, spear_adc_dt_ids);
|
||||||
|
#endif
|
||||||
|
|
||||||
static struct platform_driver spear_adc_driver = {
|
static struct platform_driver spear_adc_driver = {
|
||||||
.probe = spear_adc_probe,
|
.probe = spear_adc_probe,
|
||||||
|
|
|
@ -12,12 +12,6 @@ config IIO_PERIODIC_RTC_TRIGGER
|
||||||
Provides support for using periodic capable real time
|
Provides support for using periodic capable real time
|
||||||
clocks as IIO triggers.
|
clocks as IIO triggers.
|
||||||
|
|
||||||
config IIO_GPIO_TRIGGER
|
|
||||||
tristate "GPIO trigger"
|
|
||||||
depends on GPIOLIB
|
|
||||||
help
|
|
||||||
Provides support for using GPIO pins as IIO triggers.
|
|
||||||
|
|
||||||
config IIO_BFIN_TMR_TRIGGER
|
config IIO_BFIN_TMR_TRIGGER
|
||||||
tristate "Blackfin TIMER trigger"
|
tristate "Blackfin TIMER trigger"
|
||||||
depends on BLACKFIN
|
depends on BLACKFIN
|
||||||
|
|
|
@ -3,5 +3,4 @@
|
||||||
#
|
#
|
||||||
|
|
||||||
obj-$(CONFIG_IIO_PERIODIC_RTC_TRIGGER) += iio-trig-periodic-rtc.o
|
obj-$(CONFIG_IIO_PERIODIC_RTC_TRIGGER) += iio-trig-periodic-rtc.o
|
||||||
obj-$(CONFIG_IIO_GPIO_TRIGGER) += iio-trig-gpio.o
|
|
||||||
obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o
|
obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o
|
||||||
|
|
|
@ -1,167 +0,0 @@
|
||||||
/*
|
|
||||||
* Industrial I/O - gpio based trigger support
|
|
||||||
*
|
|
||||||
* Copyright (c) 2008 Jonathan Cameron
|
|
||||||
*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
* Currently this is more of a functioning proof of concept than a full
|
|
||||||
* fledged trigger driver.
|
|
||||||
*
|
|
||||||
* TODO:
|
|
||||||
*
|
|
||||||
* Add board config elements to allow specification of startup settings.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <linux/kernel.h>
|
|
||||||
#include <linux/module.h>
|
|
||||||
#include <linux/platform_device.h>
|
|
||||||
#include <linux/interrupt.h>
|
|
||||||
#include <linux/gpio.h>
|
|
||||||
#include <linux/slab.h>
|
|
||||||
|
|
||||||
#include <linux/iio/iio.h>
|
|
||||||
#include <linux/iio/trigger.h>
|
|
||||||
|
|
||||||
static LIST_HEAD(iio_gpio_trigger_list);
|
|
||||||
static DEFINE_MUTEX(iio_gpio_trigger_list_lock);
|
|
||||||
|
|
||||||
struct iio_gpio_trigger_info {
|
|
||||||
struct mutex in_use;
|
|
||||||
unsigned int irq;
|
|
||||||
};
|
|
||||||
/*
|
|
||||||
* Need to reference count these triggers and only enable gpio interrupts
|
|
||||||
* as appropriate.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* So what functionality do we want in here?... */
|
|
||||||
/* set high / low as interrupt type? */
|
|
||||||
|
|
||||||
static irqreturn_t iio_gpio_trigger_poll(int irq, void *private)
|
|
||||||
{
|
|
||||||
/* Timestamp not currently provided */
|
|
||||||
iio_trigger_poll(private, 0);
|
|
||||||
return IRQ_HANDLED;
|
|
||||||
}
|
|
||||||
|
|
||||||
static const struct iio_trigger_ops iio_gpio_trigger_ops = {
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
};
|
|
||||||
|
|
||||||
static int iio_gpio_trigger_probe(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct iio_gpio_trigger_info *trig_info;
|
|
||||||
struct iio_trigger *trig, *trig2;
|
|
||||||
unsigned long irqflags;
|
|
||||||
struct resource *irq_res;
|
|
||||||
int irq, ret = 0, irq_res_cnt = 0;
|
|
||||||
|
|
||||||
do {
|
|
||||||
irq_res = platform_get_resource(pdev,
|
|
||||||
IORESOURCE_IRQ, irq_res_cnt);
|
|
||||||
|
|
||||||
if (irq_res == NULL) {
|
|
||||||
if (irq_res_cnt == 0)
|
|
||||||
dev_err(&pdev->dev, "No GPIO IRQs specified");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
irqflags = (irq_res->flags & IRQF_TRIGGER_MASK) | IRQF_SHARED;
|
|
||||||
|
|
||||||
for (irq = irq_res->start; irq <= irq_res->end; irq++) {
|
|
||||||
|
|
||||||
trig = iio_trigger_alloc("irqtrig%d", irq);
|
|
||||||
if (!trig) {
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto error_free_completed_registrations;
|
|
||||||
}
|
|
||||||
|
|
||||||
trig_info = kzalloc(sizeof(*trig_info), GFP_KERNEL);
|
|
||||||
if (!trig_info) {
|
|
||||||
ret = -ENOMEM;
|
|
||||||
goto error_put_trigger;
|
|
||||||
}
|
|
||||||
iio_trigger_set_drvdata(trig, trig_info);
|
|
||||||
trig_info->irq = irq;
|
|
||||||
trig->ops = &iio_gpio_trigger_ops;
|
|
||||||
ret = request_irq(irq, iio_gpio_trigger_poll,
|
|
||||||
irqflags, trig->name, trig);
|
|
||||||
if (ret) {
|
|
||||||
dev_err(&pdev->dev,
|
|
||||||
"request IRQ-%d failed", irq);
|
|
||||||
goto error_free_trig_info;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = iio_trigger_register(trig);
|
|
||||||
if (ret)
|
|
||||||
goto error_release_irq;
|
|
||||||
|
|
||||||
list_add_tail(&trig->alloc_list,
|
|
||||||
&iio_gpio_trigger_list);
|
|
||||||
}
|
|
||||||
|
|
||||||
irq_res_cnt++;
|
|
||||||
} while (irq_res != NULL);
|
|
||||||
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
/* First clean up the partly allocated trigger */
|
|
||||||
error_release_irq:
|
|
||||||
free_irq(irq, trig);
|
|
||||||
error_free_trig_info:
|
|
||||||
kfree(trig_info);
|
|
||||||
error_put_trigger:
|
|
||||||
iio_trigger_put(trig);
|
|
||||||
error_free_completed_registrations:
|
|
||||||
/* The rest should have been added to the iio_gpio_trigger_list */
|
|
||||||
list_for_each_entry_safe(trig,
|
|
||||||
trig2,
|
|
||||||
&iio_gpio_trigger_list,
|
|
||||||
alloc_list) {
|
|
||||||
trig_info = iio_trigger_get_drvdata(trig);
|
|
||||||
free_irq(gpio_to_irq(trig_info->irq), trig);
|
|
||||||
kfree(trig_info);
|
|
||||||
iio_trigger_unregister(trig);
|
|
||||||
}
|
|
||||||
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int iio_gpio_trigger_remove(struct platform_device *pdev)
|
|
||||||
{
|
|
||||||
struct iio_trigger *trig, *trig2;
|
|
||||||
struct iio_gpio_trigger_info *trig_info;
|
|
||||||
|
|
||||||
mutex_lock(&iio_gpio_trigger_list_lock);
|
|
||||||
list_for_each_entry_safe(trig,
|
|
||||||
trig2,
|
|
||||||
&iio_gpio_trigger_list,
|
|
||||||
alloc_list) {
|
|
||||||
trig_info = iio_trigger_get_drvdata(trig);
|
|
||||||
iio_trigger_unregister(trig);
|
|
||||||
free_irq(trig_info->irq, trig);
|
|
||||||
kfree(trig_info);
|
|
||||||
iio_trigger_put(trig);
|
|
||||||
}
|
|
||||||
mutex_unlock(&iio_gpio_trigger_list_lock);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static struct platform_driver iio_gpio_trigger_driver = {
|
|
||||||
.probe = iio_gpio_trigger_probe,
|
|
||||||
.remove = iio_gpio_trigger_remove,
|
|
||||||
.driver = {
|
|
||||||
.name = "iio_gpio_trigger",
|
|
||||||
.owner = THIS_MODULE,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
module_platform_driver(iio_gpio_trigger_driver);
|
|
||||||
|
|
||||||
MODULE_AUTHOR("Jonathan Cameron <jic23@kernel.org>");
|
|
||||||
MODULE_DESCRIPTION("Example gpio trigger for the iio subsystem");
|
|
||||||
MODULE_LICENSE("GPL v2");
|
|
|
@ -24,14 +24,10 @@
|
||||||
#define ST_SENSORS_FULLSCALE_AVL_MAX 10
|
#define ST_SENSORS_FULLSCALE_AVL_MAX 10
|
||||||
|
|
||||||
#define ST_SENSORS_NUMBER_ALL_CHANNELS 4
|
#define ST_SENSORS_NUMBER_ALL_CHANNELS 4
|
||||||
#define ST_SENSORS_NUMBER_DATA_CHANNELS 3
|
|
||||||
#define ST_SENSORS_ENABLE_ALL_AXIS 0x07
|
#define ST_SENSORS_ENABLE_ALL_AXIS 0x07
|
||||||
#define ST_SENSORS_BYTE_FOR_CHANNEL 2
|
|
||||||
#define ST_SENSORS_SCAN_X 0
|
#define ST_SENSORS_SCAN_X 0
|
||||||
#define ST_SENSORS_SCAN_Y 1
|
#define ST_SENSORS_SCAN_Y 1
|
||||||
#define ST_SENSORS_SCAN_Z 2
|
#define ST_SENSORS_SCAN_Z 2
|
||||||
#define ST_SENSORS_DEFAULT_12_REALBITS 12
|
|
||||||
#define ST_SENSORS_DEFAULT_16_REALBITS 16
|
|
||||||
#define ST_SENSORS_DEFAULT_POWER_ON_VALUE 0x01
|
#define ST_SENSORS_DEFAULT_POWER_ON_VALUE 0x01
|
||||||
#define ST_SENSORS_DEFAULT_POWER_OFF_VALUE 0x00
|
#define ST_SENSORS_DEFAULT_POWER_OFF_VALUE 0x00
|
||||||
#define ST_SENSORS_DEFAULT_WAI_ADDRESS 0x0f
|
#define ST_SENSORS_DEFAULT_WAI_ADDRESS 0x0f
|
||||||
|
@ -42,20 +38,20 @@
|
||||||
#define ST_SENSORS_MAX_NAME 17
|
#define ST_SENSORS_MAX_NAME 17
|
||||||
#define ST_SENSORS_MAX_4WAI 7
|
#define ST_SENSORS_MAX_4WAI 7
|
||||||
|
|
||||||
#define ST_SENSORS_LSM_CHANNELS(device_type, index, mod, endian, bits, addr) \
|
#define ST_SENSORS_LSM_CHANNELS(device_type, mask, index, mod, \
|
||||||
|
ch2, s, endian, rbits, sbits, addr) \
|
||||||
{ \
|
{ \
|
||||||
.type = device_type, \
|
.type = device_type, \
|
||||||
.modified = 1, \
|
.modified = mod, \
|
||||||
.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \
|
.info_mask_separate = mask, \
|
||||||
BIT(IIO_CHAN_INFO_SCALE), \
|
|
||||||
.scan_index = index, \
|
.scan_index = index, \
|
||||||
.channel2 = mod, \
|
.channel2 = ch2, \
|
||||||
.address = addr, \
|
.address = addr, \
|
||||||
.scan_type = { \
|
.scan_type = { \
|
||||||
.sign = 's', \
|
.sign = s, \
|
||||||
.realbits = bits, \
|
.realbits = rbits, \
|
||||||
.shift = 16 - bits, \
|
.shift = sbits - rbits, \
|
||||||
.storagebits = 16, \
|
.storagebits = sbits, \
|
||||||
.endianness = endian, \
|
.endianness = endian, \
|
||||||
}, \
|
}, \
|
||||||
}
|
}
|
||||||
|
@ -204,6 +200,7 @@ struct st_sensors {
|
||||||
* @multiread_bit: Use or not particular bit for [I2C/SPI] multiread.
|
* @multiread_bit: Use or not particular bit for [I2C/SPI] multiread.
|
||||||
* @buffer_data: Data used by buffer part.
|
* @buffer_data: Data used by buffer part.
|
||||||
* @odr: Output data rate of the sensor [Hz].
|
* @odr: Output data rate of the sensor [Hz].
|
||||||
|
* num_data_channels: Number of data channels used in buffer.
|
||||||
* @get_irq_data_ready: Function to get the IRQ used for data ready signal.
|
* @get_irq_data_ready: Function to get the IRQ used for data ready signal.
|
||||||
* @tf: Transfer function structure used by I/O operations.
|
* @tf: Transfer function structure used by I/O operations.
|
||||||
* @tb: Transfer buffers and mutex used by I/O operations.
|
* @tb: Transfer buffers and mutex used by I/O operations.
|
||||||
|
@ -220,6 +217,7 @@ struct st_sensor_data {
|
||||||
char *buffer_data;
|
char *buffer_data;
|
||||||
|
|
||||||
unsigned int odr;
|
unsigned int odr;
|
||||||
|
unsigned int num_data_channels;
|
||||||
|
|
||||||
unsigned int (*get_irq_data_ready) (struct iio_dev *indio_dev);
|
unsigned int (*get_irq_data_ready) (struct iio_dev *indio_dev);
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
/*
|
/*
|
||||||
* ADF4350/ADF4351 SPI PLL driver
|
* ADF4350/ADF4351 SPI PLL driver
|
||||||
*
|
*
|
||||||
* Copyright 2012 Analog Devices Inc.
|
* Copyright 2012-2013 Analog Devices Inc.
|
||||||
*
|
*
|
||||||
* Licensed under the GPL-2.
|
* Licensed under the GPL-2.
|
||||||
*/
|
*/
|
||||||
|
@ -41,7 +41,7 @@
|
||||||
#define ADF4350_REG2_RDIV2_EN (1 << 24)
|
#define ADF4350_REG2_RDIV2_EN (1 << 24)
|
||||||
#define ADF4350_REG2_RMULT2_EN (1 << 25)
|
#define ADF4350_REG2_RMULT2_EN (1 << 25)
|
||||||
#define ADF4350_REG2_MUXOUT(x) ((x) << 26)
|
#define ADF4350_REG2_MUXOUT(x) ((x) << 26)
|
||||||
#define ADF4350_REG2_NOISE_MODE(x) ((x) << 29)
|
#define ADF4350_REG2_NOISE_MODE(x) (((unsigned)(x)) << 29)
|
||||||
#define ADF4350_MUXOUT_THREESTATE 0
|
#define ADF4350_MUXOUT_THREESTATE 0
|
||||||
#define ADF4350_MUXOUT_DVDD 1
|
#define ADF4350_MUXOUT_DVDD 1
|
||||||
#define ADF4350_MUXOUT_GND 2
|
#define ADF4350_MUXOUT_GND 2
|
||||||
|
|
Loading…
Reference in New Issue