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

staging:iio:accel:adis16209 unwind use of IIO_CHAN macro. 



This macro is being removed to simplify ongoing maintenance
so we need to unwind and remaining users.

Note the addition of extend_name = "supply" for the supply voltage
adc.  This brings this driver into line with the other adis parts.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Acked-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b788176

drivers/staging/iio/accel/adis16209_core.c

+100 −35
Original line number Diff line number Diff line
@@ -408,41 +408,106 @@ static int adis16209_read_raw(struct iio_dev *indio_dev, 
}



static struct iio_chan_spec adis16209_channels[] = {

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 0, 0,

		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		 in_supply, ADIS16209_SCAN_SUPPLY,

		 IIO_ST('u', 14, 16, 0), 0),

	IIO_CHAN(IIO_TEMP, 0, 1, 0, NULL, 0, 0,

		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

	{

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 0,

		.extend_name = "supply",

		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		.address = in_supply,

		.scan_index = ADIS16209_SCAN_SUPPLY,

		.scan_type = {

			.sign = 'u',

			.realbits = 14,

			.storagebits = 16,

		},

	}, {

		.type = IIO_TEMP,

		.indexed = 0,

		.channel = 0,

		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,

		 temp, ADIS16209_SCAN_TEMP,

		 IIO_ST('u', 12, 16, 0), 0),

	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_X,

		 IIO_CHAN_INFO_SCALE_SHARED_BIT |

		.address = temp,

		.scan_index = ADIS16209_SCAN_TEMP,

		.scan_type = {

			.sign = 'u',

			.realbits = 12,

			.storagebits = 16,

		},

	}, {

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,

		 accel_x, ADIS16209_SCAN_ACC_X,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_ACCEL, 1, 0, 0, NULL, 0, IIO_MOD_Y,

		 IIO_CHAN_INFO_SCALE_SHARED_BIT |

		.address = accel_x,

		.scan_index = ADIS16209_SCAN_ACC_X,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	}, {

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_Y,

		.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT |

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT,

		 accel_y, ADIS16209_SCAN_ACC_Y,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_VOLTAGE, 0, 1, 0, NULL, 1, 0,

		 IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		 in_aux, ADIS16209_SCAN_AUX_ADC,

		 IIO_ST('u', 12, 16, 0), 0),

	IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_X,

		 IIO_CHAN_INFO_SCALE_SHARED_BIT,

		 incli_x, ADIS16209_SCAN_INCLI_X,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_INCLI, 1, 0, 0, NULL, 0, IIO_MOD_Y,

		 IIO_CHAN_INFO_SCALE_SHARED_BIT,

		 incli_y, ADIS16209_SCAN_INCLI_Y,

		 IIO_ST('s', 14, 16, 0), 0),

	IIO_CHAN(IIO_ROT, 0, 1, 0, NULL, 0, IIO_MOD_X,

		    0,

		    rot, ADIS16209_SCAN_ROT,

		    IIO_ST('s', 14, 16, 0), 0),

		.address = accel_y,

		.scan_index = ADIS16209_SCAN_ACC_Y,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	}, {

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 1,

		.info_mask = IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		.address = in_aux,

		.scan_index = ADIS16209_SCAN_AUX_ADC,

		.scan_type = {

			.sign = 'u',

			.realbits = 12,

			.storagebits = 16,

		},

	}, {

		.type = IIO_INCLI,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,

		.address = incli_x,

		.scan_index = ADIS16209_SCAN_INCLI_X,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	}, {

		.type = IIO_INCLI,

		.modified = 1,

		.channel2 = IIO_MOD_Y,

		.info_mask = IIO_CHAN_INFO_SCALE_SHARED_BIT,

		.address = incli_y,

		.scan_index = ADIS16209_SCAN_INCLI_Y,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	}, {

		.type = IIO_ROT,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.address = rot,

		.scan_index = ADIS16209_SCAN_ROT,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	},

	IIO_CHAN_SOFT_TIMESTAMP(8)

};