Commit aebefb44 authored by Alexandru Ardelean's avatar Alexandru Ardelean Committed by Jonathan Cameron
Browse files

iio: adc: ad7793: define/use own IIO channel macros 



This driver seems to use most of the AD_SD_*_CHANNEL. This change will move
them in the driver. The intent is that if a new part comes along which
would require tweaks per IIO channel, these should be doable in the driver.

Signed-off-by: default avatarAlexandru Ardelean <alexandru.ardelean@analog.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent ab344994

drivers/iio/adc/ad7793.c

+71 −24
Original line number Diff line number Diff line
@@ -546,47 +546,94 @@ static const struct iio_info ad7797_info = { 
	.validate_trigger = ad_sd_validate_trigger,

};



#define __AD7793_CHANNEL(_si, _channel1, _channel2, _address, _bits, \

	_storagebits, _shift, _extend_name, _type, _mask_all) \

	{ \

		.type = (_type), \

		.differential = (_channel2 == -1 ? 0 : 1), \

		.indexed = 1, \

		.channel = (_channel1), \

		.channel2 = (_channel2), \

		.address = (_address), \

		.extend_name = (_extend_name), \

		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \

			BIT(IIO_CHAN_INFO_OFFSET), \

		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \

		.info_mask_shared_by_all = _mask_all, \

		.scan_index = (_si), \

		.scan_type = { \

			.sign = 'u', \

			.realbits = (_bits), \

			.storagebits = (_storagebits), \

			.shift = (_shift), \

			.endianness = IIO_BE, \

		}, \

	}



#define AD7793_DIFF_CHANNEL(_si, _channel1, _channel2, _address, _bits, \

	_storagebits, _shift) \

	__AD7793_CHANNEL(_si, _channel1, _channel2, _address, _bits, \

		_storagebits, _shift, NULL, IIO_VOLTAGE, \

		BIT(IIO_CHAN_INFO_SAMP_FREQ))



#define AD7793_SHORTED_CHANNEL(_si, _channel, _address, _bits, \

	_storagebits, _shift) \

	__AD7793_CHANNEL(_si, _channel, _channel, _address, _bits, \

		_storagebits, _shift, "shorted", IIO_VOLTAGE, \

		BIT(IIO_CHAN_INFO_SAMP_FREQ))



#define AD7793_TEMP_CHANNEL(_si, _address, _bits, _storagebits, _shift) \

	__AD7793_CHANNEL(_si, 0, -1, _address, _bits, \

		_storagebits, _shift, NULL, IIO_TEMP, \

		BIT(IIO_CHAN_INFO_SAMP_FREQ))



#define AD7793_SUPPLY_CHANNEL(_si, _channel, _address, _bits, _storagebits, \

	_shift) \

	__AD7793_CHANNEL(_si, _channel, -1, _address, _bits, \

		_storagebits, _shift, "supply", IIO_VOLTAGE, \

		BIT(IIO_CHAN_INFO_SAMP_FREQ))



#define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \

const struct iio_chan_spec _name##_channels[] = { \

	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), (_s)), \

	AD_SD_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), (_s)), \

	AD_SD_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), (_s)), \

	AD_SD_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), (_s)), \

	AD_SD_TEMP_CHANNEL(4, AD7793_CH_TEMP, (_b), (_sb), (_s)), \

	AD_SD_SUPPLY_CHANNEL(5, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), (_s)), \

	AD7793_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), (_s)), \

	AD7793_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), (_s)), \

	AD7793_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), (_s)), \

	AD7793_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), (_s)), \

	AD7793_TEMP_CHANNEL(4, AD7793_CH_TEMP, (_b), (_sb), (_s)), \

	AD7793_SUPPLY_CHANNEL(5, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), (_s)), \

	IIO_CHAN_SOFT_TIMESTAMP(6), \

}



#define DECLARE_AD7795_CHANNELS(_name, _b, _sb) \

const struct iio_chan_spec _name##_channels[] = { \

	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(3, 3, 3, AD7795_CH_AIN4P_AIN4M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(4, 4, 4, AD7795_CH_AIN5P_AIN5M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(5, 5, 5, AD7795_CH_AIN6P_AIN6M, (_b), (_sb), 0), \

	AD_SD_SHORTED_CHANNEL(6, 0, AD7795_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD_SD_TEMP_CHANNEL(7, AD7793_CH_TEMP, (_b), (_sb), 0), \

	AD_SD_SUPPLY_CHANNEL(8, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(3, 3, 3, AD7795_CH_AIN4P_AIN4M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(4, 4, 4, AD7795_CH_AIN5P_AIN5M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(5, 5, 5, AD7795_CH_AIN6P_AIN6M, (_b), (_sb), 0), \

	AD7793_SHORTED_CHANNEL(6, 0, AD7795_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD7793_TEMP_CHANNEL(7, AD7793_CH_TEMP, (_b), (_sb), 0), \

	AD7793_SUPPLY_CHANNEL(8, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	IIO_CHAN_SOFT_TIMESTAMP(9), \

}



#define DECLARE_AD7797_CHANNELS(_name, _b, _sb) \

const struct iio_chan_spec _name##_channels[] = { \

	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD_SD_SHORTED_CHANNEL(1, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD_SD_TEMP_CHANNEL(2, AD7793_CH_TEMP, (_b), (_sb), 0), \

	AD_SD_SUPPLY_CHANNEL(3, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD7793_SHORTED_CHANNEL(1, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD7793_TEMP_CHANNEL(2, AD7793_CH_TEMP, (_b), (_sb), 0), \

	AD7793_SUPPLY_CHANNEL(3, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	IIO_CHAN_SOFT_TIMESTAMP(4), \

}



#define DECLARE_AD7799_CHANNELS(_name, _b, _sb) \

const struct iio_chan_spec _name##_channels[] = { \

	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \

	AD_SD_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \

	AD_SD_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD_SD_SUPPLY_CHANNEL(4, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \

	AD7793_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \

	AD7793_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \

	AD7793_SUPPLY_CHANNEL(4, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \

	IIO_CHAN_SOFT_TIMESTAMP(5), \

}