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

Commit 47c15308 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-3.7a' of... 

Merge tag 'iio-fixes-for-3.7a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

First round of fixes for IIO in 3.7 cycle, applies to 3.7-rc1.

Mostly a round of fixes for Analog Devices MEMs devices where some
offset values were either completely incorrect, or in the wrong units.

Also removal of an accidental duplicate entry in a Kconfig file.
parents ddffeb8c 98f9c3c1

drivers/iio/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ source "drivers/iio/frequency/Kconfig" 
source "drivers/iio/dac/Kconfig"

source "drivers/iio/common/Kconfig"

source "drivers/iio/gyro/Kconfig"

source "drivers/iio/light/Kconfig"

source "drivers/iio/magnetometer/Kconfig"



endif # IIO

drivers/iio/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -18,5 +18,4 @@ obj-y += frequency/ 
obj-y += dac/

obj-y += common/

obj-y += gyro/

obj-y += light/

obj-y += magnetometer/

drivers/staging/iio/accel/adis16201_core.c

+13 −11
Original line number Diff line number Diff line
@@ -310,30 +310,32 @@ static int adis16201_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_SCALE:

		switch (chan->type) {

		case IIO_VOLTAGE:

			if (chan->channel == 0) {

				*val = 1;

				*val2 = 220000; /* 1.22 mV */

			} else {

				*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;

			else

				*val2 = 610;

				*val2 = 610000; /* 0.610 mV */

			}

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_TEMP:

			*val = 0;

			*val2 = -470000;

			*val = -470; /* 0.47 C */

			*val2 = 0;

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_ACCEL:

			*val = 0;

			*val2 = 462500;

			return IIO_VAL_INT_PLUS_MICRO;

			*val2 = IIO_G_TO_M_S_2(462400); /* 0.4624 mg */

			return IIO_VAL_INT_PLUS_NANO;

		case IIO_INCLI:

			*val = 0;

			*val2 = 100000;

			*val2 = 100000; /* 0.1 degree */

			return IIO_VAL_INT_PLUS_MICRO;

		default:

			return -EINVAL;

		}

		break;

	case IIO_CHAN_INFO_OFFSET:

		*val = 25;

		*val = 25000 / -470 - 1278; /* 25 C = 1278 */

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_CALIBBIAS:

		switch (chan->type) {

drivers/staging/iio/accel/adis16203_core.c

+11 −9
Original line number Diff line number Diff line
@@ -316,25 +316,27 @@ static int adis16203_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_SCALE:

		switch (chan->type) {

		case IIO_VOLTAGE:

			if (chan->channel == 0) {

				*val = 1;

				*val2 = 220000; /* 1.22 mV */

			} else {

				*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;

			else

				*val2 = 610;

				*val2 = 610000; /* 0.61 mV */

			}

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_TEMP:

			*val = 0;

			*val2 = -470000;

			*val = -470; /* -0.47 C */

			*val2 = 0;

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_INCLI:

			*val = 0;

			*val2 = 25000;

			*val2 = 25000; /* 0.025 degree */

			return IIO_VAL_INT_PLUS_MICRO;

		default:

			return -EINVAL;

		}

	case IIO_CHAN_INFO_OFFSET:

		*val = 25;

		*val = 25000 / -470 - 1278; /* 25 C = 1278 */

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_CALIBBIAS:

		bits = 14;

drivers/staging/iio/accel/adis16204_core.c

+12 −10
Original line number Diff line number Diff line
@@ -317,26 +317,28 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_SCALE:

		switch (chan->type) {

		case IIO_VOLTAGE:

			if (chan->channel == 0) {

				*val = 1;

				*val2 = 220000; /* 1.22 mV */

			} else {

				*val = 0;

			if (chan->channel == 0)

				*val2 = 1220;

			else

				*val2 = 610;

				*val2 = 610000; /* 0.61 mV */

			}

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_TEMP:

			*val = 0;

			*val2 = -470000;

			*val = -470; /* 0.47 C */

			*val2 = 0;

			return IIO_VAL_INT_PLUS_MICRO;

		case IIO_ACCEL:

			*val = 0;

			switch (chan->channel2) {

			case IIO_MOD_X:

			case IIO_MOD_ROOT_SUM_SQUARED_X_Y:

				*val2 = 17125;

				*val2 = IIO_G_TO_M_S_2(17125); /* 17.125 mg */

				break;

			case IIO_MOD_Y:

			case IIO_MOD_Z:

				*val2 = 8407;

				*val2 = IIO_G_TO_M_S_2(8407); /* 8.407 mg */

				break;

			}

			return IIO_VAL_INT_PLUS_MICRO;
@@ -345,7 +347,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
		}

		break;

	case IIO_CHAN_INFO_OFFSET:

		*val = 25;

		*val = 25000 / -470 - 1278; /* 25 C = 1278 */

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_CALIBBIAS:

	case IIO_CHAN_INFO_PEAK: