Commit 41ea040c authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman

staging:iio: rename gyro channels to anglvel

Ensure naming reflects what is measured, not how it is done.
Resolvers can measure the same thing for starters.
IIO_GYRO->IIO_ANGL_VEL to ensure consistent naming.
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Acked-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 199d847a
...@@ -117,7 +117,7 @@ static const struct iio_info adis16060_info = { ...@@ -117,7 +117,7 @@ static const struct iio_info adis16060_info = {
static const struct iio_chan_spec adis16060_channels[] = { static const struct iio_chan_spec adis16060_channels[] = {
{ {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.address = ADIS16060_GYRO, .address = ADIS16060_GYRO,
......
...@@ -108,7 +108,7 @@ static int adis16080_read_raw(struct iio_dev *indio_dev, ...@@ -108,7 +108,7 @@ static int adis16080_read_raw(struct iio_dev *indio_dev,
static const struct iio_chan_spec adis16080_channels[] = { static const struct iio_chan_spec adis16080_channels[] = {
{ {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.address = ADIS16080_DIN_GYRO, .address = ADIS16080_DIN_GYRO,
......
...@@ -97,7 +97,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev, ...@@ -97,7 +97,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev,
static const struct iio_chan_spec adis16130_channels[] = { static const struct iio_chan_spec adis16130_channels[] = {
{ {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.address = ADIS16130_RATEDATA, .address = ADIS16130_RATEDATA,
......
...@@ -390,7 +390,7 @@ enum adis16260_channel { ...@@ -390,7 +390,7 @@ enum adis16260_channel {
}; };
#define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \ #define ADIS16260_GYRO_CHANNEL_SET(axis, mod) \
struct iio_chan_spec adis16260_channels_##axis[] = { \ struct iio_chan_spec adis16260_channels_##axis[] = { \
IIO_CHAN(IIO_GYRO, 1, 0, 0, NULL, 0, mod, \ IIO_CHAN(IIO_ANGL_VEL, 1, 0, 0, NULL, 0, mod, \
(1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | \ (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | \
(1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) | \ (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE) | \
(1 << IIO_CHAN_INFO_SCALE_SEPARATE), \ (1 << IIO_CHAN_INFO_SCALE_SEPARATE), \
...@@ -468,7 +468,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, ...@@ -468,7 +468,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
case (1 << IIO_CHAN_INFO_SCALE_SEPARATE): case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
case (1 << IIO_CHAN_INFO_SCALE_SHARED): case (1 << IIO_CHAN_INFO_SCALE_SHARED):
switch (chan->type) { switch (chan->type) {
case IIO_GYRO: case IIO_ANGL_VEL:
*val = 0; *val = 0;
if (spi_get_device_id(st->us)->driver_data) if (spi_get_device_id(st->us)->driver_data)
*val2 = 320; *val2 = 320;
...@@ -495,7 +495,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, ...@@ -495,7 +495,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
return IIO_VAL_INT; return IIO_VAL_INT;
case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE): case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):
switch (chan->type) { switch (chan->type) {
case IIO_GYRO: case IIO_ANGL_VEL:
bits = 12; bits = 12;
break; break;
default: default:
...@@ -515,7 +515,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, ...@@ -515,7 +515,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev,
return IIO_VAL_INT; return IIO_VAL_INT;
case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE): case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):
switch (chan->type) { switch (chan->type) {
case IIO_GYRO: case IIO_ANGL_VEL:
bits = 12; bits = 12;
break; break;
default: default:
......
...@@ -268,7 +268,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, ...@@ -268,7 +268,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
switch (mask) { switch (mask) {
case 0: case 0:
switch (chan->type) { switch (chan->type) {
case IIO_GYRO: case IIO_ANGL_VEL:
ret = adxrs450_spi_sensor_data(indio_dev, &t); ret = adxrs450_spi_sensor_data(indio_dev, &t);
if (ret) if (ret)
break; break;
...@@ -305,7 +305,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, ...@@ -305,7 +305,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev,
static const struct iio_chan_spec adxrs450_channels[] = { static const struct iio_chan_spec adxrs450_channels[] = {
{ {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
......
...@@ -31,7 +31,7 @@ enum iio_chan_type { ...@@ -31,7 +31,7 @@ enum iio_chan_type {
IIO_CURRENT, IIO_CURRENT,
IIO_POWER, IIO_POWER,
IIO_ACCEL, IIO_ACCEL,
IIO_GYRO, IIO_ANGL_VEL,
IIO_MAGN, IIO_MAGN,
IIO_LIGHT, IIO_LIGHT,
IIO_INTENSITY, IIO_INTENSITY,
......
...@@ -507,7 +507,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev, ...@@ -507,7 +507,7 @@ static int adis16400_read_raw(struct iio_dev *indio_dev,
case (1 << IIO_CHAN_INFO_SCALE_SHARED): case (1 << IIO_CHAN_INFO_SCALE_SHARED):
case (1 << IIO_CHAN_INFO_SCALE_SEPARATE): case (1 << IIO_CHAN_INFO_SCALE_SEPARATE):
switch (chan->type) { switch (chan->type) {
case IIO_GYRO: case IIO_ANGL_VEL:
*val = 0; *val = 0;
*val2 = st->variant->gyro_scale_micro; *val2 = st->variant->gyro_scale_micro;
return IIO_VAL_INT_PLUS_MICRO; return IIO_VAL_INT_PLUS_MICRO;
...@@ -565,7 +565,7 @@ static struct iio_chan_spec adis16400_channels[] = { ...@@ -565,7 +565,7 @@ static struct iio_chan_spec adis16400_channels[] = {
.scan_index = ADIS16400_SCAN_SUPPLY, .scan_index = ADIS16400_SCAN_SUPPLY,
.scan_type = IIO_ST('u', 14, 16, 0) .scan_type = IIO_ST('u', 14, 16, 0)
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_X, .channel2 = IIO_MOD_X,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -574,7 +574,7 @@ static struct iio_chan_spec adis16400_channels[] = { ...@@ -574,7 +574,7 @@ static struct iio_chan_spec adis16400_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_X, .scan_index = ADIS16400_SCAN_GYRO_X,
.scan_type = IIO_ST('s', 14, 16, 0) .scan_type = IIO_ST('s', 14, 16, 0)
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Y, .channel2 = IIO_MOD_Y,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -583,7 +583,7 @@ static struct iio_chan_spec adis16400_channels[] = { ...@@ -583,7 +583,7 @@ static struct iio_chan_spec adis16400_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_Y, .scan_index = ADIS16400_SCAN_GYRO_Y,
.scan_type = IIO_ST('s', 14, 16, 0), .scan_type = IIO_ST('s', 14, 16, 0),
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -674,7 +674,7 @@ static struct iio_chan_spec adis16350_channels[] = { ...@@ -674,7 +674,7 @@ static struct iio_chan_spec adis16350_channels[] = {
.scan_index = ADIS16400_SCAN_SUPPLY, .scan_index = ADIS16400_SCAN_SUPPLY,
.scan_type = IIO_ST('u', 12, 16, 0) .scan_type = IIO_ST('u', 12, 16, 0)
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_X, .channel2 = IIO_MOD_X,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -683,7 +683,7 @@ static struct iio_chan_spec adis16350_channels[] = { ...@@ -683,7 +683,7 @@ static struct iio_chan_spec adis16350_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_X, .scan_index = ADIS16400_SCAN_GYRO_X,
.scan_type = IIO_ST('s', 14, 16, 0) .scan_type = IIO_ST('s', 14, 16, 0)
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Y, .channel2 = IIO_MOD_Y,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -692,7 +692,7 @@ static struct iio_chan_spec adis16350_channels[] = { ...@@ -692,7 +692,7 @@ static struct iio_chan_spec adis16350_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_Y, .scan_index = ADIS16400_SCAN_GYRO_Y,
.scan_type = IIO_ST('s', 14, 16, 0), .scan_type = IIO_ST('s', 14, 16, 0),
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -780,7 +780,7 @@ static struct iio_chan_spec adis16300_channels[] = { ...@@ -780,7 +780,7 @@ static struct iio_chan_spec adis16300_channels[] = {
.scan_index = ADIS16400_SCAN_SUPPLY, .scan_index = ADIS16400_SCAN_SUPPLY,
.scan_type = IIO_ST('u', 12, 16, 0) .scan_type = IIO_ST('u', 12, 16, 0)
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_X, .channel2 = IIO_MOD_X,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -854,7 +854,7 @@ static struct iio_chan_spec adis16300_channels[] = { ...@@ -854,7 +854,7 @@ static struct iio_chan_spec adis16300_channels[] = {
static const struct iio_chan_spec adis16334_channels[] = { static const struct iio_chan_spec adis16334_channels[] = {
{ {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_X, .channel2 = IIO_MOD_X,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -863,7 +863,7 @@ static const struct iio_chan_spec adis16334_channels[] = { ...@@ -863,7 +863,7 @@ static const struct iio_chan_spec adis16334_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_X, .scan_index = ADIS16400_SCAN_GYRO_X,
.scan_type = IIO_ST('s', 14, 16, 0), .scan_type = IIO_ST('s', 14, 16, 0),
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Y, .channel2 = IIO_MOD_Y,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
...@@ -872,7 +872,7 @@ static const struct iio_chan_spec adis16334_channels[] = { ...@@ -872,7 +872,7 @@ static const struct iio_chan_spec adis16334_channels[] = {
.scan_index = ADIS16400_SCAN_GYRO_Y, .scan_index = ADIS16400_SCAN_GYRO_Y,
.scan_type = IIO_ST('s', 14, 16, 0), .scan_type = IIO_ST('s', 14, 16, 0),
}, { }, {
.type = IIO_GYRO, .type = IIO_ANGL_VEL,
.modified = 1, .modified = 1,
.channel2 = IIO_MOD_Z, .channel2 = IIO_MOD_Z,
.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) | .info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |
......
...@@ -54,7 +54,7 @@ static const char * const iio_chan_type_name_spec[] = { ...@@ -54,7 +54,7 @@ static const char * const iio_chan_type_name_spec[] = {
[IIO_CURRENT] = "current", [IIO_CURRENT] = "current",
[IIO_POWER] = "power", [IIO_POWER] = "power",
[IIO_ACCEL] = "accel", [IIO_ACCEL] = "accel",
[IIO_GYRO] = "gyro", [IIO_ANGL_VEL] = "anglvel",
[IIO_MAGN] = "magn", [IIO_MAGN] = "magn",
[IIO_LIGHT] = "illuminance", [IIO_LIGHT] = "illuminance",
[IIO_INTENSITY] = "intensity", [IIO_INTENSITY] = "intensity",
......
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