Commit b841f8ab authored by Jonathan Cameron's avatar Jonathan Cameron
Browse files

staging:iio:accel:adis move to info_mask_(shared_by_type/separate) 



The original info_mask is going away in favour of the broken out versions.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
parent bb7c5940

drivers/staging/iio/accel/adis16201_core.c

+4 −4
Original line number Diff line number Diff line
@@ -134,14 +134,14 @@ static const struct iio_chan_spec adis16201_channels[] = { 
	ADIS_SUPPLY_CHAN(ADIS16201_SUPPLY_OUT, ADIS16201_SCAN_SUPPLY, 12),

	ADIS_TEMP_CHAN(ADIS16201_TEMP_OUT, ADIS16201_SCAN_TEMP, 12),

	ADIS_ACCEL_CHAN(X, ADIS16201_XACCL_OUT, ADIS16201_SCAN_ACC_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	ADIS_ACCEL_CHAN(Y, ADIS16201_YACCL_OUT, ADIS16201_SCAN_ACC_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	ADIS_AUX_ADC_CHAN(ADIS16201_AUX_ADC, ADIS16201_SCAN_AUX_ADC, 12),

	ADIS_INCLI_CHAN(X, ADIS16201_XINCL_OUT, ADIS16201_SCAN_INCLI_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	ADIS_INCLI_CHAN(X, ADIS16201_YINCL_OUT, ADIS16201_SCAN_INCLI_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	IIO_CHAN_SOFT_TIMESTAMP(7)

};

drivers/staging/iio/accel/adis16203_core.c

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ static const struct iio_chan_spec adis16203_channels[] = { 
	ADIS_SUPPLY_CHAN(ADIS16203_SUPPLY_OUT, ADIS16203_SCAN_SUPPLY, 12),

	ADIS_AUX_ADC_CHAN(ADIS16203_AUX_ADC, ADIS16203_SCAN_AUX_ADC, 12),

	ADIS_INCLI_CHAN(X, ADIS16203_XINCL_OUT, ADIS16203_SCAN_INCLI_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	/* Fixme: Not what it appears to be - see data sheet */

	ADIS_INCLI_CHAN(Y, ADIS16203_YINCL_OUT, ADIS16203_SCAN_INCLI_Y, 0, 14),

	ADIS_TEMP_CHAN(ADIS16203_TEMP_OUT, ADIS16203_SCAN_TEMP, 12),

drivers/staging/iio/accel/adis16204_core.c

+3 −5
Original line number Diff line number Diff line
@@ -140,13 +140,11 @@ static const struct iio_chan_spec adis16204_channels[] = { 
	ADIS_AUX_ADC_CHAN(ADIS16204_AUX_ADC, ADIS16204_SCAN_AUX_ADC, 12),

	ADIS_TEMP_CHAN(ADIS16204_TEMP_OUT, ADIS16204_SCAN_TEMP, 12),

	ADIS_ACCEL_CHAN(X, ADIS16204_XACCL_OUT, ADIS16204_SCAN_ACC_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 14),

	ADIS_ACCEL_CHAN(Y, ADIS16204_YACCL_OUT, ADIS16204_SCAN_ACC_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 14),

	ADIS_ACCEL_CHAN(ROOT_SUM_SQUARED_X_Y, ADIS16204_XY_RSS_OUT,

		ADIS16204_SCAN_ACC_XY, IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

		ADIS16204_SCAN_ACC_XY, BIT(IIO_CHAN_INFO_PEAK), 14),

	IIO_CHAN_SOFT_TIMESTAMP(5),

};

drivers/staging/iio/accel/adis16209_core.c

+2 −2
Original line number Diff line number Diff line
@@ -133,9 +133,9 @@ static const struct iio_chan_spec adis16209_channels[] = { 
	ADIS_SUPPLY_CHAN(ADIS16209_SUPPLY_OUT, ADIS16209_SCAN_SUPPLY, 14),

	ADIS_TEMP_CHAN(ADIS16209_TEMP_OUT, ADIS16209_SCAN_TEMP, 12),

	ADIS_ACCEL_CHAN(X, ADIS16209_XACCL_OUT, ADIS16209_SCAN_ACC_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	ADIS_ACCEL_CHAN(Y, ADIS16209_YACCL_OUT, ADIS16209_SCAN_ACC_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT, 14),

		BIT(IIO_CHAN_INFO_CALIBBIAS), 14),

	ADIS_AUX_ADC_CHAN(ADIS16209_AUX_ADC, ADIS16209_SCAN_AUX_ADC, 12),

	ADIS_INCLI_CHAN(X, ADIS16209_XINCL_OUT, ADIS16209_SCAN_INCLI_X, 0, 14),

	ADIS_INCLI_CHAN(Y, ADIS16209_YINCL_OUT, ADIS16209_SCAN_INCLI_Y, 0, 14),

drivers/staging/iio/accel/adis16240_core.c

+3 −6
Original line number Diff line number Diff line
@@ -176,14 +176,11 @@ static const struct iio_chan_spec adis16240_channels[] = { 
	ADIS_SUPPLY_CHAN(ADIS16240_SUPPLY_OUT, ADIS16240_SCAN_SUPPLY, 10),

	ADIS_AUX_ADC_CHAN(ADIS16240_AUX_ADC, ADIS16240_SCAN_AUX_ADC, 10),

	ADIS_ACCEL_CHAN(X, ADIS16240_XACCL_OUT, ADIS16240_SCAN_ACC_X,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),

		BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10),

	ADIS_ACCEL_CHAN(Y, ADIS16240_YACCL_OUT, ADIS16240_SCAN_ACC_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),

		BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10),

	ADIS_ACCEL_CHAN(Z, ADIS16240_ZACCL_OUT, ADIS16240_SCAN_ACC_Z,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 10),

		BIT(IIO_CHAN_INFO_CALIBBIAS) | BIT(IIO_CHAN_INFO_PEAK), 10),

	ADIS_TEMP_CHAN(ADIS16240_TEMP_OUT, ADIS16240_SCAN_TEMP, 10),

	IIO_CHAN_SOFT_TIMESTAMP(6)

};