On 08/07/10 05:44, Mike Frysinger wrote:
> From: Barry Song <barry.song@xxxxxxxxxx>
>
> IIO driver for dual Axis Accelerometer/inclinometer adis16201 parts.
>
> Signed-off-by: Barry Song <barry.song@xxxxxxxxxx>
> Signed-off-by: Mike Frysinger <vapier@xxxxxxxxxx>
Hi Mike and Barry,
Thanks for this set.
Please run check-patch on these. Quite a few over length
lines.
Whilst the driver will benefit from some of the helper funcs
introduced recently, with the abi fix up it is fine to merge
now, so subject to that:
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
Obviously feel free to fix the over long line issues, but they
don't stop a merge into the staging tree...
> ---
> drivers/staging/iio/accel/Kconfig | 9 +
> drivers/staging/iio/accel/Makefile | 4 +
> drivers/staging/iio/accel/adis16201.h | 152 ++++++
> drivers/staging/iio/accel/adis16201_core.c | 641 +++++++++++++++++++++++++
> drivers/staging/iio/accel/adis16201_ring.c | 260 ++++++++++
> drivers/staging/iio/accel/adis16201_trigger.c | 124 +++++
> 6 files changed, 1190 insertions(+), 0 deletions(-)
> create mode 100644 drivers/staging/iio/accel/adis16201.h
> create mode 100644 drivers/staging/iio/accel/adis16201_core.c
> create mode 100644 drivers/staging/iio/accel/adis16201_ring.c
> create mode 100644 drivers/staging/iio/accel/adis16201_trigger.c
>
> diff --git a/drivers/staging/iio/accel/Kconfig b/drivers/staging/iio/accel/Kconfig
> index 5926c03..0b87557 100644
> --- a/drivers/staging/iio/accel/Kconfig
> +++ b/drivers/staging/iio/accel/Kconfig
> @@ -3,6 +3,15 @@
> #
> comment "Accelerometers"
>
> +config ADIS16201
> + tristate "Analog Devices ADIS16201 Dual-Axis Digital Inclinometer and Accelerometer"
> + depends on SPI
> + select IIO_TRIGGER if IIO_RING_BUFFER
> + select IIO_SW_RING if IIO_RING_BUFFER
> + help
> + Say yes here to build support for Analog Devices adis16201 dual-axis
> + digital inclinometer and accelerometer.
> +
> config ADIS16209
> tristate "Analog Devices ADIS16209 Dual-Axis Digital Inclinometer and Accelerometer"
> depends on SPI
> diff --git a/drivers/staging/iio/accel/Makefile b/drivers/staging/iio/accel/Makefile
> index ff84703..4a22a01 100644
> --- a/drivers/staging/iio/accel/Makefile
> +++ b/drivers/staging/iio/accel/Makefile
> @@ -2,6 +2,10 @@
> # Makefile for industrial I/O accelerometer drivers
> #
>
> +adis16201-y := adis16201_core.o
> +adis16201-$(CONFIG_IIO_RING_BUFFER) += adis16201_ring.o adis16201_trigger.o
> +obj-$(CONFIG_ADIS16201) += adis16201.o
> +
> adis16209-y := adis16209_core.o
> adis16209-$(CONFIG_IIO_RING_BUFFER) += adis16209_ring.o adis16209_trigger.o
> obj-$(CONFIG_ADIS16209) += adis16209.o
> diff --git a/drivers/staging/iio/accel/adis16201.h b/drivers/staging/iio/accel/adis16201.h
> new file mode 100644
> index 0000000..97f687d
> --- /dev/null
> +++ b/drivers/staging/iio/accel/adis16201.h
> @@ -0,0 +1,152 @@
> +#ifndef SPI_ADIS16201_H_
> +#define SPI_ADIS16201_H_
> +
> +#define ADIS16201_STARTUP_DELAY 220 /* ms */
> +
> +#define ADIS16201_READ_REG(a) a
> +#define ADIS16201_WRITE_REG(a) ((a) | 0x80)
> +
> +#define ADIS16201_FLASH_CNT 0x00 /* Flash memory write count */
> +#define ADIS16201_SUPPLY_OUT 0x02 /* Output, power supply */
> +#define ADIS16201_XACCL_OUT 0x04 /* Output, x-axis accelerometer */
> +#define ADIS16201_YACCL_OUT 0x06 /* Output, y-axis accelerometer */
> +#define ADIS16201_AUX_ADC 0x08 /* Output, auxiliary ADC input */
> +#define ADIS16201_TEMP_OUT 0x0A /* Output, temperature */
> +#define ADIS16201_XINCL_OUT 0x0C /* Output, x-axis inclination */
> +#define ADIS16201_YINCL_OUT 0x0E /* Output, y-axis inclination */
> +#define ADIS16201_XACCL_OFFS 0x10 /* Calibration, x-axis acceleration offset */
> +#define ADIS16201_YACCL_OFFS 0x12 /* Calibration, y-axis acceleration offset */
> +#define ADIS16201_XACCL_SCALE 0x14 /* x-axis acceleration scale factor */
> +#define ADIS16201_YACCL_SCALE 0x16 /* y-axis acceleration scale factor */
> +#define ADIS16201_XINCL_OFFS 0x18 /* Calibration, x-axis inclination offset */
> +#define ADIS16201_YINCL_OFFS 0x1A /* Calibration, y-axis inclination offset */
> +#define ADIS16201_XINCL_SCALE 0x1C /* x-axis inclination scale factor */
> +#define ADIS16201_YINCL_SCALE 0x1E /* y-axis inclination scale factor */
> +#define ADIS16201_ALM_MAG1 0x20 /* Alarm 1 amplitude threshold */
> +#define ADIS16201_ALM_MAG2 0x22 /* Alarm 2 amplitude threshold */
> +#define ADIS16201_ALM_SMPL1 0x24 /* Alarm 1, sample period */
> +#define ADIS16201_ALM_SMPL2 0x26 /* Alarm 2, sample period */
> +#define ADIS16201_ALM_CTRL 0x28 /* Alarm control */
> +#define ADIS16201_AUX_DAC 0x30 /* Auxiliary DAC data */
> +#define ADIS16201_GPIO_CTRL 0x32 /* General-purpose digital input/output control */
> +#define ADIS16201_MSC_CTRL 0x34 /* Miscellaneous control */
> +#define ADIS16201_SMPL_PRD 0x36 /* Internal sample period (rate) control */
> +#define ADIS16201_AVG_CNT 0x38 /* Operation, filter configuration */
> +#define ADIS16201_SLP_CNT 0x3A /* Operation, sleep mode control */
> +#define ADIS16201_DIAG_STAT 0x3C /* Diagnostics, system status register */
> +#define ADIS16201_GLOB_CMD 0x3E /* Operation, system command register */
> +
> +#define ADIS16201_OUTPUTS 7
> +
> +/* MSC_CTRL */
> +#define ADIS16201_MSC_CTRL_SELF_TEST_EN (1 << 8) /* Self-test enable */
> +#define ADIS16201_MSC_CTRL_DATA_RDY_EN (1 << 2) /* Data-ready enable: 1 = enabled, 0 = disabled */
> +#define ADIS16201_MSC_CTRL_ACTIVE_HIGH (1 << 1) /* Data-ready polarity: 1 = active high, 0 = active low */
> +#define ADIS16201_MSC_CTRL_DATA_RDY_DIO1 (1 << 0) /* Data-ready line selection: 1 = DIO1, 0 = DIO0 */
> +
> +/* DIAG_STAT */
> +#define ADIS16201_DIAG_STAT_ALARM2 (1<<9) /* Alarm 2 status: 1 = alarm active, 0 = alarm inactive */
> +#define ADIS16201_DIAG_STAT_ALARM1 (1<<8) /* Alarm 1 status: 1 = alarm active, 0 = alarm inactive */
> +#define ADIS16201_DIAG_STAT_SPI_FAIL (1<<3) /* SPI communications failure */
> +#define ADIS16201_DIAG_STAT_FLASH_UPT (1<<2) /* Flash update failure */
> +#define ADIS16201_DIAG_STAT_POWER_HIGH (1<<1) /* Power supply above 3.625 V */
> +#define ADIS16201_DIAG_STAT_POWER_LOW (1<<0) /* Power supply below 3.15 V */
> +
> +/* GLOB_CMD */
> +#define ADIS16201_GLOB_CMD_SW_RESET (1<<7)
> +#define ADIS16201_GLOB_CMD_FACTORY_CAL (1<<1)
> +
> +#define ADIS16201_MAX_TX 24
> +#define ADIS16201_MAX_RX 24
> +
> +#define ADIS16201_ERROR_ACTIVE (1<<14)
> +
> +/**
> + * struct adis16201_state - device instance specific data
> + * @us: actual spi_device
> + * @work_trigger_to_ring: bh for triggered event handling
a) This isn't used in the driver
b) It no longer exists anyway
This is removed in the abi fixup patch. It got removed from
the subsystem as a whole because no one was using!
> + * @work_cont_thresh: CLEAN
> + * @inter: used to check if new interrupt has been triggered
> + * @last_timestamp: passing timestamp from th to bh of interrupt handler
> + * @indio_dev: industrial I/O device structure
> + * @trig: data ready trigger registered with iio
> + * @tx: transmit buffer
> + * @rx: recieve buffer
> + * @buf_lock: mutex to protect tx and rx
> + **/
> +struct adis16201_state {
> + struct spi_device *us;
> + struct work_struct work_trigger_to_ring;
> + struct iio_work_cont work_cont_thresh;
> + s64 last_timestamp;
...
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
