Commit 5bd22f51 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

staging:iio:adis16204: Use adis library 



Use the new adis library for the adis16204 driver. This allows us to completely
scrap the adis16204 buffer and trigger code and more than half of the core
driver code.

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

drivers/staging/iio/accel/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ config ADIS16203 
config ADIS16204

	tristate "Analog Devices ADIS16204 Programmable High-g Digital Impact Sensor and Recorder"

	depends on SPI

	select IIO_TRIGGER if IIO_BUFFER

	select IIO_SW_RING if IIO_BUFFER

	select IIO_ADIS_LIB

	select IIO_ADIS_LIB_BUFFER if IIO_BUFFER

	help

	  Say yes here to build support for Analog Devices adis16204 Programmable

	  High-g Digital Impact Sensor and Recorder.

drivers/staging/iio/accel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ adis16203-y := adis16203_core.o 
obj-$(CONFIG_ADIS16203) += adis16203.o



adis16204-y             := adis16204_core.o

adis16204-$(CONFIG_IIO_BUFFER) += adis16204_ring.o adis16204_trigger.o

obj-$(CONFIG_ADIS16204) += adis16204.o



adis16209-y             := adis16209_core.o

drivers/staging/iio/accel/adis16204.h

+7 −72
Original line number Diff line number Diff line
@@ -3,9 +3,6 @@ 


#define ADIS16204_STARTUP_DELAY	220 /* ms */



#define ADIS16204_READ_REG(a)    a

#define ADIS16204_WRITE_REG(a) ((a) | 0x80)



#define ADIS16204_FLASH_CNT      0x00 /* Flash memory write count */

#define ADIS16204_SUPPLY_OUT     0x02 /* Output, power supply */

#define ADIS16204_XACCL_OUT      0x04 /* Output, x-axis accelerometer */
@@ -35,8 +32,6 @@ 
#define ADIS16204_DIAG_STAT      0x3C /* Diagnostics, system status register */

#define ADIS16204_GLOB_CMD       0x3E /* Operation, system command register */



#define ADIS16204_OUTPUTS        5



/* MSC_CTRL */

#define ADIS16204_MSC_CTRL_PWRUP_SELF_TEST	(1 << 10) /* Self-test at power-on: 1 = disabled, 0 = enabled */

#define ADIS16204_MSC_CTRL_SELF_TEST_EN	        (1 << 8)  /* Self-test enable */
@@ -47,87 +42,27 @@ 
/* DIAG_STAT */

#define ADIS16204_DIAG_STAT_ALARM2        (1<<9) /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */

#define ADIS16204_DIAG_STAT_ALARM1        (1<<8) /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */

#define ADIS16204_DIAG_STAT_SELFTEST_FAIL (1<<5) /* Self-test diagnostic error flag: 1 = error condition,

#define ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT 5 /* Self-test diagnostic error flag: 1 = error condition,

						0 = normal operation */

#define ADIS16204_DIAG_STAT_SPI_FAIL	  (1<<3) /* SPI communications failure */

#define ADIS16204_DIAG_STAT_FLASH_UPT	  (1<<2) /* Flash update failure */

#define ADIS16204_DIAG_STAT_POWER_HIGH	  (1<<1) /* Power supply above 3.625 V */

#define ADIS16204_DIAG_STAT_POWER_LOW	  (1<<0) /* Power supply below 2.975 V */

#define ADIS16204_DIAG_STAT_SPI_FAIL_BIT      3 /* SPI communications failure */

#define ADIS16204_DIAG_STAT_FLASH_UPT_BIT     2 /* Flash update failure */

#define ADIS16204_DIAG_STAT_POWER_HIGH_BIT    1 /* Power supply above 3.625 V */

#define ADIS16204_DIAG_STAT_POWER_LOW_BIT     0 /* Power supply below 2.975 V */



/* GLOB_CMD */

#define ADIS16204_GLOB_CMD_SW_RESET	(1<<7)

#define ADIS16204_GLOB_CMD_CLEAR_STAT	(1<<4)

#define ADIS16204_GLOB_CMD_FACTORY_CAL	(1<<1)



#define ADIS16204_MAX_TX 24

#define ADIS16204_MAX_RX 24



#define ADIS16204_ERROR_ACTIVE          (1<<14)



/**

 * struct adis16204_state - device instance specific data

 * @us:			actual spi_device

 * @trig:		data ready trigger registered with iio

 * @tx:			transmit buffer

 * @rx:			receive buffer

 * @buf_lock:		mutex to protect tx and rx

 **/

struct adis16204_state {

	struct spi_device	*us;

	struct iio_trigger	*trig;

	struct mutex		buf_lock;

	u8			tx[ADIS16204_MAX_TX] ____cacheline_aligned;

	u8			rx[ADIS16204_MAX_RX];

};



int adis16204_set_irq(struct iio_dev *indio_dev, bool enable);



enum adis16204_scan {

	ADIS16204_SCAN_SUPPLY,

	ADIS16204_SCAN_ACC_X,

	ADIS16204_SCAN_ACC_Y,

	ADIS16204_SCAN_ACC_XY,

	ADIS16204_SCAN_SUPPLY,

	ADIS16204_SCAN_AUX_ADC,

	ADIS16204_SCAN_TEMP,

};



#ifdef CONFIG_IIO_BUFFER

void adis16204_remove_trigger(struct iio_dev *indio_dev);

int adis16204_probe_trigger(struct iio_dev *indio_dev);



ssize_t adis16204_read_data_from_ring(struct device *dev,

				      struct device_attribute *attr,

				      char *buf);



int adis16204_configure_ring(struct iio_dev *indio_dev);

void adis16204_unconfigure_ring(struct iio_dev *indio_dev);



#else /* CONFIG_IIO_BUFFER */



static inline void adis16204_remove_trigger(struct iio_dev *indio_dev)

{

}



static inline int adis16204_probe_trigger(struct iio_dev *indio_dev)

{

	return 0;

}



static inline ssize_t

adis16204_read_data_from_ring(struct device *dev,

			      struct device_attribute *attr,

			      char *buf)

{

	return 0;

}



static int adis16204_configure_ring(struct iio_dev *indio_dev)

{

	return 0;

}



static inline void adis16204_unconfigure_ring(struct iio_dev *indio_dev)

{

}



#endif /* CONFIG_IIO_BUFFER */

#endif /* SPI_ADIS16204_H_ */

drivers/staging/iio/accel/adis16204_core.c

+61 −390
Original line number Diff line number Diff line
@@ -23,257 +23,14 @@ 
#include <linux/iio/buffer.h>



#include "adis16204.h"



/**

 * adis16204_spi_write_reg_8() - write single byte to a register

 * @dev: device associated with child of actual device (iio_dev or iio_trig)

 * @reg_address: the address of the register to be written

 * @val: the value to write

 **/

static int adis16204_spi_write_reg_8(struct iio_dev *indio_dev,

		u8 reg_address,

		u8 val)

{

	int ret;

	struct adis16204_state *st = iio_priv(indio_dev);



	mutex_lock(&st->buf_lock);

	st->tx[0] = ADIS16204_WRITE_REG(reg_address);

	st->tx[1] = val;



	ret = spi_write(st->us, st->tx, 2);

	mutex_unlock(&st->buf_lock);



	return ret;

}



/**

 * adis16204_spi_write_reg_16() - write 2 bytes to a pair of registers

 * @indio_dev: iio device associated with child of actual device

 * @reg_address: the address of the lower of the two registers. Second register

 *               is assumed to have address one greater.

 * @val: value to be written

 **/

static int adis16204_spi_write_reg_16(struct iio_dev *indio_dev,

		u8 lower_reg_address,

		u16 value)

{

	int ret;

	struct spi_message msg;

	struct adis16204_state *st = iio_priv(indio_dev);

	struct spi_transfer xfers[] = {

		{

			.tx_buf = st->tx,

			.bits_per_word = 8,

			.len = 2,

			.cs_change = 1,

		}, {

			.tx_buf = st->tx + 2,

			.bits_per_word = 8,

			.len = 2,

			.cs_change = 1,

		},

	};



	mutex_lock(&st->buf_lock);

	st->tx[0] = ADIS16204_WRITE_REG(lower_reg_address);

	st->tx[1] = value & 0xFF;

	st->tx[2] = ADIS16204_WRITE_REG(lower_reg_address + 1);

	st->tx[3] = (value >> 8) & 0xFF;



	spi_message_init(&msg);

	spi_message_add_tail(&xfers[0], &msg);

	spi_message_add_tail(&xfers[1], &msg);

	ret = spi_sync(st->us, &msg);

	mutex_unlock(&st->buf_lock);



	return ret;

}



/**

 * adis16204_spi_read_reg_16() - read 2 bytes from a 16-bit register

 * @indio_dev: iio device associated with child of actual device

 * @reg_address: the address of the lower of the two registers. Second register

 *               is assumed to have address one greater.

 * @val: somewhere to pass back the value read

 **/

static int adis16204_spi_read_reg_16(struct iio_dev *indio_dev,

				     u8 lower_reg_address,

				     u16 *val)

{

	struct spi_message msg;

	struct adis16204_state *st = iio_priv(indio_dev);

	int ret;

	struct spi_transfer xfers[] = {

		{

			.tx_buf = st->tx,

			.bits_per_word = 8,

			.len = 2,

			.cs_change = 1,

			.delay_usecs = 20,

		}, {

			.rx_buf = st->rx,

			.bits_per_word = 8,

			.len = 2,

			.delay_usecs = 20,

		},

	};



	mutex_lock(&st->buf_lock);

	st->tx[0] = ADIS16204_READ_REG(lower_reg_address);

	st->tx[1] = 0;



	spi_message_init(&msg);

	spi_message_add_tail(&xfers[0], &msg);

	spi_message_add_tail(&xfers[1], &msg);

	ret = spi_sync(st->us, &msg);

	if (ret) {

		dev_err(&st->us->dev, "problem when reading 16 bit register 0x%02X",

				lower_reg_address);

		goto error_ret;

	}

	*val = (st->rx[0] << 8) | st->rx[1];



error_ret:

	mutex_unlock(&st->buf_lock);

	return ret;

}



static int adis16204_check_status(struct iio_dev *indio_dev)

{

	u16 status;

	int ret;



	ret = adis16204_spi_read_reg_16(indio_dev,

					ADIS16204_DIAG_STAT, &status);

	if (ret < 0) {

		dev_err(&indio_dev->dev, "Reading status failed\n");

		goto error_ret;

	}

	ret = status & 0x1F;



	if (status & ADIS16204_DIAG_STAT_SELFTEST_FAIL)

		dev_err(&indio_dev->dev, "Self test failure\n");

	if (status & ADIS16204_DIAG_STAT_SPI_FAIL)

		dev_err(&indio_dev->dev, "SPI failure\n");

	if (status & ADIS16204_DIAG_STAT_FLASH_UPT)

		dev_err(&indio_dev->dev, "Flash update failed\n");

	if (status & ADIS16204_DIAG_STAT_POWER_HIGH)

		dev_err(&indio_dev->dev, "Power supply above 3.625V\n");

	if (status & ADIS16204_DIAG_STAT_POWER_LOW)

		dev_err(&indio_dev->dev, "Power supply below 2.975V\n");



error_ret:

	return ret;

}



static int adis16204_reset(struct iio_dev *indio_dev)

{

	int ret;

	ret = adis16204_spi_write_reg_8(indio_dev,

			ADIS16204_GLOB_CMD,

			ADIS16204_GLOB_CMD_SW_RESET);

	if (ret)

		dev_err(&indio_dev->dev, "problem resetting device");



	return ret;

}



int adis16204_set_irq(struct iio_dev *indio_dev, bool enable)

{

	int ret = 0;

	u16 msc;



	ret = adis16204_spi_read_reg_16(indio_dev, ADIS16204_MSC_CTRL, &msc);

	if (ret)

		goto error_ret;



	msc |= ADIS16204_MSC_CTRL_ACTIVE_HIGH;

	msc &= ~ADIS16204_MSC_CTRL_DATA_RDY_DIO2;

	if (enable)

		msc |= ADIS16204_MSC_CTRL_DATA_RDY_EN;

	else

		msc &= ~ADIS16204_MSC_CTRL_DATA_RDY_EN;



	ret = adis16204_spi_write_reg_16(indio_dev, ADIS16204_MSC_CTRL, msc);



error_ret:

	return ret;

}



static int adis16204_self_test(struct iio_dev *indio_dev)

{

	int ret;

	ret = adis16204_spi_write_reg_16(indio_dev,

			ADIS16204_MSC_CTRL,

			ADIS16204_MSC_CTRL_SELF_TEST_EN);

	if (ret) {

		dev_err(&indio_dev->dev, "problem starting self test");

		goto err_ret;

	}



	adis16204_check_status(indio_dev);



err_ret:

	return ret;

}



static int adis16204_initial_setup(struct iio_dev *indio_dev)

{

	int ret;



	/* Disable IRQ */

	ret = adis16204_set_irq(indio_dev, false);

	if (ret) {

		dev_err(&indio_dev->dev, "disable irq failed");

		goto err_ret;

	}



	/* Do self test */

	ret = adis16204_self_test(indio_dev);

	if (ret) {

		dev_err(&indio_dev->dev, "self test failure");

		goto err_ret;

	}



	/* Read status register to check the result */

	ret = adis16204_check_status(indio_dev);

	if (ret) {

		adis16204_reset(indio_dev);

		dev_err(&indio_dev->dev, "device not playing ball -> reset");

		msleep(ADIS16204_STARTUP_DELAY);

		ret = adis16204_check_status(indio_dev);

		if (ret) {

			dev_err(&indio_dev->dev, "giving up");

			goto err_ret;

		}

	}



err_ret:

	return ret;

}

#include "../imu/adis.h"



/* Unique to this driver currently */



enum adis16204_channel {

	in_supply,

	in_aux,

	temp,

	accel_x,

	accel_y,

	accel_xy,

};



static u8 adis16204_addresses[6][3] = {

	[in_supply] = { ADIS16204_SUPPLY_OUT },

	[in_aux] = { ADIS16204_AUX_ADC },

	[temp] = { ADIS16204_TEMP_OUT },

	[accel_x] = { ADIS16204_XACCL_OUT, ADIS16204_XACCL_NULL,

		      ADIS16204_X_PEAK_OUT },

	[accel_y] = { ADIS16204_XACCL_OUT, ADIS16204_YACCL_NULL,

		      ADIS16204_Y_PEAK_OUT },

	[accel_xy] = { ADIS16204_XY_RSS_OUT, 0,

		       ADIS16204_XY_PEAK_OUT },

static const u8 adis16204_addresses[][2] = {

	[ADIS16204_SCAN_ACC_X] = { ADIS16204_XACCL_NULL, ADIS16204_X_PEAK_OUT },

	[ADIS16204_SCAN_ACC_Y] = { ADIS16204_YACCL_NULL, ADIS16204_Y_PEAK_OUT },

	[ADIS16204_SCAN_ACC_XY] = { 0, ADIS16204_XY_PEAK_OUT },

};



static int adis16204_read_raw(struct iio_dev *indio_dev,
@@ -281,6 +38,7 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
			      int *val, int *val2,

			      long mask)

{

	struct adis *st = iio_priv(indio_dev);

	int ret;

	int bits;

	u8 addr;
@@ -289,29 +47,8 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 


	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		mutex_lock(&indio_dev->mlock);

		addr = adis16204_addresses[chan->address][0];

		ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;

		}



		if (val16 & ADIS16204_ERROR_ACTIVE) {

			ret = adis16204_check_status(indio_dev);

			if (ret) {

				mutex_unlock(&indio_dev->mlock);

				return ret;

			}

		}

		val16 = val16 & ((1 << chan->scan_type.realbits) - 1);

		if (chan->scan_type.sign == 's')

			val16 = (s16)(val16 <<

				      (16 - chan->scan_type.realbits)) >>

				(16 - chan->scan_type.realbits);

		*val = val16;

		mutex_unlock(&indio_dev->mlock);

		return IIO_VAL_INT;

		return adis_single_conversion(indio_dev, chan,

				ADIS16204_ERROR_ACTIVE, val);

	case IIO_CHAN_INFO_SCALE:

		switch (chan->type) {

		case IIO_VOLTAGE:
@@ -351,14 +88,14 @@ static int adis16204_read_raw(struct iio_dev *indio_dev, 
	case IIO_CHAN_INFO_PEAK:

		if (mask == IIO_CHAN_INFO_CALIBBIAS) {

			bits = 12;

			addrind = 1;

			addrind = 0;

		} else { /* PEAK_SEPARATE */

			bits = 14;

			addrind = 2;

			addrind = 1;

		}

		mutex_lock(&indio_dev->mlock);

		addr = adis16204_addresses[chan->address][addrind];

		ret = adis16204_spi_read_reg_16(indio_dev, addr, &val16);

		addr = adis16204_addresses[chan->scan_index][addrind];

		ret = adis_read_reg_16(st, addr, &val16);

		if (ret) {

			mutex_unlock(&indio_dev->mlock);

			return ret;
@@ -378,6 +115,7 @@ static int adis16204_write_raw(struct iio_dev *indio_dev, 
			       int val2,

			       long mask)

{

	struct adis *st = iio_priv(indio_dev);

	int bits;

	s16 val16;

	u8 addr;
@@ -391,100 +129,25 @@ static int adis16204_write_raw(struct iio_dev *indio_dev, 
			return -EINVAL;

		}

		val16 = val & ((1 << bits) - 1);

		addr = adis16204_addresses[chan->address][1];

		return adis16204_spi_write_reg_16(indio_dev, addr, val16);

		addr = adis16204_addresses[chan->scan_index][1];

		return adis_write_reg_16(st, addr, val16);

	}

	return -EINVAL;

}



static const struct iio_chan_spec adis16204_channels[] = {

	{

		.type = IIO_VOLTAGE,

		.indexed = 1, /* Note was not previously indexed */

		.channel = 0,

		.extend_name = "supply",

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		.address = in_supply,

		.scan_index = ADIS16204_SCAN_SUPPLY,

		.scan_type = {

			.sign = 'u',

			.realbits = 12,

			.storagebits = 16,

		},

	}, {

		.type = IIO_VOLTAGE,

		.indexed = 1,

		.channel = 1,

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT,

		.address = in_aux,

		.scan_index = ADIS16204_SCAN_AUX_ADC,

		.scan_type = {

			.sign = 'u',

			.realbits = 12,

			.storagebits = 16,

		},

	}, {

		.type = IIO_TEMP,

		.indexed = 1,

		.channel = 0,

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

		IIO_CHAN_INFO_OFFSET_SEPARATE_BIT,

		.address = temp,

		.scan_index = ADIS16204_SCAN_TEMP,

		.scan_type = {

			.sign = 'u',

			.realbits = 12,

			.storagebits = 16,

		},

	}, {

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_X,

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

	ADIS_SUPPLY_CHAN(ADIS16204_SUPPLY_OUT, ADIS16204_SCAN_SUPPLY, 12),

	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,

		.address = accel_x,

		.scan_index = ADIS16204_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_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

	ADIS_ACCEL_CHAN(Y, ADIS16204_YACCL_OUT, ADIS16204_SCAN_ACC_Y,

		IIO_CHAN_INFO_CALIBBIAS_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,

		.address = accel_y,

		.scan_index = ADIS16204_SCAN_ACC_Y,

		.scan_type = {

			.sign = 's',

			.realbits = 14,

			.storagebits = 16,

		},

	},

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

	ADIS_ACCEL_CHAN(ROOT_SUM_SQUARED_X_Y, ADIS16204_XY_RSS_OUT,

		ADIS16204_SCAN_ACC_XY, IIO_CHAN_INFO_PEAK_SEPARATE_BIT, 14),

	IIO_CHAN_SOFT_TIMESTAMP(5),

	{

		.type = IIO_ACCEL,

		.modified = 1,

		.channel2 = IIO_MOD_ROOT_SUM_SQUARED_X_Y,

		.info_mask = IIO_CHAN_INFO_RAW_SEPARATE_BIT |

		IIO_CHAN_INFO_SCALE_SEPARATE_BIT |

		IIO_CHAN_INFO_PEAK_SEPARATE_BIT,

		.address = accel_xy,

		.scan_type = {

			.sign = 'u',

			.realbits = 14,

			.storagebits = 16,

		},

	}

};



static const struct iio_info adis16204_info = {
@@ -493,10 +156,35 @@ static const struct iio_info adis16204_info = { 
	.driver_module = THIS_MODULE,

};



static const char * const adis16204_status_error_msgs[] = {

	[ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT] = "Self test failure",

	[ADIS16204_DIAG_STAT_SPI_FAIL_BIT] = "SPI failure",

	[ADIS16204_DIAG_STAT_FLASH_UPT_BIT] = "Flash update failed",

	[ADIS16204_DIAG_STAT_POWER_HIGH_BIT] = "Power supply above 3.625V",

	[ADIS16204_DIAG_STAT_POWER_LOW_BIT] = "Power supply below 2.975V",

};



static const struct adis_data adis16204_data = {

	.read_delay = 20,

	.msc_ctrl_reg = ADIS16204_MSC_CTRL,

	.glob_cmd_reg = ADIS16204_GLOB_CMD,

	.diag_stat_reg = ADIS16204_DIAG_STAT,



	.self_test_mask = ADIS16204_MSC_CTRL_SELF_TEST_EN,

	.startup_delay = ADIS16204_STARTUP_DELAY,



	.status_error_msgs = adis16204_status_error_msgs,

	.status_error_mask = BIT(ADIS16204_DIAG_STAT_SELFTEST_FAIL_BIT) |

		BIT(ADIS16204_DIAG_STAT_SPI_FAIL_BIT) |

		BIT(ADIS16204_DIAG_STAT_FLASH_UPT_BIT) |

		BIT(ADIS16204_DIAG_STAT_POWER_HIGH_BIT) |

		BIT(ADIS16204_DIAG_STAT_POWER_LOW_BIT),

};



static int __devinit adis16204_probe(struct spi_device *spi)

{

	int ret;

	struct adis16204_state *st;

	struct adis *st;

	struct iio_dev *indio_dev;



	/* setup the industrialio driver allocated elements */
@@ -508,8 +196,6 @@ static int __devinit adis16204_probe(struct spi_device *spi) 
	st = iio_priv(indio_dev);

	/* this is only used for removal purposes */

	spi_set_drvdata(spi, indio_dev);

	st->us = spi;

	mutex_init(&st->buf_lock);



	indio_dev->name = spi->dev.driver->name;

	indio_dev->dev.parent = &spi->dev;
@@ -518,40 +204,26 @@ static int __devinit adis16204_probe(struct spi_device *spi) 
	indio_dev->num_channels = ARRAY_SIZE(adis16204_channels);

	indio_dev->modes = INDIO_DIRECT_MODE;



	ret = adis16204_configure_ring(indio_dev);

	ret = adis_init(st, indio_dev, spi, &adis16204_data);

	if (ret)

		goto error_free_dev;



	ret = iio_buffer_register(indio_dev,

				  adis16204_channels,

				  6);

	if (ret) {

		printk(KERN_ERR "failed to initialize the ring\n");

		goto error_unreg_ring_funcs;

	}



	if (spi->irq) {

		ret = adis16204_probe_trigger(indio_dev);

	ret = adis_setup_buffer_and_trigger(st, indio_dev, NULL);

	if (ret)

			goto error_uninitialize_ring;

	}

		goto error_free_dev;



	/* Get the device into a sane initial state */

	ret = adis16204_initial_setup(indio_dev);

	ret = adis_initial_startup(st);

	if (ret)

		goto error_remove_trigger;

		goto error_cleanup_buffer_trigger;

	ret = iio_device_register(indio_dev);

	if (ret)

		goto error_remove_trigger;

		goto error_cleanup_buffer_trigger;



	return 0;



error_remove_trigger:

	adis16204_remove_trigger(indio_dev);

error_uninitialize_ring:

	iio_buffer_unregister(indio_dev);

error_unreg_ring_funcs:

	adis16204_unconfigure_ring(indio_dev);

error_cleanup_buffer_trigger:

	adis_cleanup_buffer_and_trigger(st, indio_dev);

error_free_dev:

	iio_device_free(indio_dev);

error_ret:
@@ -561,11 +233,10 @@ static int __devinit adis16204_probe(struct spi_device *spi) 
static int __devexit adis16204_remove(struct spi_device *spi)

{

	struct iio_dev *indio_dev = spi_get_drvdata(spi);

	struct adis *st = iio_priv(indio_dev);



	iio_device_unregister(indio_dev);

	adis16204_remove_trigger(indio_dev);

	iio_buffer_unregister(indio_dev);

	adis16204_unconfigure_ring(indio_dev);

	adis_cleanup_buffer_and_trigger(st, indio_dev);

	iio_device_free(indio_dev);



	return 0;

drivers/staging/iio/accel/adis16204_ring.c

deleted100644 → 0
+0 −134
Original line number Diff line number Diff line 
#include <linux/export.h>

#include <linux/interrupt.h>

#include <linux/mutex.h>

#include <linux/kernel.h>

#include <linux/spi/spi.h>

#include <linux/slab.h>



#include <linux/iio/iio.h>

#include "../ring_sw.h"

#include <linux/iio/trigger_consumer.h>

#include "adis16204.h"



/**

 * adis16204_read_ring_data() read data registers which will be placed into ring

 * @indio_dev: the IIO device

 * @rx: somewhere to pass back the value read

 **/

static int adis16204_read_ring_data(struct iio_dev *indio_dev, u8 *rx)

{

	struct spi_message msg;

	struct adis16204_state *st = iio_priv(indio_dev);

	struct spi_transfer xfers[ADIS16204_OUTPUTS + 1];

	int ret;

	int i;



	mutex_lock(&st->buf_lock);



	spi_message_init(&msg);



	memset(xfers, 0, sizeof(xfers));

	for (i = 0; i <= ADIS16204_OUTPUTS; i++) {

		xfers[i].bits_per_word = 8;

		xfers[i].cs_change = 1;

		xfers[i].len = 2;

		xfers[i].delay_usecs = 20;

		xfers[i].tx_buf = st->tx + 2 * i;

		st->tx[2 * i]

			= ADIS16204_READ_REG(ADIS16204_SUPPLY_OUT + 2 * i);

		st->tx[2 * i + 1] = 0;

		if (i >= 1)

			xfers[i].rx_buf = rx + 2 * (i - 1);

		spi_message_add_tail(&xfers[i], &msg);

	}



	ret = spi_sync(st->us, &msg);

	if (ret)

		dev_err(&st->us->dev, "problem when burst reading");



	mutex_unlock(&st->buf_lock);



	return ret;

}



/* Whilst this makes a lot of calls to iio_sw_ring functions - it is to device

 * specific to be rolled into the core.

 */

static irqreturn_t adis16204_trigger_handler(int irq, void *p)

{

	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->indio_dev;

	struct adis16204_state *st = iio_priv(indio_dev);

	int i = 0;

	s16 *data;



	data = kmalloc(indio_dev->scan_bytes, GFP_KERNEL);

	if (data == NULL) {

		dev_err(&st->us->dev, "memory alloc failed in ring bh");

		goto done;

	}



	if (!bitmap_empty(indio_dev->active_scan_mask, indio_dev->masklength) &&

	    adis16204_read_ring_data(indio_dev, st->rx) >= 0)

		for (; i < bitmap_weight(indio_dev->active_scan_mask,

					 indio_dev->masklength); i++)

			data[i] = be16_to_cpup((__be16 *)&(st->rx[i*2]));



	/* Guaranteed to be aligned with 8 byte boundary */

	if (indio_dev->scan_timestamp)

		*((s64 *)(data + ((i + 3)/4)*4)) = pf->timestamp;



	iio_push_to_buffers(indio_dev, (u8 *)data);



	kfree(data);

done:

	iio_trigger_notify_done(indio_dev->trig);



	return IRQ_HANDLED;

}



void adis16204_unconfigure_ring(struct iio_dev *indio_dev)

{

	iio_dealloc_pollfunc(indio_dev->pollfunc);

	iio_sw_rb_free(indio_dev->buffer);

}



static const struct iio_buffer_setup_ops adis16204_ring_setup_ops = {

	.preenable = &iio_sw_buffer_preenable,

	.postenable = &iio_triggered_buffer_postenable,

	.predisable = &iio_triggered_buffer_predisable,

};



int adis16204_configure_ring(struct iio_dev *indio_dev)

{

	int ret = 0;

	struct iio_buffer *ring;



	ring = iio_sw_rb_allocate(indio_dev);

	if (!ring) {

		ret = -ENOMEM;

		return ret;

	}

	indio_dev->buffer = ring;

	ring->scan_timestamp = true;

	indio_dev->setup_ops = &adis16204_ring_setup_ops;



	indio_dev->pollfunc = iio_alloc_pollfunc(&iio_pollfunc_store_time,

						 &adis16204_trigger_handler,

						 IRQF_ONESHOT,

						 indio_dev,

						 "%s_consumer%d",

						 indio_dev->name,

						 indio_dev->id);

	if (indio_dev->pollfunc == NULL) {

		ret = -ENOMEM;

		goto error_iio_sw_rb_free;

	}



	indio_dev->modes |= INDIO_BUFFER_TRIGGERED;

	return 0;



error_iio_sw_rb_free:

	iio_sw_rb_free(indio_dev->buffer);

	return ret;

}