Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/staging/iio/gyro/adis16060_core.c

+1 −1
Original line number Diff line number Diff line
@@ -117,7 +117,7 @@ static const struct iio_info adis16060_info = { 


static const struct iio_chan_spec adis16060_channels[] = {

	{

		.type = IIO_GYRO,

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.address = ADIS16060_GYRO,

drivers/staging/iio/gyro/adis16080_core.c

+1 −1
Original line number Diff line number Diff line
@@ -108,7 +108,7 @@ static int adis16080_read_raw(struct iio_dev *indio_dev, 


static const struct iio_chan_spec adis16080_channels[] = {

	{

		.type = IIO_GYRO,

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.address = ADIS16080_DIN_GYRO,

drivers/staging/iio/gyro/adis16130_core.c

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ static int adis16130_read_raw(struct iio_dev *indio_dev, 


static const struct iio_chan_spec adis16130_channels[] = {

	{

		.type = IIO_GYRO,

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.address = ADIS16130_RATEDATA,

drivers/staging/iio/gyro/adis16260_core.c

+4 −4
Original line number Diff line number Diff line
@@ -390,7 +390,7 @@ enum adis16260_channel { 
};

#define ADIS16260_GYRO_CHANNEL_SET(axis, mod)				\

	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_CALIBSCALE_SEPARATE) |	\

			 (1 << IIO_CHAN_INFO_SCALE_SEPARATE),		\
@@ -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_SHARED):

		switch (chan->type) {

		case IIO_GYRO:

		case IIO_ANGL_VEL:

			*val = 0;

			if (spi_get_device_id(st->us)->driver_data)

				*val2 = 320;
@@ -495,7 +495,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, 
		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE):

		switch (chan->type) {

		case IIO_GYRO:

		case IIO_ANGL_VEL:

			bits = 12;

			break;

		default:
@@ -515,7 +515,7 @@ static int adis16260_read_raw(struct iio_dev *indio_dev, 
		return IIO_VAL_INT;

	case (1 << IIO_CHAN_INFO_CALIBSCALE_SEPARATE):

		switch (chan->type) {

		case IIO_GYRO:

		case IIO_ANGL_VEL:

			bits = 12;

			break;

		default:

drivers/staging/iio/gyro/adxrs450_core.c

+2 −2
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, 
	switch (mask) {

	case 0:

		switch (chan->type) {

		case IIO_GYRO:

		case IIO_ANGL_VEL:

			ret = adxrs450_spi_sensor_data(indio_dev, &t);

			if (ret)

				break;
@@ -305,7 +305,7 @@ static int adxrs450_read_raw(struct iio_dev *indio_dev, 


static const struct iio_chan_spec adxrs450_channels[] = {

	{

		.type = IIO_GYRO,

		.type = IIO_ANGL_VEL,

		.modified = 1,

		.channel2 = IIO_MOD_Z,

		.info_mask = (1 << IIO_CHAN_INFO_CALIBBIAS_SEPARATE) |