* [PATCH v3 0/2] Add ADXL367 driver
@ 2021-12-17 11:45 Cosmin Tanislav
2021-12-17 11:45 ` [PATCH v3 1/2] dt-bindings: iio: accel: add ADXL367 Cosmin Tanislav
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Cosmin Tanislav @ 2021-12-17 11:45 UTC (permalink / raw)
Cc: cosmin.tanislav, demonsingur, Lars-Peter Clausen,
Michael Hennerich, Rob Herring, linux-iio, devicetree,
linux-kernel
The ADXL367 is an ultralow power, 3-axis MEMS accelerometer.
The ADXL367 does not alias input signals to achieve ultralow power
consumption, it samples the full bandwidth of the sensor at all
data rates. Measurement ranges of +-2g, +-4g, and +-8g are available,
with a resolution of 0.25mg/LSB on the +-2 g range.
In addition to its ultralow power consumption, the ADXL367
has many features to enable true system level power reduction.
It includes a deep multimode output FIFO, a built-in micropower
temperature sensor, and an internal ADC for synchronous conversion
of an additional analog input.
V1 -> V2
* add support for vdd and vddio supplies
* lock fifo_watermark retrieval
* fix indentation of sysfs_emit for fifo_mode
* dt-bindings: add spi-max-frequency: true
* dt-bindings: remove cs-gpios property
* dt-bindings: remove status property
* dt-bindings: add support for vdd
V2 -> V3
* MAINTAINERS: use wildcard for adxl367
* dt-bindings: adxl367@addr -> accelerometer@addr
* put asm include after linux includes
* drop registers accessed implicitly
* fifo_full -> fifo_watermark
* print expected device id
* remove INDIO_BUFFER_HARDWARE
* inline ADXL367_EVENT macro
* inline ADXL367_14BIT_SCAN_INFO
* inline regulator enum
* remove of.h in spi driver
* cast const void * to const u8 * in spi read
* switch to trigger-less buffer
* increase reset time as advised by hardware team
* let iio framework validate available channel masks
* enable adc or temp channel automatically on single read
* wait for 100ms after enabling adc or temp for output
to settle on single read (waiting on hardware team input)
* enable adc or temp channel automatically on buffered read
* claim direct mode when setting range
* claim direct mode when setting odr
* claim direct mode when setting event config
* sort status masks in descending bit order
* hardcode indio_dev name
* add some comments regarding spi message layout
* use bulk_write for activity and inactivity threshold
* use bulk_write for inactivity time
* use bool as return type of fifo format finding function
* remove shift from channels scan type
Cosmin Tanislav (2):
dt-bindings: iio: accel: add ADXL367
iio: accel: add ADXL367 driver
.../bindings/iio/accel/adi,adxl367.yaml | 79 +
MAINTAINERS | 8 +
drivers/iio/accel/Kconfig | 27 +
drivers/iio/accel/Makefile | 3 +
drivers/iio/accel/adxl367.c | 1617 +++++++++++++++++
drivers/iio/accel/adxl367.h | 23 +
drivers/iio/accel/adxl367_i2c.c | 89 +
drivers/iio/accel/adxl367_spi.c | 163 ++
8 files changed, 2009 insertions(+)
create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml
create mode 100644 drivers/iio/accel/adxl367.c
create mode 100644 drivers/iio/accel/adxl367.h
create mode 100644 drivers/iio/accel/adxl367_i2c.c
create mode 100644 drivers/iio/accel/adxl367_spi.c
--
2.34.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH v3 1/2] dt-bindings: iio: accel: add ADXL367 2021-12-17 11:45 [PATCH v3 0/2] Add ADXL367 driver Cosmin Tanislav @ 2021-12-17 11:45 ` Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 2/2] iio: accel: add ADXL367 driver Cosmin Tanislav 2021-12-17 13:48 ` [PATCH v3 0/2] Add " Cosmin Tanislav 2 siblings, 0 replies; 11+ messages in thread From: Cosmin Tanislav @ 2021-12-17 11:45 UTC (permalink / raw) Cc: cosmin.tanislav, demonsingur, Lars-Peter Clausen, Michael Hennerich, Rob Herring, linux-iio, devicetree, linux-kernel, Rob Herring The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. The ADXL367 does not alias input signals to achieve ultralow power consumption, it samples the full bandwidth of the sensor at all data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, with a resolution of 0.25mg/LSB on the +-2 g range. In addition to its ultralow power consumption, the ADXL367 has many features to enable true system level power reduction. It includes a deep multimode output FIFO, a built-in micropower temperature sensor, and an internal ADC for synchronous conversion of an additional analog input. Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com> Reviewed-by: Rob Herring <robh@kernel.org> --- .../bindings/iio/accel/adi,adxl367.yaml | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml diff --git a/Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml b/Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml new file mode 100644 index 000000000000..d259e796c1d6 --- /dev/null +++ b/Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml @@ -0,0 +1,79 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/iio/accel/adi,adxl367.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Analog Devices ADXL367 3-Axis Digital Accelerometer + +maintainers: + - Cosmin Tanislav <cosmin.tanislav@analog.com> + +description: | + The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. + + The ADXL367 does not alias input signals by to achieve ultralow power + consumption, it samples the full bandwidth of the sensor at all + data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, + with a resolution of 0.25mg/LSB on the +-2 g range. + + In addition to its ultralow power consumption, the ADXL367 + has many features to enable true system level power reduction. + It includes a deep multimode output FIFO, a built-in micropower + temperature sensor, and an internal ADC for synchronous conversion + of an additional analog input. + https://www.analog.com/en/products/adxl367.html + +properties: + compatible: + enum: + - adi,adxl367 + + reg: + maxItems: 1 + + interrupts: + maxItems: 1 + + spi-max-frequency: true + + vdd-supply: true + vddio-supply: true + +required: + - compatible + - reg + - interrupts + +additionalProperties: false + +examples: + - | + #include <dt-bindings/interrupt-controller/irq.h> + + i2c { + #address-cells = <1>; + #size-cells = <0>; + + accelerometer@53 { + compatible = "adi,adxl367"; + reg = <0x53>; + interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; + }; + }; + - | + #include <dt-bindings/interrupt-controller/irq.h> + + spi { + #address-cells = <1>; + #size-cells = <0>; + + accelerometer@0 { + compatible = "adi,adxl367"; + reg = <0>; + spi-max-frequency = <1000000>; + interrupt-parent = <&gpio>; + interrupts = <25 IRQ_TYPE_EDGE_RISING>; + }; + }; -- 2.34.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-17 11:45 [PATCH v3 0/2] Add ADXL367 driver Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 1/2] dt-bindings: iio: accel: add ADXL367 Cosmin Tanislav @ 2021-12-17 11:45 ` Cosmin Tanislav 2021-12-17 16:29 ` kernel test robot 2021-12-23 13:01 ` Jonathan Cameron 2021-12-17 13:48 ` [PATCH v3 0/2] Add " Cosmin Tanislav 2 siblings, 2 replies; 11+ messages in thread From: Cosmin Tanislav @ 2021-12-17 11:45 UTC (permalink / raw) Cc: cosmin.tanislav, demonsingur, Lars-Peter Clausen, Michael Hennerich, Rob Herring, linux-iio, devicetree, linux-kernel The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. The ADXL367 does not alias input signals to achieve ultralow power consumption, it samples the full bandwidth of the sensor at all data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, with a resolution of 0.25mg/LSB on the +-2 g range. In addition to its ultralow power consumption, the ADXL367 has many features to enable true system level power reduction. It includes a deep multimode output FIFO, a built-in micropower temperature sensor, and an internal ADC for synchronous conversion of an additional analog input. Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com> --- MAINTAINERS | 8 + drivers/iio/accel/Kconfig | 27 + drivers/iio/accel/Makefile | 3 + drivers/iio/accel/adxl367.c | 1617 +++++++++++++++++++++++++++++++ drivers/iio/accel/adxl367.h | 23 + drivers/iio/accel/adxl367_i2c.c | 89 ++ drivers/iio/accel/adxl367_spi.c | 163 ++++ 7 files changed, 1930 insertions(+) create mode 100644 drivers/iio/accel/adxl367.c create mode 100644 drivers/iio/accel/adxl367.h create mode 100644 drivers/iio/accel/adxl367_i2c.c create mode 100644 drivers/iio/accel/adxl367_spi.c diff --git a/MAINTAINERS b/MAINTAINERS index 57fb0f19ee08..0b47781833d5 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -605,6 +605,14 @@ F: drivers/iio/accel/adxl355_core.c F: drivers/iio/accel/adxl355_i2c.c F: drivers/iio/accel/adxl355_spi.c +ADXL367 THREE-AXIS DIGITAL ACCELEROMETER DRIVER +M: Cosmin Tanislav <cosmin.tanislav@analog.com> +L: linux-iio@vger.kernel.org +S: Supported +W: http://ez.analog.com/community/linux-device-drivers +F: Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml +F: drivers/iio/accel/adxl367* + ADXL372 THREE-AXIS DIGITAL ACCELEROMETER DRIVER M: Michael Hennerich <michael.hennerich@analog.com> S: Supported diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 49587c992a6d..18dd21692739 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -123,6 +123,33 @@ config ADXL355_SPI will be called adxl355_spi and you will also get adxl355_core for the core module. +config ADXL367 + tristate + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + +config ADXL367_SPI + tristate "Analog Devices ADXL367 3-Axis Accelerometer SPI Driver" + depends on SPI + select ADXL367 + select REGMAP_SPI + help + Say yes here to add support for the Analog Devices ADXL367 triaxial + acceleration sensor. + To compile this driver as a module, choose M here: the + module will be called adxl367_spi. + +config ADXL367_I2C + tristate "Analog Devices ADXL367 3-Axis Accelerometer I2C Driver" + depends on I2C + select ADXL367 + select REGMAP_I2C + help + Say yes here to add support for the Analog Devices ADXL367 triaxial + acceleration sensor. + To compile this driver as a module, choose M here: the + module will be called adxl367_i2c. + config ADXL372 tristate select IIO_BUFFER diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile index d03e2f6bba08..4d8792668838 100644 --- a/drivers/iio/accel/Makefile +++ b/drivers/iio/accel/Makefile @@ -15,6 +15,9 @@ obj-$(CONFIG_ADXL345_SPI) += adxl345_spi.o obj-$(CONFIG_ADXL355) += adxl355_core.o obj-$(CONFIG_ADXL355_I2C) += adxl355_i2c.o obj-$(CONFIG_ADXL355_SPI) += adxl355_spi.o +obj-$(CONFIG_ADXL367) += adxl367.o +obj-$(CONFIG_ADXL367_I2C) += adxl367_i2c.o +obj-$(CONFIG_ADXL367_SPI) += adxl367_spi.o obj-$(CONFIG_ADXL372) += adxl372.o obj-$(CONFIG_ADXL372_I2C) += adxl372_i2c.o obj-$(CONFIG_ADXL372_SPI) += adxl372_spi.o diff --git a/drivers/iio/accel/adxl367.c b/drivers/iio/accel/adxl367.c new file mode 100644 index 000000000000..ce574f0446eb --- /dev/null +++ b/drivers/iio/accel/adxl367.c @@ -0,0 +1,1617 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Analog Devices, Inc. + * Author: Cosmin Tanislav <cosmin.tanislav@analog.com> + */ + +#include <linux/bitfield.h> +#include <linux/bitops.h> +#include <linux/iio/buffer.h> +#include <linux/iio/events.h> +#include <linux/iio/iio.h> +#include <linux/iio/kfifo_buf.h> +#include <linux/iio/sysfs.h> +#include <linux/interrupt.h> +#include <linux/irq.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/regulator/consumer.h> +#include <asm/unaligned.h> + +#include "adxl367.h" + +#define ADXL367_REG_DEVID 0x00 +#define ADXL367_DEVID_AD 0xAD + +#define ADXL367_REG_STATUS 0x0B +#define ADXL367_STATUS_INACT_MASK BIT(5) +#define ADXL367_STATUS_ACT_MASK BIT(4) +#define ADXL367_STATUS_FIFO_FULL_MASK BIT(2) + +#define ADXL367_FIFO_ENT_H_MASK GENMASK(1, 0) + +#define ADXL367_REG_X_DATA_H 0x0E +#define ADXL367_REG_Y_DATA_H 0x10 +#define ADXL367_REG_Z_DATA_H 0x12 +#define ADXL367_REG_TEMP_DATA_H 0x14 +#define ADXL367_REG_EX_ADC_DATA_H 0x16 + +#define ADXL367_TEMP_25C 165 +#define ADXL367_TEMP_PER_C 54 + +#define ADXL367_VOLTAGE_OFFSET 8192 +#define ADXL367_VOLTAGE_MAX_MV 1000 +#define ADXL367_VOLTAGE_MAX_RAW GENMASK(13, 0) + +#define ADXL367_REG_RESET 0x1F +#define ADXL367_RESET_CODE 0x52 + +#define ADXL367_REG_THRESH_ACT_H 0x20 +#define ADXL367_REG_THRESH_INACT_H 0x23 +#define ADXL367_THRESH_MAX GENMASK(12, 0) +#define ADXL367_THRESH_VAL_H_MASK GENMASK(12, 6) +#define ADXL367_THRESH_H_MASK GENMASK(6, 0) +#define ADXL367_THRESH_VAL_L_MASK GENMASK(5, 0) +#define ADXL367_THRESH_L_MASK GENMASK(7, 2) + +#define ADXL367_REG_TIME_ACT 0x22 +#define ADXL367_REG_TIME_INACT_H 0x25 +#define ADXL367_TIME_ACT_MAX GENMASK(7, 0) +#define ADXL367_TIME_INACT_MAX GENMASK(15, 0) +#define ADXL367_TIME_INACT_VAL_H_MASK GENMASK(15, 8) +#define ADXL367_TIME_INACT_H_MASK GENMASK(7, 0) +#define ADXL367_TIME_INACT_VAL_L_MASK GENMASK(7, 0) +#define ADXL367_TIME_INACT_L_MASK GENMASK(7, 0) + +#define ADXL367_REG_ACT_INACT_CTL 0x27 +#define ADXL367_ACT_EN_MASK GENMASK(1, 0) +#define ADXL367_ACT_LINKLOOP_MASK GENMASK(5, 4) + +#define ADXL367_REG_FIFO_CTL 0x28 +#define ADXL367_FIFO_CTL_FORMAT_MASK GENMASK(6, 3) +#define ADXL367_FIFO_CTL_MODE_MASK GENMASK(1, 0) + +#define ADXL367_REG_FIFO_SAMPLES 0x29 +#define ADXL367_FIFO_SIZE 512 +#define ADXL367_FIFO_MAX_WATERMARK 511 + +#define ADXL367_SAMPLES_VAL_H_MASK BIT(8) +#define ADXL367_SAMPLES_H_MASK BIT(2) +#define ADXL367_SAMPLES_VAL_L_MASK GENMASK(7, 0) +#define ADXL367_SAMPLES_L_MASK GENMASK(7, 0) + +#define ADXL367_REG_INT1_MAP 0x2A +#define ADXL367_INT_INACT_MASK BIT(5) +#define ADXL367_INT_ACT_MASK BIT(4) +#define ADXL367_INT_FIFO_WATERMARK_MASK BIT(2) + +#define ADXL367_REG_FILTER_CTL 0x2C +#define ADXL367_FILTER_CTL_RANGE_MASK GENMASK(7, 6) +#define ADXL367_2G_RANGE_1G 4095 +#define ADXL367_2G_RANGE_100MG 409 +#define ADXL367_FILTER_CTL_ODR_MASK GENMASK(2, 0) + +#define ADXL367_REG_POWER_CTL 0x2D +#define ADXL367_POWER_CTL_MODE_MASK GENMASK(1, 0) + +#define ADXL367_REG_ADC_CTL 0x3C +#define ADXL367_REG_TEMP_CTL 0x3D +#define ADXL367_ADC_EN_MASK BIT(0) + +enum adxl367_range { + ADXL367_2G_RANGE, + ADXL367_4G_RANGE, + ADXL367_8G_RANGE, +}; + +enum adxl367_fifo_mode { + ADXL367_FIFO_MODE_DISABLED = 0b00, + ADXL367_FIFO_MODE_STREAM = 0b10, +}; + +enum adxl367_fifo_format { + ADXL367_FIFO_FORMAT_XYZ, + ADXL367_FIFO_FORMAT_X, + ADXL367_FIFO_FORMAT_Y, + ADXL367_FIFO_FORMAT_Z, + ADXL367_FIFO_FORMAT_XYZT, + ADXL367_FIFO_FORMAT_XT, + ADXL367_FIFO_FORMAT_YT, + ADXL367_FIFO_FORMAT_ZT, + ADXL367_FIFO_FORMAT_XYZA, + ADXL367_FIFO_FORMAT_XA, + ADXL367_FIFO_FORMAT_YA, + ADXL367_FIFO_FORMAT_ZA, +}; + +enum adxl367_op_mode { + ADXL367_OP_STANDBY = 0b00, + ADXL367_OP_MEASURE = 0b10, +}; + +enum adxl367_act_proc_mode { + ADXL367_LOOPED = 0b11, +}; + +enum adxl367_act_en_mode { + ADXL367_ACT_DISABLED = 0b00, + ADCL367_ACT_REF_ENABLED = 0b11, +}; + +enum adxl367_activity_type { + ADXL367_ACTIVITY, + ADXL367_INACTIVITY, +}; + +enum adxl367_odr { + ADXL367_ODR_12P5HZ, + ADXL367_ODR_25HZ, + ADXL367_ODR_50HZ, + ADXL367_ODR_100HZ, + ADXL367_ODR_200HZ, + ADXL367_ODR_400HZ, +}; + +struct adxl367_state { + const struct adxl367_ops *ops; + void *context; + + struct device *dev; + struct regmap *regmap; + + struct regulator_bulk_data regulators[2]; + + /* + * Synchronize access to members of driver state, and ensure atomicity + * of consecutive regmap operations. + */ + struct mutex lock; + + enum adxl367_odr odr; + enum adxl367_range range; + + unsigned int act_threshold; + unsigned int act_time_ms; + unsigned int inact_threshold; + unsigned int inact_time_ms; + + unsigned int fifo_set_size; + unsigned int fifo_watermark; + + __be16 fifo_buf[ADXL367_FIFO_SIZE] ____cacheline_aligned; + __be16 sample_buf; + u8 act_threshold_buf[2]; + u8 inact_time_buf[2]; + u8 status_buf[3]; +}; + +static const unsigned int adxl367_threshold_h_reg_tbl[] = { + [ADXL367_ACTIVITY] = ADXL367_REG_THRESH_ACT_H, + [ADXL367_INACTIVITY] = ADXL367_REG_THRESH_INACT_H, +}; + +static const unsigned int adxl367_act_en_shift_tbl[] = { + [ADXL367_ACTIVITY] = 0, + [ADXL367_INACTIVITY] = 2, +}; + +static const unsigned int adxl367_act_int_mask_tbl[] = { + [ADXL367_ACTIVITY] = ADXL367_INT_ACT_MASK, + [ADXL367_INACTIVITY] = ADXL367_INT_INACT_MASK, +}; + +static const int adxl367_samp_freq_tbl[][2] = { + [ADXL367_ODR_12P5HZ] = {12, 500000}, + [ADXL367_ODR_25HZ] = {25, 0}, + [ADXL367_ODR_50HZ] = {50, 0}, + [ADXL367_ODR_100HZ] = {100, 0}, + [ADXL367_ODR_200HZ] = {200, 0}, + [ADXL367_ODR_400HZ] = {400, 0}, +}; + +static const int adxl367_time_scale_tbl[] = { + [ADXL367_ODR_12P5HZ] = 1, + [ADXL367_ODR_25HZ] = 2, + [ADXL367_ODR_50HZ] = 4, + [ADXL367_ODR_100HZ] = 8, + [ADXL367_ODR_200HZ] = 16, + [ADXL367_ODR_400HZ] = 32, +}; + +/* (g * 2) * 9.80665 * 1000000 / (2^14 - 1) */ +static const int adxl367_range_scale_tbl[][2] = { + [ADXL367_2G_RANGE] = {0, 2394347}, + [ADXL367_4G_RANGE] = {0, 4788695}, + [ADXL367_8G_RANGE] = {0, 9577391}, +}; + +static const int adxl367_range_scale_factor_tbl[] = { + [ADXL367_2G_RANGE] = 1, + [ADXL367_4G_RANGE] = 2, + [ADXL367_8G_RANGE] = 4, +}; + +enum { + ADXL367_X_CHANNEL_INDEX, + ADXL367_Y_CHANNEL_INDEX, + ADXL367_Z_CHANNEL_INDEX, + ADXL367_TEMP_CHANNEL_INDEX, + ADXL367_EX_ADC_CHANNEL_INDEX +}; + +#define ADXL367_X_CHANNEL_MASK BIT(ADXL367_X_CHANNEL_INDEX) +#define ADXL367_Y_CHANNEL_MASK BIT(ADXL367_Y_CHANNEL_INDEX) +#define ADXL367_Z_CHANNEL_MASK BIT(ADXL367_Z_CHANNEL_INDEX) +#define ADXL367_TEMP_CHANNEL_MASK BIT(ADXL367_TEMP_CHANNEL_INDEX) +#define ADXL367_EX_ADC_CHANNEL_MASK BIT(ADXL367_EX_ADC_CHANNEL_INDEX) + +static const unsigned long adxl367_channel_masks[] = { + [ADXL367_FIFO_FORMAT_XYZ] = ADXL367_X_CHANNEL_MASK + | ADXL367_Y_CHANNEL_MASK + | ADXL367_Z_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_X] = ADXL367_X_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_Y] = ADXL367_Y_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_Z] = ADXL367_Z_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_XYZT] = ADXL367_X_CHANNEL_MASK + | ADXL367_Y_CHANNEL_MASK + | ADXL367_Z_CHANNEL_MASK + | ADXL367_TEMP_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_XT] = ADXL367_X_CHANNEL_MASK + | ADXL367_TEMP_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_YT] = ADXL367_Y_CHANNEL_MASK + | ADXL367_TEMP_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_ZT] = ADXL367_Z_CHANNEL_MASK + | ADXL367_TEMP_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_XYZA] = ADXL367_X_CHANNEL_MASK + | ADXL367_Y_CHANNEL_MASK + | ADXL367_Z_CHANNEL_MASK + | ADXL367_EX_ADC_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_XA] = ADXL367_X_CHANNEL_MASK + | ADXL367_EX_ADC_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_YA] = ADXL367_Y_CHANNEL_MASK + | ADXL367_EX_ADC_CHANNEL_MASK, + [ADXL367_FIFO_FORMAT_ZA] = ADXL367_Z_CHANNEL_MASK + | ADXL367_EX_ADC_CHANNEL_MASK, + 0, +}; + +static int adxl367_set_measure_en(struct adxl367_state *st, bool en) +{ + enum adxl367_op_mode op_mode = en ? ADXL367_OP_MEASURE + : ADXL367_OP_STANDBY; + int ret; + + ret = regmap_update_bits(st->regmap, ADXL367_REG_POWER_CTL, + ADXL367_POWER_CTL_MODE_MASK, + FIELD_PREP(ADXL367_POWER_CTL_MODE_MASK, + op_mode)); + if (ret) + return ret; + + /* + * Wait for acceleration output to settle after entering + * measure mode. + */ + if (en) + msleep(100); + + return 0; +} + +static void adxl367_scale_act_thresholds(struct adxl367_state *st, + enum adxl367_range old_range, + enum adxl367_range new_range) +{ + st->act_threshold = st->act_threshold + * adxl367_range_scale_factor_tbl[old_range] + / adxl367_range_scale_factor_tbl[new_range]; + st->inact_threshold = st->inact_threshold + * adxl367_range_scale_factor_tbl[old_range] + / adxl367_range_scale_factor_tbl[new_range]; +} + +static int _adxl367_set_act_threshold(struct adxl367_state *st, + enum adxl367_activity_type act, + unsigned int threshold) +{ + u8 reg = adxl367_threshold_h_reg_tbl[act]; + int ret; + + if (threshold > ADXL367_THRESH_MAX) + return -EINVAL; + + st->act_threshold_buf[0] = FIELD_PREP(ADXL367_THRESH_H_MASK, + FIELD_GET(ADXL367_THRESH_VAL_H_MASK, + threshold)); + st->act_threshold_buf[1] = FIELD_PREP(ADXL367_THRESH_L_MASK, + FIELD_GET(ADXL367_THRESH_VAL_L_MASK, + threshold)); + + ret = regmap_bulk_write(st->regmap, reg, st->act_threshold_buf, + sizeof(st->act_threshold_buf)); + if (ret) + return ret; + + if (act == ADXL367_ACTIVITY) + st->act_threshold = threshold; + else + st->inact_threshold = threshold; + + return 0; +} + +static int adxl367_set_act_threshold(struct adxl367_state *st, + enum adxl367_activity_type act, + unsigned int threshold) +{ + int ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = _adxl367_set_act_threshold(st, act, threshold); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static int adxl367_set_act_proc_mode(struct adxl367_state *st, + enum adxl367_act_proc_mode mode) +{ + return regmap_update_bits(st->regmap, ADXL367_REG_ACT_INACT_CTL, + ADXL367_ACT_LINKLOOP_MASK, + FIELD_PREP(ADXL367_ACT_LINKLOOP_MASK, + mode)); +} + +static int adxl367_set_act_interrupt_en(struct adxl367_state *st, + enum adxl367_activity_type act, + bool en) +{ + unsigned int mask = adxl367_act_int_mask_tbl[act]; + + return regmap_update_bits(st->regmap, ADXL367_REG_INT1_MAP, + mask, en ? mask : 0); +} + +static int adxl367_get_act_interrupt_en(struct adxl367_state *st, + enum adxl367_activity_type act, + bool *en) +{ + unsigned int mask = adxl367_act_int_mask_tbl[act]; + unsigned int val; + int ret; + + ret = regmap_read(st->regmap, ADXL367_REG_INT1_MAP, &val); + if (ret) + return ret; + + *en = !!(val & mask); + + return 0; +} + +static int adxl367_set_act_en(struct adxl367_state *st, + enum adxl367_activity_type act, + enum adxl367_act_en_mode en) +{ + unsigned int ctl_shift = adxl367_act_en_shift_tbl[act]; + + return regmap_update_bits(st->regmap, ADXL367_REG_ACT_INACT_CTL, + ADXL367_ACT_EN_MASK << ctl_shift, + en << ctl_shift); +} + +static int adxl367_set_fifo_watermark_interrupt_en(struct adxl367_state *st, + bool en) +{ + return regmap_update_bits(st->regmap, ADXL367_REG_INT1_MAP, + ADXL367_INT_FIFO_WATERMARK_MASK, + en ? ADXL367_INT_FIFO_WATERMARK_MASK : 0); +} + +static int adxl367_get_fifo_mode(struct adxl367_state *st, + enum adxl367_fifo_mode *fifo_mode) +{ + unsigned int val; + int ret; + + ret = regmap_read(st->regmap, ADXL367_REG_FIFO_CTL, &val); + if (ret) + return ret; + + *fifo_mode = FIELD_GET(ADXL367_FIFO_CTL_MODE_MASK, val); + + return 0; +} + +static int adxl367_set_fifo_mode(struct adxl367_state *st, + enum adxl367_fifo_mode fifo_mode) +{ + return regmap_update_bits(st->regmap, ADXL367_REG_FIFO_CTL, + ADXL367_FIFO_CTL_MODE_MASK, + FIELD_PREP(ADXL367_FIFO_CTL_MODE_MASK, + fifo_mode)); +} + +static int adxl367_set_fifo_format(struct adxl367_state *st, + enum adxl367_fifo_format fifo_format) +{ + return regmap_update_bits(st->regmap, ADXL367_REG_FIFO_CTL, + ADXL367_FIFO_CTL_FORMAT_MASK, + FIELD_PREP(ADXL367_FIFO_CTL_FORMAT_MASK, + fifo_format)); +} + +static int adxl367_set_fifo_samples(struct adxl367_state *st, + unsigned int fifo_watermark, + unsigned int fifo_set_size) +{ + unsigned int fifo_samples = fifo_watermark * fifo_set_size; + unsigned int fifo_samples_h, fifo_samples_l; + int ret; + + if (fifo_samples > ADXL367_FIFO_MAX_WATERMARK) + fifo_samples = ADXL367_FIFO_MAX_WATERMARK; + + if (fifo_set_size == 0) + return 0; + + fifo_samples /= fifo_set_size; + + fifo_samples_h = FIELD_PREP(ADXL367_SAMPLES_H_MASK, + FIELD_GET(ADXL367_SAMPLES_VAL_H_MASK, + fifo_samples)); + fifo_samples_l = FIELD_PREP(ADXL367_SAMPLES_L_MASK, + FIELD_GET(ADXL367_SAMPLES_VAL_L_MASK, + fifo_samples)); + + ret = regmap_update_bits(st->regmap, ADXL367_REG_FIFO_CTL, + ADXL367_SAMPLES_H_MASK, fifo_samples_h); + if (ret) + return ret; + + return regmap_update_bits(st->regmap, ADXL367_REG_FIFO_SAMPLES, + ADXL367_SAMPLES_L_MASK, fifo_samples_l); +} + +static int adxl367_set_fifo_set_size(struct adxl367_state *st, + unsigned int fifo_set_size) +{ + int ret; + + ret = adxl367_set_fifo_samples(st, st->fifo_watermark, fifo_set_size); + if (ret) + return ret; + + st->fifo_set_size = fifo_set_size; + + return 0; +} + +static int adxl367_set_fifo_watermark(struct adxl367_state *st, + unsigned int fifo_watermark) +{ + int ret; + + ret = adxl367_set_fifo_samples(st, fifo_watermark, st->fifo_set_size); + if (ret) + return ret; + + st->fifo_watermark = fifo_watermark; + + return 0; +} + +static int adxl367_set_range(struct iio_dev *indio_dev, + enum adxl367_range range) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = regmap_update_bits(st->regmap, ADXL367_REG_FILTER_CTL, + ADXL367_FILTER_CTL_RANGE_MASK, + FIELD_PREP(ADXL367_FILTER_CTL_RANGE_MASK, + range)); + if (ret) + goto out; + + adxl367_scale_act_thresholds(st, st->range, range); + + /* Activity thresholds depend on range */ + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, + st->act_threshold); + if (ret) + goto out; + + ret = _adxl367_set_act_threshold(st, ADXL367_INACTIVITY, + st->inact_threshold); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + if (ret) + goto out; + + st->range = range; + +out: + mutex_unlock(&st->lock); + + iio_device_release_direct_mode(indio_dev); + + return ret; +} + +static int adxl367_time_ms_to_samples(struct adxl367_state *st, unsigned int ms) +{ + int freq_hz = adxl367_samp_freq_tbl[st->odr][0]; + int freq_microhz = adxl367_samp_freq_tbl[st->odr][1]; + /* Scale to decihertz to prevent precision loss in 12.5Hz case. */ + int freq_dhz = freq_hz * 10 + freq_microhz / 100000; + + return DIV_ROUND_CLOSEST(ms * freq_dhz, 10000); +} + +static int _adxl367_set_act_time_ms(struct adxl367_state *st, unsigned int ms) +{ + unsigned int val = adxl367_time_ms_to_samples(st, ms); + int ret; + + if (val > ADXL367_TIME_ACT_MAX) + val = ADXL367_TIME_ACT_MAX; + + ret = regmap_write(st->regmap, ADXL367_REG_TIME_ACT, val); + if (ret) + return ret; + + st->act_time_ms = ms; + + return 0; +} + +static int _adxl367_set_inact_time_ms(struct adxl367_state *st, unsigned int ms) +{ + unsigned int val = adxl367_time_ms_to_samples(st, ms); + int ret; + + if (val > ADXL367_TIME_INACT_MAX) + val = ADXL367_TIME_INACT_MAX; + + st->inact_time_buf[0] = FIELD_PREP(ADXL367_TIME_INACT_H_MASK, + FIELD_GET(ADXL367_TIME_INACT_VAL_H_MASK, + val)); + st->inact_time_buf[1] = FIELD_PREP(ADXL367_TIME_INACT_L_MASK, + FIELD_GET(ADXL367_TIME_INACT_VAL_L_MASK, + val)); + + ret = regmap_bulk_write(st->regmap, ADXL367_REG_TIME_INACT_H, + st->inact_time_buf, sizeof(st->inact_time_buf)); + if (ret) + return ret; + + st->inact_time_ms = ms; + + return 0; +} + +static int adxl367_set_act_time_ms(struct adxl367_state *st, + enum adxl367_activity_type act, + unsigned int ms) +{ + int ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + if (act == ADXL367_ACTIVITY) + ret = _adxl367_set_act_time_ms(st, ms); + else + ret = _adxl367_set_inact_time_ms(st, ms); + + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static int _adxl367_set_odr(struct adxl367_state *st, enum adxl367_odr odr) +{ + int ret; + + ret = regmap_update_bits(st->regmap, ADXL367_REG_FILTER_CTL, + ADXL367_FILTER_CTL_ODR_MASK, + FIELD_PREP(ADXL367_FILTER_CTL_ODR_MASK, + odr)); + if (ret) + return ret; + + /* Activity timers depend on ODR */ + ret = _adxl367_set_act_time_ms(st, st->act_time_ms); + if (ret) + return ret; + + ret = _adxl367_set_inact_time_ms(st, st->inact_time_ms); + if (ret) + return ret; + + st->odr = odr; + + return 0; +} + +static int adxl367_set_odr(struct iio_dev *indio_dev, enum adxl367_odr odr) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = _adxl367_set_odr(st, odr); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + iio_device_release_direct_mode(indio_dev); + + return ret; +} + +static int adxl367_set_temp_adc_en(struct adxl367_state *st, unsigned int reg, + bool en) +{ + return regmap_update_bits(st->regmap, reg, ADXL367_ADC_EN_MASK, + en ? ADXL367_ADC_EN_MASK : 0); +} + +static int adxl367_set_temp_adc_reg_en(struct adxl367_state *st, + unsigned int reg, bool en) +{ + int ret; + + switch (reg) { + case ADXL367_REG_TEMP_DATA_H: + ret = adxl367_set_temp_adc_en(st, ADXL367_REG_TEMP_CTL, en); + break; + case ADXL367_REG_EX_ADC_DATA_H: + ret = adxl367_set_temp_adc_en(st, ADXL367_REG_ADC_CTL, en); + break; + default: + return 0; + } + + if (ret) + return ret; + + if (en) + msleep(100); + + return 0; +} + +static int adxl367_set_temp_adc_mask_en(struct adxl367_state *st, + const unsigned long *active_scan_mask, + bool en) +{ + if (*active_scan_mask & ADXL367_TEMP_CHANNEL_MASK) + return adxl367_set_temp_adc_en(st, ADXL367_REG_TEMP_CTL, en); + else if (*active_scan_mask & ADXL367_EX_ADC_CHANNEL_MASK) + return adxl367_set_temp_adc_en(st, ADXL367_REG_ADC_CTL, en); + + return 0; +} + +static int adxl367_find_odr(struct adxl367_state *st, int val, int val2, + enum adxl367_odr *odr) +{ + size_t size = ARRAY_SIZE(adxl367_samp_freq_tbl); + int i; + + for (i = 0; i < size; i++) + if (val == adxl367_samp_freq_tbl[i][0] && + val2 == adxl367_samp_freq_tbl[i][1]) + break; + + if (i == size) + return -EINVAL; + + *odr = i; + + return 0; +} + +static int adxl367_find_range(struct adxl367_state *st, int val, int val2, + enum adxl367_range *range) +{ + size_t size = ARRAY_SIZE(adxl367_range_scale_tbl); + int i; + + for (i = 0; i < size; i++) + if (val == adxl367_range_scale_tbl[i][0] && + val2 == adxl367_range_scale_tbl[i][1]) + break; + + if (i == size) + return -EINVAL; + + *range = i; + + return 0; +} + +static int adxl367_read_sample(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val) +{ + struct adxl367_state *st = iio_priv(indio_dev); + u16 sample; + int ret; + + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_temp_adc_reg_en(st, chan->address, true); + if (ret) + goto out; + + ret = regmap_bulk_read(st->regmap, chan->address, &st->sample_buf, + sizeof(st->sample_buf)); + if (ret) + goto out; + + sample = be16_to_cpu(st->sample_buf) >> chan->scan_type.shift; + *val = sign_extend32(sample, chan->scan_type.realbits - 1); + + ret = adxl367_set_temp_adc_reg_en(st, chan->address, false); + +out: + mutex_unlock(&st->lock); + + iio_device_release_direct_mode(indio_dev); + + return ret ?: IIO_VAL_INT; +} + +static int adxl367_get_status(struct adxl367_state *st, u8 *status, + u16 *fifo_entries) +{ + int ret; + + /* Read STATUS, FIFO_ENT_L and FIFO_ENT_H */ + ret = regmap_bulk_read(st->regmap, ADXL367_REG_STATUS, + st->status_buf, sizeof(st->status_buf)); + if (ret) + return ret; + + st->status_buf[2] &= ADXL367_FIFO_ENT_H_MASK; + + *status = st->status_buf[0]; + *fifo_entries = get_unaligned_le16(&st->status_buf[1]); + + return 0; +} + +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) +{ + unsigned int ev_dir; + + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) + ev_dir = IIO_EV_DIR_RISING; + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) + ev_dir = IIO_EV_DIR_FALLING; + else + return false; + + iio_push_event(indio_dev, + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X_OR_Y_OR_Z, + IIO_EV_TYPE_THRESH, ev_dir), + iio_get_time_ns(indio_dev)); + + return true; +} + +static bool adxl367_push_fifo_data(struct iio_dev *indio_dev, u8 status, + u16 fifo_entries) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + int i; + + if (!FIELD_GET(ADXL367_STATUS_FIFO_FULL_MASK, status)) + return false; + + fifo_entries -= fifo_entries % st->fifo_set_size; + + ret = st->ops->read_fifo(st->context, st->fifo_buf, fifo_entries); + if (ret) + return false; + + for (i = 0; i < fifo_entries; i += st->fifo_set_size) + iio_push_to_buffers(indio_dev, &st->fifo_buf[i]); + + return true; +} + +static irqreturn_t adxl367_irq_handler(int irq, void *private) +{ + struct iio_dev *indio_dev = private; + struct adxl367_state *st = iio_priv(indio_dev); + u16 fifo_entries; + bool handled; + u8 status; + int ret; + + ret = adxl367_get_status(st, &status, &fifo_entries); + if (ret) + return IRQ_NONE; + + handled |= adxl367_push_event(indio_dev, status); + handled |= adxl367_push_fifo_data(indio_dev, status, fifo_entries); + + return handled ? IRQ_HANDLED : IRQ_NONE; +} + +static int adxl367_reg_access(struct iio_dev *indio_dev, + unsigned int reg, + unsigned int writeval, + unsigned int *readval) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + if (readval) + return regmap_read(st->regmap, reg, readval); + else + return regmap_write(st->regmap, reg, writeval); +} + +static int adxl367_read_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long info) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + switch (info) { + case IIO_CHAN_INFO_RAW: + return adxl367_read_sample(indio_dev, chan, val); + case IIO_CHAN_INFO_SCALE: + switch (chan->type) { + case IIO_ACCEL: + mutex_lock(&st->lock); + *val = adxl367_range_scale_tbl[st->range][0]; + *val2 = adxl367_range_scale_tbl[st->range][1]; + mutex_unlock(&st->lock); + return IIO_VAL_INT_PLUS_NANO; + case IIO_TEMP: + *val = 1; + *val2 = ADXL367_TEMP_PER_C; + return IIO_VAL_FRACTIONAL; + case IIO_VOLTAGE: + *val = ADXL367_VOLTAGE_MAX_MV; + *val2 = ADXL367_VOLTAGE_MAX_RAW; + return IIO_VAL_FRACTIONAL; + default: + return -EINVAL; + } + case IIO_CHAN_INFO_OFFSET: + switch (chan->type) { + case IIO_TEMP: + *val = 25 * ADXL367_TEMP_PER_C - ADXL367_TEMP_25C; + return IIO_VAL_INT; + case IIO_VOLTAGE: + *val = ADXL367_VOLTAGE_OFFSET; + return IIO_VAL_INT; + default: + return -EINVAL; + } + case IIO_CHAN_INFO_SAMP_FREQ: + mutex_lock(&st->lock); + *val = adxl367_samp_freq_tbl[st->odr][0]; + *val2 = adxl367_samp_freq_tbl[st->odr][1]; + mutex_unlock(&st->lock); + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } +} + +static int adxl367_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long info) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + switch (info) { + case IIO_CHAN_INFO_SAMP_FREQ: { + enum adxl367_odr odr; + + ret = adxl367_find_odr(st, val, val2, &odr); + if (ret) + return ret; + + return adxl367_set_odr(indio_dev, odr); + } + case IIO_CHAN_INFO_SCALE: { + enum adxl367_range range; + + ret = adxl367_find_range(st, val, val2, &range); + if (ret) + return ret; + + return adxl367_set_range(indio_dev, range); + } + default: + return -EINVAL; + } +} + +int adxl367_write_raw_get_fmt(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + long info) +{ + switch (info) { + case IIO_CHAN_INFO_SCALE: + if (chan->type != IIO_ACCEL) + return -EINVAL; + + return IIO_VAL_INT_PLUS_NANO; + default: + return IIO_VAL_INT_PLUS_MICRO; + } +} + +static int adxl367_read_avail(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, + long info) +{ + switch (info) { + case IIO_CHAN_INFO_SCALE: + if (chan->type != IIO_ACCEL) + return -EINVAL; + + *vals = (int *)adxl367_range_scale_tbl; + *type = IIO_VAL_INT_PLUS_NANO; + *length = ARRAY_SIZE(adxl367_range_scale_tbl) * 2; + return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_SAMP_FREQ: + *vals = (int *)adxl367_samp_freq_tbl; + *type = IIO_VAL_INT_PLUS_MICRO; + *length = ARRAY_SIZE(adxl367_samp_freq_tbl) * 2; + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } +} + +static int adxl367_read_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int *val, int *val2) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + switch (info) { + case IIO_EV_INFO_VALUE: { + switch (dir) { + case IIO_EV_DIR_RISING: + mutex_lock(&st->lock); + *val = st->act_threshold; + mutex_unlock(&st->lock); + return IIO_VAL_INT; + case IIO_EV_DIR_FALLING: + mutex_lock(&st->lock); + *val = st->inact_threshold; + mutex_unlock(&st->lock); + return IIO_VAL_INT; + default: + return -EINVAL; + } + } + case IIO_EV_INFO_PERIOD: + switch (dir) { + case IIO_EV_DIR_RISING: + mutex_lock(&st->lock); + *val = st->act_time_ms; + mutex_unlock(&st->lock); + *val2 = 1000; + return IIO_VAL_FRACTIONAL; + case IIO_EV_DIR_FALLING: + mutex_lock(&st->lock); + *val = st->inact_time_ms; + mutex_unlock(&st->lock); + *val2 = 1000; + return IIO_VAL_FRACTIONAL; + default: + return -EINVAL; + } + default: + return -EINVAL; + } +} + +static int adxl367_write_event_value(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + enum iio_event_info info, + int val, int val2) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + switch (info) { + case IIO_EV_INFO_VALUE: + if (val < 0) + return -EINVAL; + + switch (dir) { + case IIO_EV_DIR_RISING: + return adxl367_set_act_threshold(st, ADXL367_ACTIVITY, val); + case IIO_EV_DIR_FALLING: + return adxl367_set_act_threshold(st, ADXL367_INACTIVITY, val); + default: + return -EINVAL; + } + case IIO_EV_INFO_PERIOD: + if (val < 0) + return -EINVAL; + + val = val * 1000 + DIV_ROUND_UP(val2, 1000); + switch (dir) { + case IIO_EV_DIR_RISING: + return adxl367_set_act_time_ms(st, ADXL367_ACTIVITY, val); + case IIO_EV_DIR_FALLING: + return adxl367_set_act_time_ms(st, ADXL367_INACTIVITY, val); + default: + return -EINVAL; + } + default: + return -EINVAL; + } +} + +static int adxl367_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct adxl367_state *st = iio_priv(indio_dev); + bool en; + int ret; + + switch (dir) { + case IIO_EV_DIR_RISING: + ret = adxl367_get_act_interrupt_en(st, ADXL367_ACTIVITY, &en); + return ret ?: en; + case IIO_EV_DIR_FALLING: + ret = adxl367_get_act_interrupt_en(st, ADXL367_INACTIVITY, &en); + return ret ?: en; + default: + return -EINVAL; + } +} + +static int adxl367_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, + int state) +{ + struct adxl367_state *st = iio_priv(indio_dev); + enum adxl367_activity_type act; + int ret; + + switch (dir) { + case IIO_EV_DIR_RISING: + act = ADXL367_ACTIVITY; + break; + case IIO_EV_DIR_FALLING: + act = ADXL367_INACTIVITY; + break; + default: + return -EINVAL; + } + + ret = iio_device_claim_direct_mode(indio_dev); + if (ret) + return ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_act_interrupt_en(st, act, state); + if (ret) + goto out; + + ret = adxl367_set_act_en(st, act, state ? ADCL367_ACT_REF_ENABLED + : ADXL367_ACT_DISABLED); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + iio_device_release_direct_mode(indio_dev); + + return ret; +} + +static ssize_t adxl367_get_fifo_enabled(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct adxl367_state *st = iio_priv(indio_dev); + enum adxl367_fifo_mode fifo_mode; + int ret; + + ret = adxl367_get_fifo_mode(st, &fifo_mode); + if (ret) + return ret; + + return sysfs_emit(buf, "%d\n", fifo_mode != ADXL367_FIFO_MODE_DISABLED); +} + +static ssize_t adxl367_get_fifo_watermark(struct device *dev, + struct device_attribute *attr, + char *buf) +{ + struct iio_dev *indio_dev = dev_to_iio_dev(dev); + struct adxl367_state *st = iio_priv(indio_dev); + unsigned int fifo_watermark; + + mutex_lock(&st->lock); + fifo_watermark = st->fifo_watermark; + mutex_unlock(&st->lock); + + return sysfs_emit(buf, "%d\n", fifo_watermark); +} + +static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); +static IIO_CONST_ATTR(hwfifo_watermark_max, + __stringify(ADXL367_FIFO_MAX_WATERMARK)); +static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, + adxl367_get_fifo_watermark, NULL, 0); +static IIO_DEVICE_ATTR(hwfifo_enabled, 0444, + adxl367_get_fifo_enabled, NULL, 0); + +static const struct attribute *adxl367_fifo_attributes[] = { + &iio_const_attr_hwfifo_watermark_min.dev_attr.attr, + &iio_const_attr_hwfifo_watermark_max.dev_attr.attr, + &iio_dev_attr_hwfifo_watermark.dev_attr.attr, + &iio_dev_attr_hwfifo_enabled.dev_attr.attr, + NULL, +}; + +static int adxl367_set_watermark(struct iio_dev *indio_dev, unsigned int val) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + if (val > ADXL367_FIFO_MAX_WATERMARK) + return -EINVAL; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_fifo_watermark(st, val); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static bool adxl367_find_mask_fifo_format(const unsigned long *scan_mask, + enum adxl367_fifo_format *fifo_format) +{ + size_t size = ARRAY_SIZE(adxl367_channel_masks) - 1; + int i; + + for (i = 0; i < size; i++) + if (*scan_mask == adxl367_channel_masks[i]) + break; + + if (i == size) + return false; + + *fifo_format = i; + + return true; +} + +static int adxl367_update_scan_mode(struct iio_dev *indio_dev, + const unsigned long *active_scan_mask) +{ + struct adxl367_state *st = iio_priv(indio_dev); + enum adxl367_fifo_format fifo_format; + unsigned int fifo_set_size; + int ret; + + if (!adxl367_find_mask_fifo_format(active_scan_mask, &fifo_format)) + return -EINVAL; + + fifo_set_size = bitmap_weight(active_scan_mask, indio_dev->masklength); + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_fifo_format(st, fifo_format); + if (ret) + goto out; + + ret = adxl367_set_fifo_set_size(st, fifo_set_size); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static int adxl367_buffer_preenable(struct iio_dev *indio_dev) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + return adxl367_set_temp_adc_mask_en(st, indio_dev->active_scan_mask, + true); +} + +static int adxl367_buffer_postenable(struct iio_dev *indio_dev) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_fifo_watermark_interrupt_en(st, true); + if (ret) + goto out; + + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_STREAM); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static int adxl367_buffer_predisable(struct iio_dev *indio_dev) +{ + struct adxl367_state *st = iio_priv(indio_dev); + int ret; + + mutex_lock(&st->lock); + + ret = adxl367_set_measure_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_DISABLED); + if (ret) + goto out; + + ret = adxl367_set_fifo_watermark_interrupt_en(st, false); + if (ret) + goto out; + + ret = adxl367_set_measure_en(st, true); + +out: + mutex_unlock(&st->lock); + + return ret; +} + +static int adxl367_buffer_postdisable(struct iio_dev *indio_dev) +{ + struct adxl367_state *st = iio_priv(indio_dev); + + return adxl367_set_temp_adc_mask_en(st, indio_dev->active_scan_mask, + false); +} + +static const struct iio_buffer_setup_ops adxl367_buffer_ops = { + .preenable = adxl367_buffer_preenable, + .postenable = adxl367_buffer_postenable, + .predisable = adxl367_buffer_predisable, + .postdisable = adxl367_buffer_postdisable, +}; + +static const struct iio_info adxl367_info = { + .read_raw = adxl367_read_raw, + .write_raw = adxl367_write_raw, + .write_raw_get_fmt = adxl367_write_raw_get_fmt, + .read_avail = adxl367_read_avail, + .read_event_config = adxl367_read_event_config, + .write_event_config = adxl367_write_event_config, + .read_event_value = adxl367_read_event_value, + .write_event_value = adxl367_write_event_value, + .debugfs_reg_access = adxl367_reg_access, + .hwfifo_set_watermark = adxl367_set_watermark, + .update_scan_mode = adxl367_update_scan_mode, +}; + +static const struct iio_event_spec adxl367_events[] = { + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_RISING, + .mask_shared_by_all = BIT(IIO_EV_INFO_ENABLE) | + BIT(IIO_EV_INFO_PERIOD) | + BIT(IIO_EV_INFO_VALUE), + }, + { + .type = IIO_EV_TYPE_THRESH, + .dir = IIO_EV_DIR_FALLING, + .mask_shared_by_all = BIT(IIO_EV_INFO_ENABLE) | + BIT(IIO_EV_INFO_PERIOD) | + BIT(IIO_EV_INFO_VALUE), + }, +}; + +#define ADXL367_ACCEL_CHANNEL(index, reg, axis) { \ + .type = IIO_ACCEL, \ + .address = (reg), \ + .modified = 1, \ + .channel2 = IIO_MOD_##axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_type_available = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .info_mask_shared_by_all_available = \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .event_spec = adxl367_events, \ + .num_event_specs = ARRAY_SIZE(adxl367_events), \ + .scan_index = (index), \ + .scan_type = { \ + .sign = 's', \ + .realbits = 14, \ + .storagebits = 16, \ + .endianness = IIO_BE, \ + }, \ +} + +#define ADXL367_CHANNEL(index, reg, _type) { \ + .type = (_type), \ + .address = (reg), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_OFFSET) | \ + BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = (index), \ + .scan_type = { \ + .sign = 's', \ + .realbits = 14, \ + .storagebits = 16, \ + .endianness = IIO_BE, \ + }, \ +} + +static const struct iio_chan_spec adxl367_channels[] = { + ADXL367_ACCEL_CHANNEL(ADXL367_X_CHANNEL_INDEX, ADXL367_REG_X_DATA_H, X), + ADXL367_ACCEL_CHANNEL(ADXL367_Y_CHANNEL_INDEX, ADXL367_REG_Y_DATA_H, Y), + ADXL367_ACCEL_CHANNEL(ADXL367_Z_CHANNEL_INDEX, ADXL367_REG_Z_DATA_H, Z), + ADXL367_CHANNEL(ADXL367_TEMP_CHANNEL_INDEX, ADXL367_REG_TEMP_DATA_H, + IIO_TEMP), + ADXL367_CHANNEL(ADXL367_EX_ADC_CHANNEL_INDEX, ADXL367_REG_EX_ADC_DATA_H, + IIO_VOLTAGE), +}; + +static int adxl367_reset(struct adxl367_state *st) +{ + int ret; + + ret = regmap_write(st->regmap, ADXL367_REG_RESET, ADXL367_RESET_CODE); + if (ret) + return ret; + + usleep_range(2000, 2100); + + return 0; +} + +static int adxl367_verify_devid(struct adxl367_state *st) +{ + unsigned int val; + int ret; + + ret = regmap_read(st->regmap, ADXL367_REG_DEVID, &val); + if (ret) + return ret; + + if (val != ADXL367_DEVID_AD) { + return dev_err_probe(st->dev, -ENODEV, + "Invalid dev id 0x%02X, expected 0x%02X\n", + val, ADXL367_DEVID_AD); + } + + return 0; +} + +static int adxl367_setup(struct adxl367_state *st) +{ + int ret; + + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, + ADXL367_2G_RANGE_1G); + if (ret) + return ret; + + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, + ADXL367_2G_RANGE_100MG); + if (ret) + return ret; + + ret = adxl367_set_act_proc_mode(st, ADXL367_LOOPED); + if (ret) + return ret; + + ret = _adxl367_set_odr(st, ADXL367_ODR_400HZ); + if (ret) + return ret; + + ret = _adxl367_set_act_time_ms(st, 10); + if (ret) + return ret; + + ret = _adxl367_set_inact_time_ms(st, 10000); + if (ret) + return ret; + + return adxl367_set_measure_en(st, true); +} + +static void adxl367_disable_regulators(void *data) +{ + struct adxl367_state *st = data; + + regulator_bulk_disable(ARRAY_SIZE(st->regulators), st->regulators); +} + +int adxl367_probe(struct device *dev, const struct adxl367_ops *ops, + void *context, struct regmap *regmap, int irq) +{ + struct iio_dev *indio_dev; + struct adxl367_state *st; + int ret; + + indio_dev = devm_iio_device_alloc(dev, sizeof(*st)); + if (!indio_dev) + return -ENOMEM; + + st = iio_priv(indio_dev); + st->dev = dev; + st->regmap = regmap; + st->context = context; + st->ops = ops; + + mutex_init(&st->lock); + + indio_dev->channels = adxl367_channels; + indio_dev->num_channels = ARRAY_SIZE(adxl367_channels); + indio_dev->available_scan_masks = adxl367_channel_masks; + indio_dev->name = "adxl367"; + indio_dev->info = &adxl367_info; + indio_dev->modes = INDIO_DIRECT_MODE; + + st->regulators[0].supply = "vdd"; + st->regulators[1].supply = "vddio"; + + ret = devm_regulator_bulk_get(st->dev, ARRAY_SIZE(st->regulators), + st->regulators); + if (ret) + return dev_err_probe(st->dev, ret, + "Failed to get regulators\n"); + + ret = regulator_bulk_enable(ARRAY_SIZE(st->regulators), st->regulators); + if (ret) + return dev_err_probe(st->dev, ret, + "Failed to enable regulators\n"); + + ret = devm_add_action_or_reset(st->dev, adxl367_disable_regulators, st); + if (ret) + return dev_err_probe(st->dev, ret, + "Failed to add regulators disable action\n"); + + ret = adxl367_verify_devid(st); + if (ret) + return ret; + + ret = adxl367_reset(st); + if (ret) + return ret; + + ret = adxl367_setup(st); + if (ret) + return ret; + + ret = devm_iio_kfifo_buffer_setup_ext(st->dev, indio_dev, + INDIO_BUFFER_SOFTWARE, + &adxl367_buffer_ops, + adxl367_fifo_attributes); + if (ret) + return ret; + + ret = devm_request_threaded_irq(st->dev, irq, NULL, + adxl367_irq_handler, IRQF_ONESHOT, + indio_dev->name, indio_dev); + if (ret) + return dev_err_probe(st->dev, ret, "Failed to request irq\n"); + + return devm_iio_device_register(dev, indio_dev); +} +EXPORT_SYMBOL_GPL(adxl367_probe); + +MODULE_AUTHOR("Cosmin Tanislav <cosmin.tanislav@analog.com>"); +MODULE_DESCRIPTION("Analog Devices ADXL367 3-axis accelerometer driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/iio/accel/adxl367.h b/drivers/iio/accel/adxl367.h new file mode 100644 index 000000000000..4a42622149b1 --- /dev/null +++ b/drivers/iio/accel/adxl367.h @@ -0,0 +1,23 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2021 Analog Devices, Inc. + * Author: Cosmin Tanislav <cosmin.tanislav@analog.com> + */ + +#ifndef _ADXL367_H_ +#define _ADXL367_H_ + +#include <linux/types.h> + +struct device; +struct regmap; + +struct adxl367_ops { + int (*read_fifo)(void *context, __be16 *fifo_buf, + unsigned int fifo_entries); +}; + +int adxl367_probe(struct device *dev, const struct adxl367_ops *ops, + void *context, struct regmap *regmap, int irq); + +#endif /* _ADXL367_H_ */ diff --git a/drivers/iio/accel/adxl367_i2c.c b/drivers/iio/accel/adxl367_i2c.c new file mode 100644 index 000000000000..2615b22f59f4 --- /dev/null +++ b/drivers/iio/accel/adxl367_i2c.c @@ -0,0 +1,89 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Analog Devices, Inc. + * Author: Cosmin Tanislav <cosmin.tanislav@analog.com> + */ + +#include <linux/i2c.h> +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/regmap.h> + +#include "adxl367.h" + +#define ADXL367_I2C_FIFO_DATA 0x42 + +struct adxl367_i2c_state { + struct regmap *regmap; +}; + +static bool adxl367_readable_noinc_reg(struct device *dev, unsigned int reg) +{ + return reg == ADXL367_I2C_FIFO_DATA; +} + +static int adxl367_i2c_read_fifo(void *context, __be16 *fifo_buf, + unsigned int fifo_entries) +{ + struct adxl367_i2c_state *st = context; + + return regmap_noinc_read(st->regmap, ADXL367_I2C_FIFO_DATA, fifo_buf, + fifo_entries * sizeof(*fifo_buf)); +} + +static const struct regmap_config adxl367_i2c_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .readable_noinc_reg = adxl367_readable_noinc_reg, +}; + +static const struct adxl367_ops adxl367_i2c_ops = { + .read_fifo = adxl367_i2c_read_fifo, +}; + +static int adxl367_i2c_probe(struct i2c_client *client, + const struct i2c_device_id *id) +{ + struct adxl367_i2c_state *st; + struct regmap *regmap; + + st = devm_kzalloc(&client->dev, sizeof(*st), GFP_KERNEL); + if (!st) + return -ENOMEM; + + regmap = devm_regmap_init_i2c(client, &adxl367_i2c_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + st->regmap = regmap; + + return adxl367_probe(&client->dev, &adxl367_i2c_ops, st, regmap, + client->irq); +} + +static const struct i2c_device_id adxl367_i2c_id[] = { + { "adxl367", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(i2c, adxl367_i2c_id); + +static const struct of_device_id adxl367_of_match[] = { + { .compatible = "adi,adxl367" }, + { }, +}; +MODULE_DEVICE_TABLE(of, adxl367_of_match); + +static struct i2c_driver adxl367_i2c_driver = { + .driver = { + .name = "adxl367_i2c", + .of_match_table = adxl367_of_match, + }, + .probe = adxl367_i2c_probe, + .id_table = adxl367_i2c_id, +}; + +module_i2c_driver(adxl367_i2c_driver); + +MODULE_AUTHOR("Cosmin Tanislav <cosmin.tanislav@analog.com>"); +MODULE_DESCRIPTION("Analog Devices ADXL367 3-axis accelerometer I2C driver"); +MODULE_LICENSE("GPL"); diff --git a/drivers/iio/accel/adxl367_spi.c b/drivers/iio/accel/adxl367_spi.c new file mode 100644 index 000000000000..ede0947d2b25 --- /dev/null +++ b/drivers/iio/accel/adxl367_spi.c @@ -0,0 +1,163 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2021 Analog Devices, Inc. + * Author: Cosmin Tanislav <cosmin.tanislav@analog.com> + */ + +#include <linux/mod_devicetable.h> +#include <linux/module.h> +#include <linux/regmap.h> +#include <linux/spi/spi.h> + +#include "adxl367.h" + +#define ADXL367_SPI_WRITE_COMMAND 0x0A +#define ADXL367_SPI_READ_COMMAND 0x0B +#define ADXL367_SPI_FIFO_COMMAND 0x0D + +struct adxl367_spi_state { + struct spi_device *spi; + + struct spi_message reg_write_msg; + struct spi_transfer reg_write_xfer[2]; + + struct spi_message reg_read_msg; + struct spi_transfer reg_read_xfer[2]; + + struct spi_message fifo_msg; + struct spi_transfer fifo_xfer[2]; + + /* + * DMA (thus cache coherency maintenance) requires the + * transfer buffers to live in their own cache lines. + */ + u8 reg_write_tx_buf[1] ____cacheline_aligned; + u8 reg_read_tx_buf[2]; + u8 fifo_tx_buf[1]; +}; + +static int adxl367_read_fifo(void *context, __be16 *fifo_buf, + unsigned int fifo_entries) +{ + struct adxl367_spi_state *st = context; + + st->fifo_xfer[1].rx_buf = fifo_buf; + st->fifo_xfer[1].len = fifo_entries * sizeof(*fifo_buf); + + return spi_sync(st->spi, &st->fifo_msg); +} + +static int adxl367_read(void *context, const void *reg_buf, size_t reg_size, + void *val_buf, size_t val_size) +{ + struct adxl367_spi_state *st = context; + u8 reg = ((const u8 *)reg_buf)[0]; + + st->reg_read_tx_buf[1] = reg; + st->reg_read_xfer[1].rx_buf = val_buf; + st->reg_read_xfer[1].len = val_size; + + return spi_sync(st->spi, &st->reg_read_msg); +} + +static int adxl367_write(void *context, const void *val_buf, size_t val_size) +{ + struct adxl367_spi_state *st = context; + + st->reg_write_xfer[1].tx_buf = val_buf; + st->reg_write_xfer[1].len = val_size; + + return spi_sync(st->spi, &st->reg_write_msg); +} + +static struct regmap_bus adxl367_spi_regmap_bus = { + .read = adxl367_read, + .write = adxl367_write, +}; + +static const struct regmap_config adxl367_spi_regmap_config = { + .reg_bits = 8, + .val_bits = 8, +}; + +static const struct adxl367_ops adxl367_spi_ops = { + .read_fifo = adxl367_read_fifo, +}; + +static int adxl367_spi_probe(struct spi_device *spi) +{ + struct adxl367_spi_state *st; + struct regmap *regmap; + + st = devm_kzalloc(&spi->dev, sizeof(*st), GFP_KERNEL); + if (!st) + return -ENOMEM; + + st->spi = spi; + + /* + * Xfer: [XFR1] [ XFR2 ] + * Master: 0x0A ADDR DATA0 DATA1 ... DATAN + * Slave: .... .......................... + */ + st->reg_write_tx_buf[0] = ADXL367_SPI_WRITE_COMMAND; + st->reg_write_xfer[0].tx_buf = st->reg_write_tx_buf; + st->reg_write_xfer[0].len = sizeof(st->reg_write_tx_buf); + spi_message_init_with_transfers(&st->reg_write_msg, + st->reg_write_xfer, 2); + + /* + * Xfer: [ XFR1 ] [ XFR2 ] + * Master: 0x0B ADDR ..................... + * Slave: ......... DATA0 DATA1 ... DATAN + */ + st->reg_read_tx_buf[0] = ADXL367_SPI_READ_COMMAND; + st->reg_read_xfer[0].tx_buf = st->reg_read_tx_buf; + st->reg_read_xfer[0].len = sizeof(st->reg_read_tx_buf); + spi_message_init_with_transfers(&st->reg_read_msg, + st->reg_read_xfer, 2); + + /* + * Xfer: [XFR1] [ XFR2 ] + * Master: 0x0D ..................... + * Slave: .... DATA0 DATA1 ... DATAN + */ + st->fifo_tx_buf[0] = ADXL367_SPI_FIFO_COMMAND; + st->fifo_xfer[0].tx_buf = st->fifo_tx_buf; + st->fifo_xfer[0].len = sizeof(st->fifo_tx_buf); + spi_message_init_with_transfers(&st->fifo_msg, st->fifo_xfer, 2); + + regmap = devm_regmap_init(&spi->dev, &adxl367_spi_regmap_bus, st, + &adxl367_spi_regmap_config); + if (IS_ERR(regmap)) + return PTR_ERR(regmap); + + return adxl367_probe(&spi->dev, &adxl367_spi_ops, st, regmap, spi->irq); +} + +static const struct spi_device_id adxl367_spi_id[] = { + { "adxl367", 0 }, + { }, +}; +MODULE_DEVICE_TABLE(spi, adxl367_spi_id); + +static const struct of_device_id adxl367_of_match[] = { + { .compatible = "adi,adxl367" }, + { }, +}; +MODULE_DEVICE_TABLE(of, adxl367_of_match); + +static struct spi_driver adxl367_spi_driver = { + .driver = { + .name = "adxl367_spi", + .of_match_table = adxl367_of_match, + }, + .probe = adxl367_spi_probe, + .id_table = adxl367_spi_id, +}; + +module_spi_driver(adxl367_spi_driver); + +MODULE_AUTHOR("Cosmin Tanislav <cosmin.tanislav@analog.com>"); +MODULE_DESCRIPTION("Analog Devices ADXL367 3-axis accelerometer SPI driver"); +MODULE_LICENSE("GPL"); -- 2.34.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-17 11:45 ` [PATCH v3 2/2] iio: accel: add ADXL367 driver Cosmin Tanislav @ 2021-12-17 16:29 ` kernel test robot 2021-12-23 13:01 ` Jonathan Cameron 1 sibling, 0 replies; 11+ messages in thread From: kernel test robot @ 2021-12-17 16:29 UTC (permalink / raw) To: Cosmin Tanislav Cc: kbuild-all, cosmin.tanislav, demonsingur, Lars-Peter Clausen, Michael Hennerich, Rob Herring, linux-iio, devicetree, linux-kernel Hi Cosmin, I love your patch! Perhaps something to improve: [auto build test WARNING on jic23-iio/togreg] [also build test WARNING on robh/for-next linus/master v5.16-rc5 next-20211217] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Cosmin-Tanislav/Add-ADXL367-driver/20211217-194722 base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20211218/202112180019.g2mLoEZq-lkp@intel.com/config) compiler: sh4-linux-gcc (GCC) 11.2.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/c227f49f87d7be7884f44bfdd422713610cdd29c git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Cosmin-Tanislav/Add-ADXL367-driver/20211217-194722 git checkout c227f49f87d7be7884f44bfdd422713610cdd29c # save the config file to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=sh SHELL=/bin/bash drivers/iio/accel/ net/netfilter/ If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All warnings (new ones prefixed by >>): >> drivers/iio/accel/adxl367.c:990:5: warning: no previous prototype for 'adxl367_write_raw_get_fmt' [-Wmissing-prototypes] 990 | int adxl367_write_raw_get_fmt(struct iio_dev *indio_dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/iio/accel/adxl367.c:212:18: warning: 'adxl367_time_scale_tbl' defined but not used [-Wunused-const-variable=] 212 | static const int adxl367_time_scale_tbl[] = { | ^~~~~~~~~~~~~~~~~~~~~~ vim +/adxl367_write_raw_get_fmt +990 drivers/iio/accel/adxl367.c 989 > 990 int adxl367_write_raw_get_fmt(struct iio_dev *indio_dev, 991 struct iio_chan_spec const *chan, 992 long info) 993 { 994 switch (info) { 995 case IIO_CHAN_INFO_SCALE: 996 if (chan->type != IIO_ACCEL) 997 return -EINVAL; 998 999 return IIO_VAL_INT_PLUS_NANO; 1000 default: 1001 return IIO_VAL_INT_PLUS_MICRO; 1002 } 1003 } 1004 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver @ 2021-12-17 16:29 ` kernel test robot 0 siblings, 0 replies; 11+ messages in thread From: kernel test robot @ 2021-12-17 16:29 UTC (permalink / raw) To: kbuild-all [-- Attachment #1: Type: text/plain, Size: 2680 bytes --] Hi Cosmin, I love your patch! Perhaps something to improve: [auto build test WARNING on jic23-iio/togreg] [also build test WARNING on robh/for-next linus/master v5.16-rc5 next-20211217] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch] url: https://github.com/0day-ci/linux/commits/Cosmin-Tanislav/Add-ADXL367-driver/20211217-194722 base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg config: sh-allmodconfig (https://download.01.org/0day-ci/archive/20211218/202112180019.g2mLoEZq-lkp(a)intel.com/config) compiler: sh4-linux-gcc (GCC) 11.2.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/0day-ci/linux/commit/c227f49f87d7be7884f44bfdd422713610cdd29c git remote add linux-review https://github.com/0day-ci/linux git fetch --no-tags linux-review Cosmin-Tanislav/Add-ADXL367-driver/20211217-194722 git checkout c227f49f87d7be7884f44bfdd422713610cdd29c # save the config file to linux build tree mkdir build_dir COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-11.2.0 make.cross O=build_dir ARCH=sh SHELL=/bin/bash drivers/iio/accel/ net/netfilter/ If you fix the issue, kindly add following tag as appropriate Reported-by: kernel test robot <lkp@intel.com> All warnings (new ones prefixed by >>): >> drivers/iio/accel/adxl367.c:990:5: warning: no previous prototype for 'adxl367_write_raw_get_fmt' [-Wmissing-prototypes] 990 | int adxl367_write_raw_get_fmt(struct iio_dev *indio_dev, | ^~~~~~~~~~~~~~~~~~~~~~~~~ drivers/iio/accel/adxl367.c:212:18: warning: 'adxl367_time_scale_tbl' defined but not used [-Wunused-const-variable=] 212 | static const int adxl367_time_scale_tbl[] = { | ^~~~~~~~~~~~~~~~~~~~~~ vim +/adxl367_write_raw_get_fmt +990 drivers/iio/accel/adxl367.c 989 > 990 int adxl367_write_raw_get_fmt(struct iio_dev *indio_dev, 991 struct iio_chan_spec const *chan, 992 long info) 993 { 994 switch (info) { 995 case IIO_CHAN_INFO_SCALE: 996 if (chan->type != IIO_ACCEL) 997 return -EINVAL; 998 999 return IIO_VAL_INT_PLUS_NANO; 1000 default: 1001 return IIO_VAL_INT_PLUS_MICRO; 1002 } 1003 } 1004 --- 0-DAY CI Kernel Test Service, Intel Corporation https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-17 11:45 ` [PATCH v3 2/2] iio: accel: add ADXL367 driver Cosmin Tanislav 2021-12-17 16:29 ` kernel test robot @ 2021-12-23 13:01 ` Jonathan Cameron 2021-12-27 13:00 ` Tanislav, Cosmin 1 sibling, 1 reply; 11+ messages in thread From: Jonathan Cameron @ 2021-12-23 13:01 UTC (permalink / raw) To: Cosmin Tanislav Cc: cosmin.tanislav, Lars-Peter Clausen, Michael Hennerich, Rob Herring, linux-iio, devicetree, linux-kernel On Fri, 17 Dec 2021 13:45:48 +0200 Cosmin Tanislav <demonsingur@gmail.com> wrote: > The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. > > The ADXL367 does not alias input signals to achieve ultralow power > consumption, it samples the full bandwidth of the sensor at all > data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, > with a resolution of 0.25mg/LSB on the +-2 g range. > > In addition to its ultralow power consumption, the ADXL367 > has many features to enable true system level power reduction. > It includes a deep multimode output FIFO, a built-in micropower > temperature sensor, and an internal ADC for synchronous conversion > of an additional analog input. > > Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com> A few comments and questions inline. Would definitely be helpful if the datasheet becomes available though as would have saved some of the questions. Thanks, Jonathan > diff --git a/drivers/iio/accel/adxl367.c b/drivers/iio/accel/adxl367.c > new file mode 100644 > index 000000000000..ce574f0446eb > --- /dev/null > +++ b/drivers/iio/accel/adxl367.c ... > + > +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) > +{ > + unsigned int ev_dir; > + > + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) > + ev_dir = IIO_EV_DIR_RISING; > + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) > + ev_dir = IIO_EV_DIR_FALLING; > + else > + return false; > + > + iio_push_event(indio_dev, > + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, IIO_MOD_X_OR_Y_OR_Z, > + IIO_EV_TYPE_THRESH, ev_dir), This is unusual for event detection as it's a simple or of separately applied thresholds on X, Y and Z axes. Given the effect of gravity that means you have to set the thresholds very wide. Also, I'd expect these to be magnitudes, not THRESH - no data sheet that I can find though so can't be sure. > + iio_get_time_ns(indio_dev)); > + > + return true; > +} > + > +static bool adxl367_push_fifo_data(struct iio_dev *indio_dev, u8 status, > + u16 fifo_entries) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + int ret; > + int i; > + > + if (!FIELD_GET(ADXL367_STATUS_FIFO_FULL_MASK, status)) > + return false; > + > + fifo_entries -= fifo_entries % st->fifo_set_size; > + > + ret = st->ops->read_fifo(st->context, st->fifo_buf, fifo_entries); > + if (ret) > + return false; Odd corner cases - it doesn't mean IRQ_NONE is appropriate I think... Definitely print an error message if you hit this one but I think you should still be returning that IRQ_HANDLED from the caller to avoid getting stuck. IRQ_NONE doesn't mean error, it means a spurious IRQ. > + > + for (i = 0; i < fifo_entries; i += st->fifo_set_size) > + iio_push_to_buffers(indio_dev, &st->fifo_buf[i]); > + > + return true; > +} > + > +static int adxl367_read_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int *val, int *val2, long info) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + > + switch (info) { > + case IIO_CHAN_INFO_RAW: > + return adxl367_read_sample(indio_dev, chan, val); > + case IIO_CHAN_INFO_SCALE: > + switch (chan->type) { > + case IIO_ACCEL: > + mutex_lock(&st->lock); > + *val = adxl367_range_scale_tbl[st->range][0]; > + *val2 = adxl367_range_scale_tbl[st->range][1]; > + mutex_unlock(&st->lock); > + return IIO_VAL_INT_PLUS_NANO; > + case IIO_TEMP: > + *val = 1; > + *val2 = ADXL367_TEMP_PER_C; > + return IIO_VAL_FRACTIONAL; Base units of temp channels are milli degrees C. Given naming here, this looks like it might be the scale factor to degrees C. Always check Documentation/ABI/testing/sysfs-bus-iio. Unfortunately for historical reasons some of the units are not entirely obvious. > + case IIO_VOLTAGE: > + *val = ADXL367_VOLTAGE_MAX_MV; > + *val2 = ADXL367_VOLTAGE_MAX_RAW; > + return IIO_VAL_FRACTIONAL; > + default: > + return -EINVAL; > + } > + case IIO_CHAN_INFO_OFFSET: > + switch (chan->type) { > + case IIO_TEMP: > + *val = 25 * ADXL367_TEMP_PER_C - ADXL367_TEMP_25C; > + return IIO_VAL_INT; > + case IIO_VOLTAGE: > + *val = ADXL367_VOLTAGE_OFFSET; > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > + case IIO_CHAN_INFO_SAMP_FREQ: > + mutex_lock(&st->lock); > + *val = adxl367_samp_freq_tbl[st->odr][0]; > + *val2 = adxl367_samp_freq_tbl[st->odr][1]; > + mutex_unlock(&st->lock); > + return IIO_VAL_INT_PLUS_MICRO; > + default: > + return -EINVAL; > + } > +} ... > +static int adxl367_read_event_config(struct iio_dev *indio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + bool en; > + int ret; > + > + switch (dir) { > + case IIO_EV_DIR_RISING: > + ret = adxl367_get_act_interrupt_en(st, ADXL367_ACTIVITY, &en); > + return ret ?: en; > + case IIO_EV_DIR_FALLING: > + ret = adxl367_get_act_interrupt_en(st, ADXL367_INACTIVITY, &en); > + return ret ?: en; > + default: > + return -EINVAL; > + } > +} > + > +static int adxl367_write_event_config(struct iio_dev *indio_dev, > + const struct iio_chan_spec *chan, > + enum iio_event_type type, > + enum iio_event_direction dir, > + int state) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + enum adxl367_activity_type act; > + int ret; > + > + switch (dir) { > + case IIO_EV_DIR_RISING: > + act = ADXL367_ACTIVITY; > + break; > + case IIO_EV_DIR_FALLING: > + act = ADXL367_INACTIVITY; > + break; > + default: > + return -EINVAL; > + } > + > + ret = iio_device_claim_direct_mode(indio_dev); It's unusual (though not unheard of) to have events that cannot be enabled at the same time as a fifo. If that's true here, please add some comments to explain why. Or is this just about the impact of having to disable the measurement to turn it on and the resulting interruption of data capture? If so that needs more thought as we have a situation where you can (I think) have events as long as you enable them before the fifo based capture is started, but cannot enable them after. > + if (ret) > + return ret; > + > + mutex_lock(&st->lock); > + > + ret = adxl367_set_measure_en(st, false); > + if (ret) > + goto out; > + > + ret = adxl367_set_act_interrupt_en(st, act, state); > + if (ret) > + goto out; > + > + ret = adxl367_set_act_en(st, act, state ? ADCL367_ACT_REF_ENABLED > + : ADXL367_ACT_DISABLED); > + if (ret) > + goto out; > + > + ret = adxl367_set_measure_en(st, true); > + > +out: > + mutex_unlock(&st->lock); > + > + iio_device_release_direct_mode(indio_dev); > + > + return ret; > +} > + > + > +static ssize_t adxl367_get_fifo_watermark(struct device *dev, > + struct device_attribute *attr, > + char *buf) > +{ > + struct iio_dev *indio_dev = dev_to_iio_dev(dev); > + struct adxl367_state *st = iio_priv(indio_dev); Trivial but in cases where you don't need the indio_dev, it is find to roll the above two lines into one as the function names express the types so no information is lost. struct adxl367_state *st = iio_priv(dev_to_iio_dev(dev)); > + unsigned int fifo_watermark; > + > + mutex_lock(&st->lock); > + fifo_watermark = st->fifo_watermark; > + mutex_unlock(&st->lock); > + > + return sysfs_emit(buf, "%d\n", fifo_watermark); > +} ... > + > +static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); > +static IIO_CONST_ATTR(hwfifo_watermark_max, > + __stringify(ADXL367_FIFO_MAX_WATERMARK)); > +static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, > + adxl367_get_fifo_watermark, NULL, 0); > +static IIO_DEVICE_ATTR(hwfifo_enabled, 0444, > + adxl367_get_fifo_enabled, NULL, 0); > + > +static const struct attribute *adxl367_fifo_attributes[] = { > + &iio_const_attr_hwfifo_watermark_min.dev_attr.attr, > + &iio_const_attr_hwfifo_watermark_max.dev_attr.attr, > + &iio_dev_attr_hwfifo_watermark.dev_attr.attr, > + &iio_dev_attr_hwfifo_enabled.dev_attr.attr, > + NULL, > +}; ... > +static int adxl367_update_scan_mode(struct iio_dev *indio_dev, > + const unsigned long *active_scan_mask) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + enum adxl367_fifo_format fifo_format; > + unsigned int fifo_set_size; > + int ret; > + > + if (!adxl367_find_mask_fifo_format(active_scan_mask, &fifo_format)) > + return -EINVAL; > + > + fifo_set_size = bitmap_weight(active_scan_mask, indio_dev->masklength); > + > + mutex_lock(&st->lock); > + > + ret = adxl367_set_measure_en(st, false); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_format(st, fifo_format); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_set_size(st, fifo_set_size); > + if (ret) > + goto out; > + > + ret = adxl367_set_measure_en(st, true); > + > +out: > + mutex_unlock(&st->lock); > + > + return ret; > +} > + > +static int adxl367_buffer_preenable(struct iio_dev *indio_dev) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + > + return adxl367_set_temp_adc_mask_en(st, indio_dev->active_scan_mask, > + true); Why the logical separation of the channel enable to here and fifo setup to post_enable? Reality is there is very little reason any more to have separate preenable/posteenable. If there is a reason to do it here, please add a comment to explain. Is it because this needs to occur before update_scan_mode() is called? > +} > + > +static int adxl367_buffer_postenable(struct iio_dev *indio_dev) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + int ret; > + > + mutex_lock(&st->lock); > + > + ret = adxl367_set_measure_en(st, false); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_watermark_interrupt_en(st, true); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_STREAM); > + if (ret) > + goto out; > + > + ret = adxl367_set_measure_en(st, true); > + > +out: > + mutex_unlock(&st->lock); > + > + return ret; > +} > + > +static int adxl367_buffer_predisable(struct iio_dev *indio_dev) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + int ret; > + > + mutex_lock(&st->lock); > + > + ret = adxl367_set_measure_en(st, false); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_DISABLED); > + if (ret) > + goto out; > + > + ret = adxl367_set_fifo_watermark_interrupt_en(st, false); > + if (ret) > + goto out; > + > + ret = adxl367_set_measure_en(st, true); > + > +out: > + mutex_unlock(&st->lock); > + > + return ret; > +} > + > +static int adxl367_buffer_postdisable(struct iio_dev *indio_dev) > +{ > + struct adxl367_state *st = iio_priv(indio_dev); > + > + return adxl367_set_temp_adc_mask_en(st, indio_dev->active_scan_mask, > + false); > +} > + ... > +static int adxl367_setup(struct adxl367_state *st) > +{ > + int ret; > + > + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, > + ADXL367_2G_RANGE_1G); > + if (ret) > + return ret; > + > + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, > + ADXL367_2G_RANGE_100MG); Should one of this pair be inactivity? > + if (ret) > + return ret; > + > + ret = adxl367_set_act_proc_mode(st, ADXL367_LOOPED); > + if (ret) > + return ret; > + > + ret = _adxl367_set_odr(st, ADXL367_ODR_400HZ); > + if (ret) > + return ret; > + > + ret = _adxl367_set_act_time_ms(st, 10); > + if (ret) > + return ret; > + > + ret = _adxl367_set_inact_time_ms(st, 10000); > + if (ret) > + return ret; > + > + return adxl367_set_measure_en(st, true); > +} > + > +static void adxl367_disable_regulators(void *data) > +{ > + struct adxl367_state *st = data; > + > + regulator_bulk_disable(ARRAY_SIZE(st->regulators), st->regulators); > +} > + > +int adxl367_probe(struct device *dev, const struct adxl367_ops *ops, > + void *context, struct regmap *regmap, int irq) > +{ > + struct iio_dev *indio_dev; > + struct adxl367_state *st; > + int ret; > + > + indio_dev = devm_iio_device_alloc(dev, sizeof(*st)); > + if (!indio_dev) > + return -ENOMEM; > + > + st = iio_priv(indio_dev); > + st->dev = dev; > + st->regmap = regmap; > + st->context = context; > + st->ops = ops; > + > + mutex_init(&st->lock); > + > + indio_dev->channels = adxl367_channels; > + indio_dev->num_channels = ARRAY_SIZE(adxl367_channels); > + indio_dev->available_scan_masks = adxl367_channel_masks; > + indio_dev->name = "adxl367"; > + indio_dev->info = &adxl367_info; > + indio_dev->modes = INDIO_DIRECT_MODE; > + > + st->regulators[0].supply = "vdd"; > + st->regulators[1].supply = "vddio"; > + > + ret = devm_regulator_bulk_get(st->dev, ARRAY_SIZE(st->regulators), > + st->regulators); > + if (ret) > + return dev_err_probe(st->dev, ret, > + "Failed to get regulators\n"); > + > + ret = regulator_bulk_enable(ARRAY_SIZE(st->regulators), st->regulators); > + if (ret) > + return dev_err_probe(st->dev, ret, > + "Failed to enable regulators\n"); > + > + ret = devm_add_action_or_reset(st->dev, adxl367_disable_regulators, st); > + if (ret) > + return dev_err_probe(st->dev, ret, > + "Failed to add regulators disable action\n"); > + > + ret = adxl367_verify_devid(st); > + if (ret) > + return ret; > + > + ret = adxl367_reset(st); > + if (ret) > + return ret; > + > + ret = adxl367_setup(st); > + if (ret) > + return ret; > + > + ret = devm_iio_kfifo_buffer_setup_ext(st->dev, indio_dev, > + INDIO_BUFFER_SOFTWARE, > + &adxl367_buffer_ops, > + adxl367_fifo_attributes); > + if (ret) > + return ret; > + > + ret = devm_request_threaded_irq(st->dev, irq, NULL, > + adxl367_irq_handler, IRQF_ONESHOT, > + indio_dev->name, indio_dev); > + if (ret) > + return dev_err_probe(st->dev, ret, "Failed to request irq\n"); > + > + return devm_iio_device_register(dev, indio_dev); > +} > +EXPORT_SYMBOL_GPL(adxl367_probe); Something Andy raised in a recent review was that for cases like this we should be using the NS variants so that we move stuff used only between a smalls set of drivers into it's own namespace. I think it is an excellent idea, and will hopefully convert a few drivers over shortly. In the meantime it would be good to ensure no new drivers go in without using the NS support (EXPORT_SYMBOL_NS_GPL(adxl367_probe, adxl367) etc. > + > +MODULE_AUTHOR("Cosmin Tanislav <cosmin.tanislav@analog.com>"); > +MODULE_DESCRIPTION("Analog Devices ADXL367 3-axis accelerometer driver"); > +MODULE_LICENSE("GPL"); ^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-23 13:01 ` Jonathan Cameron @ 2021-12-27 13:00 ` Tanislav, Cosmin 2021-12-28 20:58 ` Jonathan Cameron 0 siblings, 1 reply; 11+ messages in thread From: Tanislav, Cosmin @ 2021-12-27 13:00 UTC (permalink / raw) To: Jonathan Cameron, Cosmin Tanislav Cc: Lars-Peter Clausen, Hennerich, Michael, Rob Herring, linux-iio, devicetree, linux-kernel > -----Original Message----- > From: Jonathan Cameron <jic23@kernel.org> > Sent: Thursday, December 23, 2021 3:02 PM > To: Cosmin Tanislav <demonsingur@gmail.com> > Cc: Tanislav, Cosmin <Cosmin.Tanislav@analog.com>; Lars-Peter Clausen > <lars@metafoo.de>; Hennerich, Michael <Michael.Hennerich@analog.com>; > Rob Herring <robh+dt@kernel.org>; linux-iio@vger.kernel.org; > devicetree@vger.kernel.org; linux-kernel@vger.kernel.org > Subject: Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver > > [External] > > On Fri, 17 Dec 2021 13:45:48 +0200 > Cosmin Tanislav <demonsingur@gmail.com> wrote: > > > The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. > > > > The ADXL367 does not alias input signals to achieve ultralow power > > consumption, it samples the full bandwidth of the sensor at all > > data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, > > with a resolution of 0.25mg/LSB on the +-2 g range. > > > > In addition to its ultralow power consumption, the ADXL367 > > has many features to enable true system level power reduction. > > It includes a deep multimode output FIFO, a built-in micropower > > temperature sensor, and an internal ADC for synchronous conversion > > of an additional analog input. > > > > Signed-off-by: Cosmin Tanislav <cosmin.tanislav@analog.com> > > A few comments and questions inline. > > Would definitely be helpful if the datasheet becomes available though > as would have saved some of the questions. > > Thanks, > > Jonathan I asked people internally about the possibility of sharing the datasheet publicly, but until after New Year we probably won't get a response. > > > > > diff --git a/drivers/iio/accel/adxl367.c b/drivers/iio/accel/adxl367.c > > new file mode 100644 > > index 000000000000..ce574f0446eb > > --- /dev/null > > +++ b/drivers/iio/accel/adxl367.c > > ... > > > + > > +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) > > +{ > > + unsigned int ev_dir; > > + > > + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) > > + ev_dir = IIO_EV_DIR_RISING; > > + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) > > + ev_dir = IIO_EV_DIR_FALLING; > > + else > > + return false; > > + > > + iio_push_event(indio_dev, > > + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, > IIO_MOD_X_OR_Y_OR_Z, > > + IIO_EV_TYPE_THRESH, ev_dir), > This is unusual for event detection as it's a simple or of separately > applied thresholds on X, Y and Z axes. Given the effect of gravity that > means you have to set the thresholds very wide. > > Also, I'd expect these to be magnitudes, not THRESH - no data sheet that > I can find though so can't be sure. > Actually, the chip has a referenced, and an absolute mode. We use reference mode in this driver, as configured in write_event_config. The motion detection details are about the same as ADXL362 (page 14). https://www.analog.com/media/en/technical-documentation/data-sheets/ADXL362.pdf > > + iio_get_time_ns(indio_dev)); > > + > > + return true; > > +} > > + > > +static bool adxl367_push_fifo_data(struct iio_dev *indio_dev, u8 status, > > + u16 fifo_entries) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + int ret; > > + int i; > > + > > + if (!FIELD_GET(ADXL367_STATUS_FIFO_FULL_MASK, status)) > > + return false; > > + > > + fifo_entries -= fifo_entries % st->fifo_set_size; > > + > > + ret = st->ops->read_fifo(st->context, st->fifo_buf, fifo_entries); > > + if (ret) > > + return false; > > Odd corner cases - it doesn't mean IRQ_NONE is appropriate I think... > Definitely print an error message if you hit this one but I think you should > still be returning that IRQ_HANDLED from the caller to avoid getting stuck. > IRQ_NONE doesn't mean error, it means a spurious IRQ. > > > + > > + for (i = 0; i < fifo_entries; i += st->fifo_set_size) > > + iio_push_to_buffers(indio_dev, &st->fifo_buf[i]); > > + > > + return true; > > +} > > > > + > > +static int adxl367_read_raw(struct iio_dev *indio_dev, > > + struct iio_chan_spec const *chan, > > + int *val, int *val2, long info) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + > > + switch (info) { > > + case IIO_CHAN_INFO_RAW: > > + return adxl367_read_sample(indio_dev, chan, val); > > + case IIO_CHAN_INFO_SCALE: > > + switch (chan->type) { > > + case IIO_ACCEL: > > + mutex_lock(&st->lock); > > + *val = adxl367_range_scale_tbl[st->range][0]; > > + *val2 = adxl367_range_scale_tbl[st->range][1]; > > + mutex_unlock(&st->lock); > > + return IIO_VAL_INT_PLUS_NANO; > > + case IIO_TEMP: > > + *val = 1; > > + *val2 = ADXL367_TEMP_PER_C; > > + return IIO_VAL_FRACTIONAL; > > Base units of temp channels are milli degrees C. Given naming here, this > looks > like it might be the scale factor to degrees C. > Always check Documentation/ABI/testing/sysfs-bus-iio. > Unfortunately for historical reasons some of the units are not > entirely obvious. > > > + case IIO_VOLTAGE: > > + *val = ADXL367_VOLTAGE_MAX_MV; > > + *val2 = ADXL367_VOLTAGE_MAX_RAW; > > + return IIO_VAL_FRACTIONAL; > > + default: > > + return -EINVAL; > > + } > > + case IIO_CHAN_INFO_OFFSET: > > + switch (chan->type) { > > + case IIO_TEMP: > > + *val = 25 * ADXL367_TEMP_PER_C - > ADXL367_TEMP_25C; > > + return IIO_VAL_INT; > > + case IIO_VOLTAGE: > > + *val = ADXL367_VOLTAGE_OFFSET; > > + return IIO_VAL_INT; > > + default: > > + return -EINVAL; > > + } > > + case IIO_CHAN_INFO_SAMP_FREQ: > > + mutex_lock(&st->lock); > > + *val = adxl367_samp_freq_tbl[st->odr][0]; > > + *val2 = adxl367_samp_freq_tbl[st->odr][1]; > > + mutex_unlock(&st->lock); > > + return IIO_VAL_INT_PLUS_MICRO; > > + default: > > + return -EINVAL; > > + } > > +} > > ... > > > +static int adxl367_read_event_config(struct iio_dev *indio_dev, > > + const struct iio_chan_spec *chan, > > + enum iio_event_type type, > > + enum iio_event_direction dir) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + bool en; > > + int ret; > > + > > + switch (dir) { > > + case IIO_EV_DIR_RISING: > > + ret = adxl367_get_act_interrupt_en(st, ADXL367_ACTIVITY, > &en); > > + return ret ?: en; > > + case IIO_EV_DIR_FALLING: > > + ret = adxl367_get_act_interrupt_en(st, > ADXL367_INACTIVITY, &en); > > + return ret ?: en; > > + default: > > + return -EINVAL; > > + } > > +} > > + > > +static int adxl367_write_event_config(struct iio_dev *indio_dev, > > + const struct iio_chan_spec *chan, > > + enum iio_event_type type, > > + enum iio_event_direction dir, > > + int state) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + enum adxl367_activity_type act; > > + int ret; > > + > > + switch (dir) { > > + case IIO_EV_DIR_RISING: > > + act = ADXL367_ACTIVITY; > > + break; > > + case IIO_EV_DIR_FALLING: > > + act = ADXL367_INACTIVITY; > > + break; > > + default: > > + return -EINVAL; > > + } > > + > > + ret = iio_device_claim_direct_mode(indio_dev); > > It's unusual (though not unheard of) to have events that cannot be enabled > at the same time as a fifo. If that's true here, please add some comments > to explain why. Or is this just about the impact of having to disable > the measurement to turn it on and the resulting interruption of data > capture? > > If so that needs more thought as we have a situation where you can (I think) > have events as long as you enable them before the fifo based capture is > started, > but cannot enable them after. > That is indeed the case. You mentioned in a previous patchset that various attributes could toggle measurement mode while the FIFO capture was running, so I checked all the possible places where that could happen and added claim direct mode. Not too nice, but it's the nature of the chip... > > + if (ret) > > + return ret; > > + > > + mutex_lock(&st->lock); > > + > > + ret = adxl367_set_measure_en(st, false); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_act_interrupt_en(st, act, state); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_act_en(st, act, state ? > ADCL367_ACT_REF_ENABLED > > + : ADXL367_ACT_DISABLED); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_measure_en(st, true); > > + > > +out: > > + mutex_unlock(&st->lock); > > + > > + iio_device_release_direct_mode(indio_dev); > > + > > + return ret; > > +} > > + > > > + > > +static ssize_t adxl367_get_fifo_watermark(struct device *dev, > > + struct device_attribute *attr, > > + char *buf) > > +{ > > + struct iio_dev *indio_dev = dev_to_iio_dev(dev); > > + struct adxl367_state *st = iio_priv(indio_dev); > Trivial but in cases where you don't need the indio_dev, it > is find to roll the above two lines into one as the function names > express the types so no information is lost. > > struct adxl367_state *st = iio_priv(dev_to_iio_dev(dev)); > > > + unsigned int fifo_watermark; > > + > > + mutex_lock(&st->lock); > > + fifo_watermark = st->fifo_watermark; > > + mutex_unlock(&st->lock); > > + > > + return sysfs_emit(buf, "%d\n", fifo_watermark); > > +} > ... > > + > > +static IIO_CONST_ATTR(hwfifo_watermark_min, "1"); > > +static IIO_CONST_ATTR(hwfifo_watermark_max, > > + __stringify(ADXL367_FIFO_MAX_WATERMARK)); > > +static IIO_DEVICE_ATTR(hwfifo_watermark, 0444, > > + adxl367_get_fifo_watermark, NULL, 0); > > +static IIO_DEVICE_ATTR(hwfifo_enabled, 0444, > > + adxl367_get_fifo_enabled, NULL, 0); > > + > > +static const struct attribute *adxl367_fifo_attributes[] = { > > + &iio_const_attr_hwfifo_watermark_min.dev_attr.attr, > > + &iio_const_attr_hwfifo_watermark_max.dev_attr.attr, > > + &iio_dev_attr_hwfifo_watermark.dev_attr.attr, > > + &iio_dev_attr_hwfifo_enabled.dev_attr.attr, > > + NULL, > > +}; > > ... > > > +static int adxl367_update_scan_mode(struct iio_dev *indio_dev, > > + const unsigned long *active_scan_mask) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + enum adxl367_fifo_format fifo_format; > > + unsigned int fifo_set_size; > > + int ret; > > + > > + if (!adxl367_find_mask_fifo_format(active_scan_mask, > &fifo_format)) > > + return -EINVAL; > > + > > + fifo_set_size = bitmap_weight(active_scan_mask, indio_dev- > >masklength); > > + > > + mutex_lock(&st->lock); > > + > > + ret = adxl367_set_measure_en(st, false); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_format(st, fifo_format); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_set_size(st, fifo_set_size); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_measure_en(st, true); > > + > > +out: > > + mutex_unlock(&st->lock); > > + > > + return ret; > > +} > > + > > +static int adxl367_buffer_preenable(struct iio_dev *indio_dev) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + > > + return adxl367_set_temp_adc_mask_en(st, indio_dev- > >active_scan_mask, > > + true); > > Why the logical separation of the channel enable to here and fifo setup to > post_enable? Reality is there is very little reason any more to have > separate preenable/posteenable. If there is a reason to do it here, please > add a comment to explain. > Is it because this needs to occur before update_scan_mode() is called? > > No particular reason, as far as I can remember. I think I was tired at the time. > > +} > > + > > +static int adxl367_buffer_postenable(struct iio_dev *indio_dev) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + int ret; > > + > > + mutex_lock(&st->lock); > > + > > + ret = adxl367_set_measure_en(st, false); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_watermark_interrupt_en(st, true); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_STREAM); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_measure_en(st, true); > > + > > +out: > > + mutex_unlock(&st->lock); > > + > > + return ret; > > +} > > + > > +static int adxl367_buffer_predisable(struct iio_dev *indio_dev) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + int ret; > > + > > + mutex_lock(&st->lock); > > + > > + ret = adxl367_set_measure_en(st, false); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_mode(st, ADXL367_FIFO_MODE_DISABLED); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_fifo_watermark_interrupt_en(st, false); > > + if (ret) > > + goto out; > > + > > + ret = adxl367_set_measure_en(st, true); > > + > > +out: > > + mutex_unlock(&st->lock); > > + > > + return ret; > > +} > > + > > +static int adxl367_buffer_postdisable(struct iio_dev *indio_dev) > > +{ > > + struct adxl367_state *st = iio_priv(indio_dev); > > + > > + return adxl367_set_temp_adc_mask_en(st, indio_dev- > >active_scan_mask, > > + false); > > +} > > + > > ... > > > > +static int adxl367_setup(struct adxl367_state *st) > > +{ > > + int ret; > > + > > + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, > > + ADXL367_2G_RANGE_1G); > > + if (ret) > > + return ret; > > + > > + ret = _adxl367_set_act_threshold(st, ADXL367_ACTIVITY, > > + ADXL367_2G_RANGE_100MG); > > Should one of this pair be inactivity? > Indeed. I must have replaced the correct variant somewhere along the line. > > + if (ret) > > + return ret; > > + > > + ret = adxl367_set_act_proc_mode(st, ADXL367_LOOPED); > > + if (ret) > > + return ret; > > + > > + ret = _adxl367_set_odr(st, ADXL367_ODR_400HZ); > > + if (ret) > > + return ret; > > + > > + ret = _adxl367_set_act_time_ms(st, 10); > > + if (ret) > > + return ret; > > + > > + ret = _adxl367_set_inact_time_ms(st, 10000); > > + if (ret) > > + return ret; > > + > > + return adxl367_set_measure_en(st, true); > > +} > > + > > +static void adxl367_disable_regulators(void *data) > > +{ > > + struct adxl367_state *st = data; > > + > > + regulator_bulk_disable(ARRAY_SIZE(st->regulators), st->regulators); > > +} > > + > > +int adxl367_probe(struct device *dev, const struct adxl367_ops *ops, > > + void *context, struct regmap *regmap, int irq) > > +{ > > + struct iio_dev *indio_dev; > > + struct adxl367_state *st; > > + int ret; > > + > > + indio_dev = devm_iio_device_alloc(dev, sizeof(*st)); > > + if (!indio_dev) > > + return -ENOMEM; > > + > > + st = iio_priv(indio_dev); > > + st->dev = dev; > > + st->regmap = regmap; > > + st->context = context; > > + st->ops = ops; > > + > > + mutex_init(&st->lock); > > + > > + indio_dev->channels = adxl367_channels; > > + indio_dev->num_channels = ARRAY_SIZE(adxl367_channels); > > + indio_dev->available_scan_masks = adxl367_channel_masks; > > + indio_dev->name = "adxl367"; > > + indio_dev->info = &adxl367_info; > > + indio_dev->modes = INDIO_DIRECT_MODE; > > + > > + st->regulators[0].supply = "vdd"; > > + st->regulators[1].supply = "vddio"; > > + > > + ret = devm_regulator_bulk_get(st->dev, ARRAY_SIZE(st- > >regulators), > > + st->regulators); > > + if (ret) > > + return dev_err_probe(st->dev, ret, > > + "Failed to get regulators\n"); > > + > > + ret = regulator_bulk_enable(ARRAY_SIZE(st->regulators), st- > >regulators); > > + if (ret) > > + return dev_err_probe(st->dev, ret, > > + "Failed to enable regulators\n"); > > + > > + ret = devm_add_action_or_reset(st->dev, > adxl367_disable_regulators, st); > > + if (ret) > > + return dev_err_probe(st->dev, ret, > > + "Failed to add regulators disable > action\n"); > > + > > + ret = adxl367_verify_devid(st); > > + if (ret) > > + return ret; > > + > > + ret = adxl367_reset(st); > > + if (ret) > > + return ret; > > + > > + ret = adxl367_setup(st); > > + if (ret) > > + return ret; > > + > > + ret = devm_iio_kfifo_buffer_setup_ext(st->dev, indio_dev, > > + INDIO_BUFFER_SOFTWARE, > > + &adxl367_buffer_ops, > > + adxl367_fifo_attributes); > > + if (ret) > > + return ret; > > + > > + ret = devm_request_threaded_irq(st->dev, irq, NULL, > > + adxl367_irq_handler, > IRQF_ONESHOT, > > + indio_dev->name, indio_dev); > > + if (ret) > > + return dev_err_probe(st->dev, ret, "Failed to request > irq\n"); > > + > > + return devm_iio_device_register(dev, indio_dev); > > +} > > +EXPORT_SYMBOL_GPL(adxl367_probe); > > Something Andy raised in a recent review was that for cases like this > we should be using the NS variants so that we move stuff used only between > a smalls set of drivers into it's own namespace. > > I think it is an excellent idea, and will hopefully convert a few drivers > over shortly. In the meantime it would be good to ensure no new drivers > go in without using the NS support > (EXPORT_SYMBOL_NS_GPL(adxl367_probe, adxl367) etc. > I'll do it for the next patchset. > > + > > +MODULE_AUTHOR("Cosmin Tanislav <cosmin.tanislav@analog.com>"); > > +MODULE_DESCRIPTION("Analog Devices ADXL367 3-axis accelerometer > driver"); > > +MODULE_LICENSE("GPL"); ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-27 13:00 ` Tanislav, Cosmin @ 2021-12-28 20:58 ` Jonathan Cameron 2022-01-10 22:43 ` Cosmin Tanislav 0 siblings, 1 reply; 11+ messages in thread From: Jonathan Cameron @ 2021-12-28 20:58 UTC (permalink / raw) To: Tanislav, Cosmin Cc: Cosmin Tanislav, Lars-Peter Clausen, Hennerich, Michael, Rob Herring, linux-iio, devicetree, linux-kernel Hi Cosmin, Happy New year for a few day's time. > > ... > > > > > + > > > +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) > > > +{ > > > + unsigned int ev_dir; > > > + > > > + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) > > > + ev_dir = IIO_EV_DIR_RISING; > > > + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) > > > + ev_dir = IIO_EV_DIR_FALLING; > > > + else > > > + return false; > > > + > > > + iio_push_event(indio_dev, > > > + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, > > IIO_MOD_X_OR_Y_OR_Z, > > > + IIO_EV_TYPE_THRESH, ev_dir), > > This is unusual for event detection as it's a simple or of separately > > applied thresholds on X, Y and Z axes. Given the effect of gravity that > > means you have to set the thresholds very wide. > > > > Also, I'd expect these to be magnitudes, not THRESH - no data sheet that > > I can find though so can't be sure. > > > > Actually, the chip has a referenced, and an absolute mode. We use reference mode > in this driver, as configured in write_event_config. > The motion detection details are about the same as ADXL362 (page 14). > https://www.analog.com/media/en/technical-documentation/data-sheets/ADXL362.pdf Interesting. We should figure out some way to make that clear to userspace given right now it has no way of knowing that and might set inappropriate limits without that information. It's kind of similar to some of the adaptive thresholds, just that it uses the value at a particular moment. Worth noting that for the adxl362 at least the maths is ABS(Acceleration - reference) > Threshold which is a magnitude not a threshold unless you want to represent it as a pair of thresholds (above and below) which gets fiddly as I assume there is only one control > > > > > + iio_get_time_ns(indio_dev)); > > > + > > > + return true; > > > +} ... > > > +static int adxl367_write_event_config(struct iio_dev *indio_dev, > > > + const struct iio_chan_spec *chan, > > > + enum iio_event_type type, > > > + enum iio_event_direction dir, > > > + int state) > > > +{ > > > + struct adxl367_state *st = iio_priv(indio_dev); > > > + enum adxl367_activity_type act; > > > + int ret; > > > + > > > + switch (dir) { > > > + case IIO_EV_DIR_RISING: > > > + act = ADXL367_ACTIVITY; > > > + break; > > > + case IIO_EV_DIR_FALLING: > > > + act = ADXL367_INACTIVITY; > > > + break; > > > + default: > > > + return -EINVAL; > > > + } > > > + > > > + ret = iio_device_claim_direct_mode(indio_dev); > > > > It's unusual (though not unheard of) to have events that cannot be enabled > > at the same time as a fifo. If that's true here, please add some comments > > to explain why. Or is this just about the impact of having to disable > > the measurement to turn it on and the resulting interruption of data > > capture? > > > > If so that needs more thought as we have a situation where you can (I think) > > have events as long as you enable them before the fifo based capture is > > started, > > but cannot enable them after. > > > > That is indeed the case. You mentioned in a previous patchset that various > attributes could toggle measurement mode while the FIFO capture was running, > so I checked all the possible places where that could happen and added claim > direct mode. Not too nice, but it's the nature of the chip... Hmm. I'm not sure what the right thing to do here is. Maybe we need a docs update to explicitly call out that this might happen for the event enables? Calling it out for all devices is fine because all we are doing is saying userspace would ideally cope with this situation and make the decision to disable the buffered mode if it wants to enable events then reenable it afterwards if that is what is desired. Jonathan ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2021-12-28 20:58 ` Jonathan Cameron @ 2022-01-10 22:43 ` Cosmin Tanislav 2022-01-15 17:50 ` Jonathan Cameron 0 siblings, 1 reply; 11+ messages in thread From: Cosmin Tanislav @ 2022-01-10 22:43 UTC (permalink / raw) To: Jonathan Cameron, Tanislav, Cosmin Cc: Lars-Peter Clausen, Hennerich, Michael, Rob Herring, linux-iio, devicetree, linux-kernel On 12/28/21 22:58, Jonathan Cameron wrote: > Hi Cosmin, > > Happy New year for a few day's time. > >>> ... >>> >>>> + >>>> +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) >>>> +{ >>>> + unsigned int ev_dir; >>>> + >>>> + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) >>>> + ev_dir = IIO_EV_DIR_RISING; >>>> + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) >>>> + ev_dir = IIO_EV_DIR_FALLING; >>>> + else >>>> + return false; >>>> + >>>> + iio_push_event(indio_dev, >>>> + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, >>> IIO_MOD_X_OR_Y_OR_Z, >>>> + IIO_EV_TYPE_THRESH, ev_dir), >>> This is unusual for event detection as it's a simple or of separately >>> applied thresholds on X, Y and Z axes. Given the effect of gravity that >>> means you have to set the thresholds very wide. >>> >>> Also, I'd expect these to be magnitudes, not THRESH - no data sheet that >>> I can find though so can't be sure. >>> >> >> Actually, the chip has a referenced, and an absolute mode. We use reference mode >> in this driver, as configured in write_event_config. >> The motion detection details are about the same as ADXL362 (page 14). >> https://www.analog.com/media/en/technical-documentation/data-sheets/ADXL362.pdf > > Interesting. We should figure out some way to make that clear to userspace > given right now it has no way of knowing that and might set inappropriate limits > without that information. > Any suggestions on how I should do this? > It's kind of similar to some of the adaptive thresholds, just that it uses > the value at a particular moment. > > Worth noting that for the adxl362 at least the maths is > ABS(Acceleration - reference) > Threshold which is a magnitude not a threshold > unless you want to represent it as a pair of thresholds (above and below) which > gets fiddly as I assume there is only one control > Indeed. I didn't catch onto the difference between magnitude and threshold. So, I should use IIO_EV_TYPE_MAG rather than IIO_EV_TYPE_THRESH? Or IIO_EV_TYPE_MAG_ADAPTIVE? The ABI doesn't describe these too well. >> >> >>>> + iio_get_time_ns(indio_dev)); >>>> + >>>> + return true; >>>> +} > > ... > >>>> +static int adxl367_write_event_config(struct iio_dev *indio_dev, >>>> + const struct iio_chan_spec *chan, >>>> + enum iio_event_type type, >>>> + enum iio_event_direction dir, >>>> + int state) >>>> +{ >>>> + struct adxl367_state *st = iio_priv(indio_dev); >>>> + enum adxl367_activity_type act; >>>> + int ret; >>>> + >>>> + switch (dir) { >>>> + case IIO_EV_DIR_RISING: >>>> + act = ADXL367_ACTIVITY; >>>> + break; >>>> + case IIO_EV_DIR_FALLING: >>>> + act = ADXL367_INACTIVITY; >>>> + break; >>>> + default: >>>> + return -EINVAL; >>>> + } >>>> + >>>> + ret = iio_device_claim_direct_mode(indio_dev); >>> >>> It's unusual (though not unheard of) to have events that cannot be enabled >>> at the same time as a fifo. If that's true here, please add some comments >>> to explain why. Or is this just about the impact of having to disable >>> the measurement to turn it on and the resulting interruption of data >>> capture? >>> >>> If so that needs more thought as we have a situation where you can (I think) >>> have events as long as you enable them before the fifo based capture is >>> started, >>> but cannot enable them after. >>> >> >> That is indeed the case. You mentioned in a previous patchset that various >> attributes could toggle measurement mode while the FIFO capture was running, >> so I checked all the possible places where that could happen and added claim >> direct mode. Not too nice, but it's the nature of the chip... > > Hmm. I'm not sure what the right thing to do here is. Maybe we need a docs update > to explicitly call out that this might happen for the event enables? Calling > it out for all devices is fine because all we are doing is saying userspace would > ideally cope with this situation and make the decision to disable the buffered > mode if it wants to enable events then reenable it afterwards if that is what > is desired. By docs you mean the ABI file? > > Jonathan > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 2/2] iio: accel: add ADXL367 driver 2022-01-10 22:43 ` Cosmin Tanislav @ 2022-01-15 17:50 ` Jonathan Cameron 0 siblings, 0 replies; 11+ messages in thread From: Jonathan Cameron @ 2022-01-15 17:50 UTC (permalink / raw) To: Cosmin Tanislav Cc: Tanislav, Cosmin, Lars-Peter Clausen, Hennerich, Michael, Rob Herring, linux-iio, devicetree, linux-kernel On Tue, 11 Jan 2022 00:43:25 +0200 Cosmin Tanislav <demonsingur@gmail.com> wrote: > On 12/28/21 22:58, Jonathan Cameron wrote: > > Hi Cosmin, > > > > Happy New year for a few day's time. > > > >>> ... > >>> > >>>> + > >>>> +static bool adxl367_push_event(struct iio_dev *indio_dev, u8 status) > >>>> +{ > >>>> + unsigned int ev_dir; > >>>> + > >>>> + if (FIELD_GET(ADXL367_STATUS_ACT_MASK, status)) > >>>> + ev_dir = IIO_EV_DIR_RISING; > >>>> + else if (FIELD_GET(ADXL367_STATUS_INACT_MASK, status)) > >>>> + ev_dir = IIO_EV_DIR_FALLING; > >>>> + else > >>>> + return false; > >>>> + > >>>> + iio_push_event(indio_dev, > >>>> + IIO_MOD_EVENT_CODE(IIO_ACCEL, 0, > >>> IIO_MOD_X_OR_Y_OR_Z, > >>>> + IIO_EV_TYPE_THRESH, ev_dir), > >>> This is unusual for event detection as it's a simple or of separately > >>> applied thresholds on X, Y and Z axes. Given the effect of gravity that > >>> means you have to set the thresholds very wide. > >>> > >>> Also, I'd expect these to be magnitudes, not THRESH - no data sheet that > >>> I can find though so can't be sure. > >>> > >> > >> Actually, the chip has a referenced, and an absolute mode. We use reference mode > >> in this driver, as configured in write_event_config. > >> The motion detection details are about the same as ADXL362 (page 14). > >> https://www.analog.com/media/en/technical-documentation/data-sheets/ADXL362.pdf > > > > Interesting. We should figure out some way to make that clear to userspace > > given right now it has no way of knowing that and might set inappropriate limits > > without that information. > > > > Any suggestions on how I should do this? *laughs* you caught be avoiding thinking about how we might do this. Going to need some new ABI that can be universal or per event. I think the best bet is probably to define something similar to adaptive_thresh in that we are saying it's a threshold / magnitude as appropriate but not on the raw underlying signal. We could potentially use adaptive again but maybe we need something more specific as that is used when the threshold tracks some low pass filtered version of the signal. Perhaps in_accel_x_referenced_magn_* with appropriate ABI docs that make it clear that for acceleration the point is to remove G, but leave it open what referenced might mean for other types of signal. > > > It's kind of similar to some of the adaptive thresholds, just that it uses > > the value at a particular moment. > > > > Worth noting that for the adxl362 at least the maths is > > ABS(Acceleration - reference) > Threshold which is a magnitude not a threshold > > unless you want to represent it as a pair of thresholds (above and below) which > > gets fiddly as I assume there is only one control > > > > Indeed. I didn't catch onto the difference between magnitude and > threshold. So, I should use IIO_EV_TYPE_MAG rather than > IIO_EV_TYPE_THRESH? Or IIO_EV_TYPE_MAG_ADAPTIVE? The ABI doesn't > describe these too well. Well for what we have today it would be IIO_EV_TYPE_MAG. Roughly speaking (there are varriants that are similar enough we don't distinguish). IIO_EV_TYPE_THRESH is signed comparison. If you happen to have a signal that is always positive (e.g. an ADC) then it's preferred of IIO_EV_TYPE_MAGN even though they would be the same thing. So if you have an accelerometer that does -10m/sec^2 to 10m/sec^2 a rising threshold detector at 5m/sec^2 would only trigger when we pass 5m/sec^2 heading upwards towards 6, but not when passing -5m/sec^2 heading for -6m/sec^2. Magn is basically a threshold applied to the absolute of the reading so a rising magn threshold would fire on both passing 5m/sec^2 heading for 6m/sec^2 and on passing -5m/sec^2 heading for -6m/sec^2. The adaptive variants are more fun in that rather than applying to the raw signal they 'typically' apply relative to some filtered version of that raw signal (normally Low pass filtered). The idea is to detect a sudden absolute change but ignore a slow drift. So filter on signal - LowPass(signal) with same thresh vs magn rules as above. > > >> > >> > >>>> + iio_get_time_ns(indio_dev)); > >>>> + > >>>> + return true; > >>>> +} > > > > ... > > > >>>> +static int adxl367_write_event_config(struct iio_dev *indio_dev, > >>>> + const struct iio_chan_spec *chan, > >>>> + enum iio_event_type type, > >>>> + enum iio_event_direction dir, > >>>> + int state) > >>>> +{ > >>>> + struct adxl367_state *st = iio_priv(indio_dev); > >>>> + enum adxl367_activity_type act; > >>>> + int ret; > >>>> + > >>>> + switch (dir) { > >>>> + case IIO_EV_DIR_RISING: > >>>> + act = ADXL367_ACTIVITY; > >>>> + break; > >>>> + case IIO_EV_DIR_FALLING: > >>>> + act = ADXL367_INACTIVITY; > >>>> + break; > >>>> + default: > >>>> + return -EINVAL; > >>>> + } > >>>> + > >>>> + ret = iio_device_claim_direct_mode(indio_dev); > >>> > >>> It's unusual (though not unheard of) to have events that cannot be enabled > >>> at the same time as a fifo. If that's true here, please add some comments > >>> to explain why. Or is this just about the impact of having to disable > >>> the measurement to turn it on and the resulting interruption of data > >>> capture? > >>> > >>> If so that needs more thought as we have a situation where you can (I think) > >>> have events as long as you enable them before the fifo based capture is > >>> started, > >>> but cannot enable them after. > >>> > >> > >> That is indeed the case. You mentioned in a previous patchset that various > >> attributes could toggle measurement mode while the FIFO capture was running, > >> so I checked all the possible places where that could happen and added claim > >> direct mode. Not too nice, but it's the nature of the chip... > > > > Hmm. I'm not sure what the right thing to do here is. Maybe we need a docs update > > to explicitly call out that this might happen for the event enables? Calling > > it out for all devices is fine because all we are doing is saying userspace would > > ideally cope with this situation and make the decision to disable the buffered > > mode if it wants to enable events then reenable it afterwards if that is what > > is desired. > > By docs you mean the ABI file? Yup. Jonathan > > > > > Jonathan > > > > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v3 0/2] Add ADXL367 driver 2021-12-17 11:45 [PATCH v3 0/2] Add ADXL367 driver Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 1/2] dt-bindings: iio: accel: add ADXL367 Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 2/2] iio: accel: add ADXL367 driver Cosmin Tanislav @ 2021-12-17 13:48 ` Cosmin Tanislav 2 siblings, 0 replies; 11+ messages in thread From: Cosmin Tanislav @ 2021-12-17 13:48 UTC (permalink / raw) Cc: cosmin.tanislav, Lars-Peter Clausen, Michael Hennerich, Rob Herring, linux-iio, devicetree, linux-kernel V2 -> V3 * limit number of fifo entries read to multiple of set size to avoid data unalignment On 12/17/21 13:45, Cosmin Tanislav wrote: > The ADXL367 is an ultralow power, 3-axis MEMS accelerometer. > > The ADXL367 does not alias input signals to achieve ultralow power > consumption, it samples the full bandwidth of the sensor at all > data rates. Measurement ranges of +-2g, +-4g, and +-8g are available, > with a resolution of 0.25mg/LSB on the +-2 g range. > > In addition to its ultralow power consumption, the ADXL367 > has many features to enable true system level power reduction. > It includes a deep multimode output FIFO, a built-in micropower > temperature sensor, and an internal ADC for synchronous conversion > of an additional analog input. > > V1 -> V2 > * add support for vdd and vddio supplies > * lock fifo_watermark retrieval > * fix indentation of sysfs_emit for fifo_mode > * dt-bindings: add spi-max-frequency: true > * dt-bindings: remove cs-gpios property > * dt-bindings: remove status property > * dt-bindings: add support for vdd > > V2 -> V3 > * MAINTAINERS: use wildcard for adxl367 > * dt-bindings: adxl367@addr -> accelerometer@addr > * put asm include after linux includes > * drop registers accessed implicitly > * fifo_full -> fifo_watermark > * print expected device id > * remove INDIO_BUFFER_HARDWARE > * inline ADXL367_EVENT macro > * inline ADXL367_14BIT_SCAN_INFO > * inline regulator enum > * remove of.h in spi driver > * cast const void * to const u8 * in spi read > * switch to trigger-less buffer > * increase reset time as advised by hardware team > * let iio framework validate available channel masks > * enable adc or temp channel automatically on single read > * wait for 100ms after enabling adc or temp for output > to settle on single read (waiting on hardware team input) > * enable adc or temp channel automatically on buffered read > * claim direct mode when setting range > * claim direct mode when setting odr > * claim direct mode when setting event config > * sort status masks in descending bit order > * hardcode indio_dev name > * add some comments regarding spi message layout > * use bulk_write for activity and inactivity threshold > * use bulk_write for inactivity time > * use bool as return type of fifo format finding function > * remove shift from channels scan type > > Cosmin Tanislav (2): > dt-bindings: iio: accel: add ADXL367 > iio: accel: add ADXL367 driver > > .../bindings/iio/accel/adi,adxl367.yaml | 79 + > MAINTAINERS | 8 + > drivers/iio/accel/Kconfig | 27 + > drivers/iio/accel/Makefile | 3 + > drivers/iio/accel/adxl367.c | 1617 +++++++++++++++++ > drivers/iio/accel/adxl367.h | 23 + > drivers/iio/accel/adxl367_i2c.c | 89 + > drivers/iio/accel/adxl367_spi.c | 163 ++ > 8 files changed, 2009 insertions(+) > create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl367.yaml > create mode 100644 drivers/iio/accel/adxl367.c > create mode 100644 drivers/iio/accel/adxl367.h > create mode 100644 drivers/iio/accel/adxl367_i2c.c > create mode 100644 drivers/iio/accel/adxl367_spi.c > ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2022-01-15 17:45 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-12-17 11:45 [PATCH v3 0/2] Add ADXL367 driver Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 1/2] dt-bindings: iio: accel: add ADXL367 Cosmin Tanislav 2021-12-17 11:45 ` [PATCH v3 2/2] iio: accel: add ADXL367 driver Cosmin Tanislav 2021-12-17 16:29 ` kernel test robot 2021-12-17 16:29 ` kernel test robot 2021-12-23 13:01 ` Jonathan Cameron 2021-12-27 13:00 ` Tanislav, Cosmin 2021-12-28 20:58 ` Jonathan Cameron 2022-01-10 22:43 ` Cosmin Tanislav 2022-01-15 17:50 ` Jonathan Cameron 2021-12-17 13:48 ` [PATCH v3 0/2] Add " Cosmin Tanislav
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.