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

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

staging: iio: adc add numbers to naming of all adc channels as needed to... 


staging: iio: adc add numbers to naming of all adc channels as needed to associate events with them.

Given event codes are associated by number not name, all adc channels
including those with names need to have numbers.

Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 2f3cc667

drivers/staging/iio/accel/adis16209_core.c

+8 −8
Original line number Diff line number Diff line
@@ -391,12 +391,12 @@ static int adis16209_initial_setup(struct adis16209_state *st) 
	return ret;

}



static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16209_read_14bit_unsigned,

static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16209_read_14bit_unsigned,

		ADIS16209_SUPPLY_OUT);

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.30518");

static IIO_DEV_ATTR_IN_RAW(0, adis16209_read_12bit_unsigned,

static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.30518");

static IIO_DEV_ATTR_IN_RAW(1, adis16209_read_12bit_unsigned,

		ADIS16209_AUX_ADC);

static IIO_CONST_ATTR(in0_scale, "0.6105");

static IIO_CONST_ATTR(in1_scale, "0.6105");



static IIO_DEV_ATTR_ACCEL_X(adis16209_read_14bit_signed,

		ADIS16209_XACCL_OUT);
@@ -438,15 +438,15 @@ static struct attribute_group adis16209_event_attribute_group = { 
};



static struct attribute *adis16209_attributes[] = {

	&iio_dev_attr_in_supply_raw.dev_attr.attr,

	&iio_const_attr_in_supply_scale.dev_attr.attr,

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,

	&iio_dev_attr_temp_raw.dev_attr.attr,

	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	&iio_dev_attr_in0_raw.dev_attr.attr,

	&iio_const_attr_in0_scale.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,

	&iio_dev_attr_accel_y_raw.dev_attr.attr,

	&iio_dev_attr_accel_x_calibbias.dev_attr.attr,

drivers/staging/iio/accel/adis16220_core.c

+7 −7
Original line number Diff line number Diff line
@@ -485,9 +485,9 @@ static struct bin_attribute adc2_bin = { 
	.size = ADIS16220_CAPTURE_SIZE,

};



static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16220_read_12bit_unsigned,

static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16220_read_12bit_unsigned,

		ADIS16220_CAPT_SUPPLY);

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.0012207");

static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.0012207");

static IIO_DEV_ATTR_ACCEL(adis16220_read_16bit, ADIS16220_CAPT_BUFA);

static IIO_DEVICE_ATTR(accel_peak_raw, S_IRUGO, adis16220_read_16bit,

		NULL, ADIS16220_CAPT_PEAKA);
@@ -500,8 +500,8 @@ static IIO_DEV_ATTR_TEMP_RAW(adis16220_read_12bit_unsigned); 
static IIO_CONST_ATTR_TEMP_OFFSET("25");

static IIO_CONST_ATTR_TEMP_SCALE("-0.47");



static IIO_DEV_ATTR_IN_RAW(0, adis16220_read_16bit, ADIS16220_CAPT_BUF1);

static IIO_DEV_ATTR_IN_RAW(1, adis16220_read_16bit, ADIS16220_CAPT_BUF2);

static IIO_DEV_ATTR_IN_RAW(1, adis16220_read_16bit, ADIS16220_CAPT_BUF1);

static IIO_DEV_ATTR_IN_RAW(2, adis16220_read_16bit, ADIS16220_CAPT_BUF2);



static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL,

		adis16220_write_reset, 0);
@@ -524,15 +524,15 @@ static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("100200"); 
static IIO_CONST_ATTR_NAME("adis16220");



static struct attribute *adis16220_attributes[] = {

	&iio_dev_attr_in_supply_raw.dev_attr.attr,

	&iio_const_attr_in_supply_scale.dev_attr.attr,

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,

	&iio_dev_attr_accel_raw.dev_attr.attr,

	&iio_dev_attr_accel_offset.dev_attr.attr,

	&iio_dev_attr_accel_peak_raw.dev_attr.attr,

	&iio_const_attr_accel_scale.dev_attr.attr,

	&iio_dev_attr_temp_raw.dev_attr.attr,

	&iio_dev_attr_in0_raw.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_dev_attr_in2_raw.dev_attr.attr,

	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_const_attr_sampling_frequency_available.dev_attr.attr,

drivers/staging/iio/accel/adis16240_core.c

+6 −6
Original line number Diff line number Diff line
@@ -376,11 +376,11 @@ static int adis16240_initial_setup(struct adis16240_state *st) 
	return ret;

}



static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16240_read_10bit_unsigned,

static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply, adis16240_read_10bit_unsigned,

		ADIS16240_SUPPLY_OUT);

static IIO_DEV_ATTR_IN_RAW(0, adis16240_read_10bit_signed,

static IIO_DEV_ATTR_IN_RAW(1, adis16240_read_10bit_signed,

		ADIS16240_AUX_ADC);

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.00488");

static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.00488");



static IIO_CONST_ATTR_ACCEL_SCALE("0.50406181");

static IIO_CONST_ATTR(accel_peak_scale, "6.6292954");
@@ -433,9 +433,9 @@ static struct attribute_group adis16240_event_attribute_group = { 
};



static struct attribute *adis16240_attributes[] = {

	&iio_dev_attr_in_supply_raw.dev_attr.attr,

	&iio_const_attr_in_supply_scale.dev_attr.attr,

	&iio_dev_attr_in0_raw.dev_attr.attr,

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_accel_scale.dev_attr.attr,

	&iio_const_attr_accel_peak_scale.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,

drivers/staging/iio/adc/adc.h

+6 −6
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#define IIO_DEV_ATTR_IN_RAW(_num, _show, _addr)				\

	IIO_DEVICE_ATTR(in##_num##_raw, S_IRUGO, _show, NULL, _addr)



#define IIO_DEV_ATTR_IN_NAMED_RAW(_name, _show, _addr)			\

	IIO_DEVICE_ATTR(in_##_name##_raw, S_IRUGO, _show, NULL, _addr)

#define IIO_DEV_ATTR_IN_NAMED_RAW(_num, _name, _show, _addr)		\

	IIO_DEVICE_ATTR(in##_num##_##_name##_raw, S_IRUGO, _show, NULL, _addr)



#define IIO_DEV_ATTR_IN_DIFF_RAW(_nump, _numn, _show, _addr)		\

	IIO_DEVICE_ATTR_NAMED(in##_nump##min##_numn##_raw,		\
@@ -28,11 +28,11 @@ 
			      _addr)





#define IIO_CONST_ATTR_IN_NAMED_OFFSET(_name, _string)			\

	IIO_CONST_ATTR(in_##_name##_offset, _string)

#define IIO_CONST_ATTR_IN_NAMED_OFFSET(_num, _name, _string)	\

	IIO_CONST_ATTR(in##_num##_##_name##_offset, _string)



#define IIO_CONST_ATTR_IN_NAMED_SCALE(_name, _string)			\

	IIO_CONST_ATTR(in_##_name##_scale, _string)

#define IIO_CONST_ATTR_IN_NAMED_SCALE(_num, _name, _string)	\

	IIO_CONST_ATTR(in##_num##_##_name##_scale, _string)



#define IIO_EVENT_CODE_IN_HIGH_THRESH(a)				\

	IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_IN, a, IIO_EV_TYPE_THRESH,	\

drivers/staging/iio/gyro/adis16260_core.c

+8 −8
Original line number Diff line number Diff line
@@ -442,10 +442,10 @@ static int adis16260_initial_setup(struct adis16260_state *st) 
	return ret;

}



static IIO_DEV_ATTR_IN_NAMED_RAW(supply,

static IIO_DEV_ATTR_IN_NAMED_RAW(0, supply,

				adis16260_read_12bit_unsigned,

				ADIS16260_SUPPLY_OUT);

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.0018315");

static IIO_CONST_ATTR_IN_NAMED_SCALE(0, supply, "0.0018315");



static IIO_DEV_ATTR_GYRO(adis16260_read_14bit_signed,

		ADIS16260_GYRO_OUT);
@@ -463,9 +463,9 @@ static IIO_DEV_ATTR_TEMP_RAW(adis16260_read_12bit_unsigned); 
static IIO_CONST_ATTR_TEMP_OFFSET("25");

static IIO_CONST_ATTR_TEMP_SCALE("0.1453");



static IIO_DEV_ATTR_IN_RAW(0, adis16260_read_12bit_unsigned,

static IIO_DEV_ATTR_IN_RAW(1, adis16260_read_12bit_unsigned,

		ADIS16260_AUX_ADC);

static IIO_CONST_ATTR(in0_scale, "0.0006105");

static IIO_CONST_ATTR(in1_scale, "0.0006105");



static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,

		adis16260_read_frequency,
@@ -488,8 +488,8 @@ static struct attribute_group adis16260_event_attribute_group = { 
};



static struct attribute *adis16260_attributes[] = {

	&iio_dev_attr_in_supply_raw.dev_attr.attr,

	&iio_const_attr_in_supply_scale.dev_attr.attr,

	&iio_dev_attr_in0_supply_raw.dev_attr.attr,

	&iio_const_attr_in0_supply_scale.dev_attr.attr,

	&iio_dev_attr_gyro_raw.dev_attr.attr,

	&iio_const_attr_gyro_scale.dev_attr.attr,

	&iio_dev_attr_gyro_calibscale.dev_attr.attr,
@@ -498,8 +498,8 @@ static struct attribute *adis16260_attributes[] = { 
	&iio_dev_attr_temp_raw.dev_attr.attr,

	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_dev_attr_in0_raw.dev_attr.attr,

	&iio_const_attr_in0_scale.dev_attr.attr,

	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_in1_scale.dev_attr.attr,

	&iio_dev_attr_sampling_frequency.dev_attr.attr,

	&iio_const_attr_sampling_frequency_available.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,