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

Commit 51a0a5b0 authored by Manuel Stahl's avatar Manuel Stahl Committed by Greg Kroah-Hartman
Browse files

staging: iio sync drivers with current ABI 



Signed-off-by: default avatarManuel Stahl <manuel.stahl@iis.fraunhofer.de>
Signed-off-by: default avatarJonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5770b8ff

drivers/staging/iio/accel/accel.h

+36 −6
Original line number Diff line number Diff line
@@ -14,14 +14,44 @@ 
#define IIO_DEV_ATTR_ACCEL_Z_OFFSET(_mode, _show, _store, _addr)	\

	IIO_DEVICE_ATTR(accel_z_offset, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_X_GAIN(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_x_gain, _mode, _show, _store, _addr)

#define IIO_CONST_ATTR_ACCEL_SCALE(_string)		\

	IIO_CONST_ATTR(accel_scale, _string)



#define IIO_DEV_ATTR_ACCEL_Y_GAIN(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_y_gain, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_ACCEL_SCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_scale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Z_GAIN(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_z_gain, _mode, _show, _store, _addr)

#define IIO_DEV_ATTR_ACCEL_X_SCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_x_scale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Y_SCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_y_scale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Z_SCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_z_scale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_CALIBBIAS(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_calibbias, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_X_CALIBBIAS(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_x_calibbias, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Y_CALIBBIAS(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_y_calibbias, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Z_CALIBBIAS(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_z_calibbias, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_CALIBSCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_calibscale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_X_CALIBSCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_x_calibscale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Y_CALIBSCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_y_calibscale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL_Z_CALIBSCALE(_mode, _show, _store, _addr)		\

	IIO_DEVICE_ATTR(accel_z_calibscale, _mode, _show, _store, _addr)



#define IIO_DEV_ATTR_ACCEL(_show, _addr)			\

	IIO_DEVICE_ATTR(accel_raw, S_IRUGO, _show, NULL, _addr)

drivers/staging/iio/accel/adis16209_core.c

+8 −18
Original line number Diff line number Diff line
@@ -393,7 +393,7 @@ static int adis16209_initial_setup(struct adis16209_state *st) 


static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16209_read_14bit_unsigned,

		ADIS16209_SUPPLY_OUT);

static IIO_CONST_ATTR(in_supply_scale, "0.30518");

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.30518");

static IIO_DEV_ATTR_IN_RAW(0, adis16209_read_12bit_unsigned,

		ADIS16209_AUX_ADC);

static IIO_CONST_ATTR(in0_scale, "0.6105");
@@ -402,11 +402,11 @@ static IIO_DEV_ATTR_ACCEL_X(adis16209_read_14bit_signed, 
		ADIS16209_XACCL_OUT);

static IIO_DEV_ATTR_ACCEL_Y(adis16209_read_14bit_signed,

		ADIS16209_YACCL_OUT);

static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO,

static IIO_DEV_ATTR_ACCEL_X_CALIBBIAS(S_IWUSR | S_IRUGO,

		adis16209_read_14bit_signed,

		adis16209_write_16bit,

		ADIS16209_XACCL_NULL);

static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO,

static IIO_DEV_ATTR_ACCEL_Y_CALIBBIAS(S_IWUSR | S_IRUGO,

		adis16209_read_14bit_signed,

		adis16209_write_16bit,

		ADIS16209_YACCL_NULL);
@@ -416,26 +416,18 @@ static IIO_DEV_ATTR_INCLI_X(adis16209_read_14bit_signed, 
		ADIS16209_XINCL_OUT);

static IIO_DEV_ATTR_INCLI_Y(adis16209_read_14bit_signed,

		ADIS16209_YINCL_OUT);

static IIO_DEV_ATTR_INCLI_X_OFFSET(S_IWUSR | S_IRUGO,

		adis16209_read_14bit_signed,

		adis16209_write_16bit,

		ADIS16209_XACCL_NULL);

static IIO_DEV_ATTR_INCLI_Y_OFFSET(S_IWUSR | S_IRUGO,

		adis16209_read_14bit_signed,

		adis16209_write_16bit,

		ADIS16209_YACCL_NULL);

static IIO_CONST_ATTR(incli_scale, "0.025");



static IIO_DEVICE_ATTR(rot_raw, S_IRUGO, adis16209_read_14bit_signed,

		       NULL, ADIS16209_ROT_OUT);



static IIO_DEV_ATTR_TEMP(adis16209_read_temp);

static IIO_CONST_ATTR(temp_offset, "25");

static IIO_CONST_ATTR(temp_scale, "-0.47");

static IIO_CONST_ATTR_TEMP_OFFSET("25");

static IIO_CONST_ATTR_TEMP_SCALE("-0.47");



static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16209_write_reset, 0);



static IIO_CONST_ATTR(name, "adis16209");

static IIO_CONST_ATTR_NAME("adis16209");



static struct attribute *adis16209_event_attributes[] = {

	NULL
@@ -457,13 +449,11 @@ static struct attribute *adis16209_attributes[] = { 
	&iio_const_attr_in0_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_offset.dev_attr.attr,

	&iio_dev_attr_accel_y_offset.dev_attr.attr,

	&iio_dev_attr_accel_x_calibbias.dev_attr.attr,

	&iio_dev_attr_accel_y_calibbias.dev_attr.attr,

	&iio_const_attr_accel_scale.dev_attr.attr,

	&iio_dev_attr_incli_x_raw.dev_attr.attr,

	&iio_dev_attr_incli_y_raw.dev_attr.attr,

	&iio_dev_attr_incli_x_offset.dev_attr.attr,

	&iio_dev_attr_incli_y_offset.dev_attr.attr,

	&iio_const_attr_incli_scale.dev_attr.attr,

	&iio_dev_attr_rot_raw.dev_attr.attr,

	NULL

drivers/staging/iio/accel/adis16209_ring.c

+6 −6
Original line number Diff line number Diff line
@@ -17,13 +17,13 @@ 
#include "../trigger.h"

#include "adis16209.h"



static IIO_SCAN_EL_C(supply, ADIS16209_SCAN_SUPPLY, IIO_UNSIGNED(14),

static IIO_SCAN_EL_C(in_supply, ADIS16209_SCAN_SUPPLY, IIO_UNSIGNED(14),

		     ADIS16209_SUPPLY_OUT, NULL);

static IIO_SCAN_EL_C(accel_x, ADIS16209_SCAN_ACC_X, IIO_SIGNED(14),

		     ADIS16209_XACCL_OUT, NULL);

static IIO_SCAN_EL_C(accel_y, ADIS16209_SCAN_ACC_Y, IIO_SIGNED(14),

		     ADIS16209_YACCL_OUT, NULL);

static IIO_SCAN_EL_C(aux_adc, ADIS16209_SCAN_AUX_ADC, IIO_UNSIGNED(12),

static IIO_SCAN_EL_C(in0, ADIS16209_SCAN_AUX_ADC, IIO_UNSIGNED(12),

		     ADIS16209_AUX_ADC, NULL);

static IIO_SCAN_EL_C(temp, ADIS16209_SCAN_TEMP, IIO_UNSIGNED(12),

		     ADIS16209_TEMP_OUT, NULL);
@@ -37,10 +37,10 @@ static IIO_SCAN_EL_C(rot, ADIS16209_SCAN_ROT, IIO_SIGNED(14), 
static IIO_SCAN_EL_TIMESTAMP(8);



static struct attribute *adis16209_scan_el_attrs[] = {

	&iio_scan_el_supply.dev_attr.attr,

	&iio_scan_el_in_supply.dev_attr.attr,

	&iio_scan_el_accel_x.dev_attr.attr,

	&iio_scan_el_accel_y.dev_attr.attr,

	&iio_scan_el_aux_adc.dev_attr.attr,

	&iio_scan_el_in0.dev_attr.attr,

	&iio_scan_el_temp.dev_attr.attr,

	&iio_scan_el_incli_x.dev_attr.attr,

	&iio_scan_el_incli_y.dev_attr.attr,
@@ -177,12 +177,12 @@ int adis16209_configure_ring(struct iio_dev *indio_dev) 
	ring->owner = THIS_MODULE;



	/* Set default scan mode */

	iio_scan_mask_set(ring, iio_scan_el_supply.number);

	iio_scan_mask_set(ring, iio_scan_el_in_supply.number);

	iio_scan_mask_set(ring, iio_scan_el_rot.number);

	iio_scan_mask_set(ring, iio_scan_el_accel_x.number);

	iio_scan_mask_set(ring, iio_scan_el_accel_y.number);

	iio_scan_mask_set(ring, iio_scan_el_temp.number);

	iio_scan_mask_set(ring, iio_scan_el_aux_adc.number);

	iio_scan_mask_set(ring, iio_scan_el_in0.number);

	iio_scan_mask_set(ring, iio_scan_el_incli_x.number);

	iio_scan_mask_set(ring, iio_scan_el_incli_y.number);

drivers/staging/iio/accel/adis16220_core.c

+6 −6
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static struct bin_attribute adc2_bin = { 


static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16220_read_12bit_unsigned,

		ADIS16220_CAPT_SUPPLY);

static IIO_CONST_ATTR(in_supply_scale, "0.0012207");

static IIO_CONST_ATTR_IN_NAMED_SCALE(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);
@@ -496,8 +496,8 @@ static IIO_DEV_ATTR_ACCEL_OFFSET(S_IWUSR | S_IRUGO, 
		adis16220_write_16bit,

		ADIS16220_ACCL_NULL);

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_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);
@@ -518,9 +518,9 @@ static IIO_DEV_ATTR_CAPTURE_COUNT(S_IWUSR | S_IRUGO, 
		adis16220_write_16bit,

		ADIS16220_CAPT_PNTR);



static IIO_CONST_ATTR_AVAIL_SAMP_FREQ("100200");

static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("100200");



static IIO_CONST_ATTR(name, "adis16220");

static IIO_CONST_ATTR_NAME("adis16220");



static struct attribute *adis16220_attributes[] = {

	&iio_dev_attr_in_supply_raw.dev_attr.attr,
@@ -533,7 +533,7 @@ static struct attribute *adis16220_attributes[] = { 
	&iio_dev_attr_in1_raw.dev_attr.attr,

	&iio_const_attr_temp_offset.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_const_attr_available_sampling_frequency.dev_attr.attr,

	&iio_const_attr_sampling_frequency_available.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_dev_attr_capture.dev_attr.attr,

	&iio_dev_attr_capture_count.dev_attr.attr,

drivers/staging/iio/accel/adis16240_core.c

+11 −11
Original line number Diff line number Diff line
@@ -380,7 +380,7 @@ static IIO_DEV_ATTR_IN_NAMED_RAW(supply, adis16240_read_10bit_unsigned, 
		ADIS16240_SUPPLY_OUT);

static IIO_DEV_ATTR_IN_RAW(0, adis16240_read_10bit_signed,

		ADIS16240_AUX_ADC);

static IIO_CONST_ATTR(in_supply_scale, "0.00488");

static IIO_CONST_ATTR_IN_NAMED_SCALE(supply, "0.00488");

static IIO_DEV_ATTR_ACCEL_X(adis16240_read_10bit_signed,

		ADIS16240_XACCL_OUT);

static IIO_DEVICE_ATTR(accel_x_peak_raw, S_IRUGO,
@@ -400,26 +400,26 @@ static IIO_DEVICE_ATTR(accel_z_peak_raw, S_IRUGO, 
static IIO_DEVICE_ATTR(accel_xyz_squared_peak_raw, S_IRUGO,

		       adis16240_read_12bit_signed, NULL,

		       ADIS16240_XYZPEAK_OUT);

static IIO_DEV_ATTR_ACCEL_X_OFFSET(S_IWUSR | S_IRUGO,

static IIO_DEV_ATTR_ACCEL_X_CALIBBIAS(S_IWUSR | S_IRUGO,

		adis16240_read_10bit_signed,

		adis16240_write_16bit,

		ADIS16240_XACCL_OFF);

static IIO_DEV_ATTR_ACCEL_Y_OFFSET(S_IWUSR | S_IRUGO,

static IIO_DEV_ATTR_ACCEL_Y_CALIBBIAS(S_IWUSR | S_IRUGO,

		adis16240_read_10bit_signed,

		adis16240_write_16bit,

		ADIS16240_YACCL_OFF);

static IIO_DEV_ATTR_ACCEL_Z_OFFSET(S_IWUSR | S_IRUGO,

static IIO_DEV_ATTR_ACCEL_Z_CALIBBIAS(S_IWUSR | S_IRUGO,

		adis16240_read_10bit_signed,

		adis16240_write_16bit,

		ADIS16240_ZACCL_OFF);

static IIO_DEV_ATTR_TEMP_RAW(adis16240_read_10bit_unsigned);

static IIO_CONST_ATTR(temp_scale, "0.244");

static IIO_CONST_ATTR_TEMP_SCALE("0.244");



static IIO_DEVICE_ATTR(reset, S_IWUSR, NULL, adis16240_write_reset, 0);



static IIO_CONST_ATTR_AVAIL_SAMP_FREQ("4096");

static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("4096");



static IIO_CONST_ATTR(name, "adis16240");

static IIO_CONST_ATTR_NAME("adis16240");



static struct attribute *adis16240_event_attributes[] = {

	NULL
@@ -434,18 +434,18 @@ static struct attribute *adis16240_attributes[] = { 
	&iio_const_attr_in_supply_scale.dev_attr.attr,

	&iio_dev_attr_in0_raw.dev_attr.attr,

	&iio_dev_attr_accel_x_raw.dev_attr.attr,

	&iio_dev_attr_accel_x_offset.dev_attr.attr,

	&iio_dev_attr_accel_x_calibbias.dev_attr.attr,

	&iio_dev_attr_accel_x_peak_raw.dev_attr.attr,

	&iio_dev_attr_accel_y_raw.dev_attr.attr,

	&iio_dev_attr_accel_y_offset.dev_attr.attr,

	&iio_dev_attr_accel_y_calibbias.dev_attr.attr,

	&iio_dev_attr_accel_y_peak_raw.dev_attr.attr,

	&iio_dev_attr_accel_z_raw.dev_attr.attr,

	&iio_dev_attr_accel_z_offset.dev_attr.attr,

	&iio_dev_attr_accel_z_calibbias.dev_attr.attr,

	&iio_dev_attr_accel_z_peak_raw.dev_attr.attr,

	&iio_dev_attr_accel_xyz_squared_peak_raw.dev_attr.attr,

	&iio_dev_attr_temp_raw.dev_attr.attr,

	&iio_const_attr_temp_scale.dev_attr.attr,

	&iio_const_attr_available_sampling_frequency.dev_attr.attr,

	&iio_const_attr_sampling_frequency_available.dev_attr.attr,

	&iio_dev_attr_reset.dev_attr.attr,

	&iio_const_attr_name.dev_attr.attr,

	NULL