iio: accel: Add support for the Bosch-Sensortec BMI088
PATCH 1/1 iio: accel: Add support for the Bosch-Sensortec BMI088
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
--- drivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 681 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 100 ++++ drivers/iio/accel/bmi088-accel.h | 11 + 5 files changed, 811 insertions(+) create mode 100644 drivers/iio/accel/bmi088-accel-core.c create mode 100644 drivers/iio/accel/bmi088-accel-spi.c create mode 100644 drivers/iio/accel/bmi088-accel.h
drivers/iio/accel/Kconfig +17 -0
@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2C
drivers/iio/accel/Makefile +2 -0
@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.o
drivers/iio/accel/bmi088-accel-core.c new file +681 -0
681 lines not on this page · raw message
drivers/iio/accel/bmi088-accel-spi.c new file +100 -0
100 lines not on this page · raw message
drivers/iio/accel/bmi088-accel.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
Signature · 1 line
2.17.1
Jonathan Cameron
maintainerQuoted 3 lines · On Fri, 13 Mar 2020 15:04:15 +0100 Mike Looijmans <[email protected]>…
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
There doesn't seem to be a specific compatible entry in the bmg160 driver. Perhaps we should look to add one?
Quoted 2 lines
Signed-off-by Mike Looijmans <[email protected]>
For a modern driver I'd normally expect to also see DT bindings. How are you probing this?
There is a lot of half implemented code for features that I assume will follow in later patches. Please rip all that out for now. A simple initial driver is great but must only include the stuff it actually uses.
Thanks,
Jonathan
Quoted 190 lines
--- drivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 681 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 100 ++++ drivers/iio/accel/bmi088-accel.h | 11 + 5 files changed, 811 insertions(+) create mode 100644 drivers/iio/accel/bmi088-accel-core.c create mode 100644 drivers/iio/accel/bmi088-accel-spi.c create mode 100644 drivers/iio/accel/bmi088-accel.hdrivers/iio/accel/Kconfig +17
-0@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2Cdrivers/iio/accel/Makefile +2
-0@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.odrivers/iio/accel/bmi088-accel-core.c new file +132
-0@@ -0,0 +1,681 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018, Topic Embedded Products +*/ + +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/events.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +#define BMI088_ACCEL_DRV_NAME "bmi088_accel" +#define BMI088_ACCEL_IRQ_NAME "bmi088_accel_event" + +#define BMI088_ACCEL_REG_CHIP_ID 0x00 + +#define BMI088_ACCEL_REG_INT_STATUS 0x1D +#define BMI088_ACCEL_INT_STATUS_BIT_DRDY BIT(7) + +#define BMI088_ACCEL_REG_RESET 0x7E +#define BMI088_ACCEL_RESET_VAL 0xB6 + +#define BMI088_ACCEL_REG_PWR_CTRL 0x7D +#define BMI088_ACCEL_REG_PWR_CONF 0x7C + +#define BMI088_ACCEL_REG_INT_MAP_DATA 0x58 +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT1_DRDY BIT(2) +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT2_FWM BIT(5) + +#define BMI088_ACCEL_REG_INT1_IO_CONF 0x53 +#define BMI088_ACCEL_INT1_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT1_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_INT2_IO_CONF 0x54 +#define BMI088_ACCEL_INT2_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT2_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_ACC_CONF 0x40 +#define BMI088_ACCEL_REG_ACC_RANGE 0x41 +#define BMI088_ACCEL_RANGE_3G 0x00 +#define BMI088_ACCEL_RANGE_6G 0x01 +#define BMI088_ACCEL_RANGE_12G 0x02 +#define BMI088_ACCEL_RANGE_24G 0x03 + +#define BMI088_ACCEL_REG_TEMP 0x22 +#define BMI088_ACCEL_TEMP_CENTER_VAL 23 +#define BMI088_ACCEL_TEMP_UNIT 125 + +#define BMI088_ACCEL_REG_XOUT_L 0x12 +#define BMI088_ACCEL_AXIS_TO_REG (axis) \ + (BMI088_ACCEL_REG_XOUT_L + (axis * 2)) + +#define BMI088_ACCEL_MAX_STARTUP_TIME_MS 1 + +#define BMI088_ACCEL_REG_FIFO_STATUS 0x0E +#define BMI088_ACCEL_REG_FIFO_CONFIG0 0x48 +#define BMI088_ACCEL_REG_FIFO_CONFIG1 0x49 +#define BMI088_ACCEL_REG_FIFO_DATA 0x3F +#define BMI088_ACCEL_FIFO_LENGTH 100 + +#define BMI088_ACCEL_FIFO_MODE_FIFO 0x40 +#define BMI088_ACCEL_FIFO_MODE_STREAM 0x80 + +enum bmi088_accel_axis { +AXIS_X , +AXIS_Y , +AXIS_Z , +AXIS_MAX , +}; + +enum bmi088_power_modes { +BMI088_ACCEL_MODE_ACTIVE , +BMI088_ACCEL_MODE_SUSPEND , +}; + +/* Available OSR (over sampling rate) */ +enum bmi088_osr_modes { +BMI088_ACCEL_MODE_OSR_NORMAL =0xA , +BMI088_ACCEL_MODE_OSR_2 =0x9 , +BMI088_ACCEL_MODE_OSR_4 =0x8 , +}; + +/* Available ODR (output data rates) in Hz */ +enum bmi088_odr_modes { +BMI088_ACCEL_MODE_ODR_12_5 =0x5 , +BMI088_ACCEL_MODE_ODR_25 =0x6 , +BMI088_ACCEL_MODE_ODR_50 =0x7 , +BMI088_ACCEL_MODE_ODR_100 =0x8 , +BMI088_ACCEL_MODE_ODR_200 =0x9 , +BMI088_ACCEL_MODE_ODR_400 =0xa , +BMI088_ACCEL_MODE_ODR_800 =0xb , +BMI088_ACCEL_MODE_ODR_1600 =0xc , +}; + +struct bmi088_scale_info { +int scale; +u8 reg_range; +}; + +struct bmi088_accel_chip_info { +const char *name; +u8 chip_id; +const struct iio_chan_spec *channels; +int num_channels; +const struct bmi088_scale_info scale_table[4 ]; +}; + +struct bmi088_accel_interrupt { +const struct bmi088_accel_interrupt_info *info; +atomic_t users; +}; + + +enum bmi088_accel_interrupt_id { +BMI088_ACCEL_INT_DATA_READY , +BMI088_ACCEL_INT_FIFO_WATERMARK , +BMI088_ACCEL_INTERRUPTS ,
drivers/iio/accel/bmi088-accel-core.c line 142
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+}; + +struct bmi088_accel_data { +struct regmap *regmap; +int irq; +struct bmi088_accel_interrupt interrupts[BMI088_ACCEL_INTERRUPTS ]; +struct iio_trigger *dready_trig; +struct mutex mutex; +u8 fifo_mode, watermark; +s16 buffer[8 ];
Not used. Please clear out all the parts you aren't currently using and bring them in when they can be reviewed alongside the code adding the feature that needs them.
Quoted 70 lines
drivers/iio/accel/bmi088-accel-core.c new file +70
-0+u8 bw_bits; +int ev_enable_state; +int64_t timestamp, old_timestamp;/* Only used in hw fifo mode. */ +const struct bmi088_accel_chip_info *chip_info; +}; + +const struct regmap_config bmi088_regmap_conf = { + .reg_bits =8 , + .val_bits =8 , + .max_register =0x7E , +}; +EXPORT_SYMBOL_GPL (bmi088_regmap_conf); + + +static int bmi088_accel_enable (struct bmi088_accel_data *data, +bool on_off) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CTRL , + on_off ?0x4 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_PWR_CTRL reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_set_mode (struct bmi088_accel_data *data, +enum bmi088_power_modes mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CONF , + mode ==BMI088_ACCEL_MODE_SUSPEND ?0x3 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_set_bw (struct bmi088_accel_data *data, +enum bmi088_odr_modes odr_mode, +enum bmi088_osr_modes osr_mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value = (osr_mode <<4 ) | (odr_mode &0xF ); + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_CONF , value); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_get_bw (struct bmi088_accel_data *data,int *val, +int *val2) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +unsigned int value; +
drivers/iio/accel/bmi088-accel-core.c line 222
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ ret =regmap_read (data->regmap,BMI088_ACCEL_REG_ACC_CONF , + &value); +if (ret <0 ) { +dev_err (dev,"Error reading ACC_CONF reg\n" ); +mutex_unlock (&data->mutex); +return ret; + } + + *val = (value &0xF );/* ODR */ + *val2 = (value >>4 );/* OSR */
Superficially it seems unlikely that will map directly to the IIO defined ABI. See docs ref below.
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c new file +4
-0+ +return 0 ; +} +
drivers/iio/accel/bmi088-accel-core.c line 236
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value[2 ]; +unsigned int temp; + +mutex_lock (&data->mutex); + +/* Read temp reg MSB */
Seems likely it's reading the whole thing..
drivers/iio/accel/bmi088-accel-core.c line 238
Quoted 2 lines
drivers/iio/accel/bmi088-accel-core.c new file +2
-0+ ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &value,sizeof (value));
Buffers to regmap_bulk_read need to be DMA safe. No buffer on the stack is. Look at how we do it in other drivers with __cacheline_aligned within the structure behind iio_priv.
drivers/iio/accel/bmi088-accel-core.c line 245
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+if (ret <0 ) { +dev_err (dev,"Error reading BMI088_ACCEL_REG_TEMP\n" ); +mutex_unlock (&data->mutex); +return ret; + } + temp = (unsigned int )value[0 ] <<3 ; + temp |= (value[1 ] >>5 );
this looks like an endian conversion with a shift after? Please do it as that, rather than explicitly. On some hosts the endian conversion will be a noop.
Quoted 42 lines
drivers/iio/accel/bmi088-accel-core.c new file +42
-0+ +if (temp >1023 ) + *val = temp -2028 ; +else + *val = temp; + +mutex_unlock (&data->mutex); + +return IIO_VAL_INT ; +} + +static int bmi088_accel_get_axis (struct bmi088_accel_data *data, +struct iio_chan_spec const *chan, +int *val) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +int axis = chan->scan_index; +__le16 raw_val; + +mutex_lock (&data->mutex); + + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_AXIS_TO_REG (axis), + &raw_val,sizeof (raw_val)); +if (ret <0 ) { +dev_err (dev,"Error reading axis %d\n" , axis); +mutex_unlock (&data->mutex); +return ret; + } + *val =sign_extend32 (le16_to_cpu (raw_val) >> chan->scan_type.shift, + chan->scan_type.realbits -1 ); + +mutex_unlock (&data->mutex); + +return IIO_VAL_INT ; +} + +static int bmi088_accel_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev);
drivers/iio/accel/bmi088-accel-core.c line 297
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+int ret; +unsigned int range; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +switch (chan->type) { +case IIO_TEMP : +return bmi088_accel_get_temp (data, val); +case IIO_ACCEL : +if (iio_buffer_enabled (indio_dev))
We have iio_device_claim_direct_mode and friends
to safely protect against a transition in mode during a sysfs read.
drivers/iio/accel/bmi088-accel-core.c line 309
Quoted 12 lines
drivers/iio/accel/bmi088-accel-core.c new file +12
-0+return -EBUSY ; + + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , &range); +if (ret <0 ) +return ret; + + ret =bmi088_accel_get_axis (data, chan, val); +if (ret <0 ) +return ret; + + *val = (*val *3 *980 * (0x01 << range)) >>15 ;
Rather feels like you are applying some scaling here that should be left to userspace. When you add buffered support you won't want to do this and hence you'll end up with an inconsistent interface if you do it the sysfs path.
Quoted 13 lines
drivers/iio/accel/bmi088-accel-core.c new file +13
-0+ +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +switch (chan->type) { +case IIO_TEMP : + *val =BMI088_ACCEL_TEMP_CENTER_VAL ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + }
drivers/iio/accel/bmi088-accel-core.c line 332
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+case IIO_CHAN_INFO_SCALE : + *val =0 ; +switch (chan->type) { +case IIO_TEMP : + *val =BMI088_ACCEL_TEMP_UNIT ; +return IIO_VAL_INT ; +case IIO_ACCEL : + { + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , val);
Feels unlikely that that is is returning an appropriate value for scale. See the ABI docs
Documentation/ABI/testing/sysfs-bus-iio*
Quoted 52 lines
drivers/iio/accel/bmi088-accel-core.c new file +52
-0+if (ret <0 ) { +dev_err (&indio_dev->dev, +"%s(): Read from device failed(%d)\n" , + __func__, ret); +return -EINVAL ; + } + +return IIO_VAL_INT ; + } +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_get_bw (data, val, val2); +mutex_unlock (&data->mutex); +return ret; +default : +return -EINVAL ; + } +} + +static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_set_bw (data, val, val2); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 800 1600"); + +static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL , +}; + +static const struct attribute_group bmi088_accel_attrs_group = { + .attrs = bmi088_accel_attributes, +};
drivers/iio/accel/bmi088-accel-core.c line 394
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ +#define BMI088_ACCEL_CHANNEL (_axis, bits) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = IIO_MOD_##_axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = AXIS_##_axis, \ + .scan_type = { \
bring this in only when you add buffered support.
Quoted 18 lines
drivers/iio/accel/bmi088-accel-core.c new file +18
-0+ .sign = 's', \ + .realbits = (bits), \ + .storagebits = 16, \ + .shift = 16 - (bits), \ + .endianness = IIO_LE, \ + }, \ +} + +#define BMI088_ACCEL_CHANNELS (bits) { \ + { \ + .type = IIO_TEMP, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .scan_index = -1, \ + }, \ + BMI088_ACCEL_CHANNEL(X, bits), \ + BMI088_ACCEL_CHANNEL(Y, bits), \
drivers/iio/accel/bmi088-accel-core.c line 422
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ BMI088_ACCEL_CHANNEL(Z, bits), \ + IIO_CHAN_SOFT_TIMESTAMP(3), \ +} + +static const struct iio_chan_spec bmi088_accel_channels[] = +BMI088_ACCEL_CHANNELS (16 ); + +static const struct bmi088_accel_chip_info bmi088_accel_chip_info_tbl[] = { + [0 ] = { + .name ="BMI088A" ,
lower case for names in the sysfs interface (not sure that's actually documented anywhere though... :(
drivers/iio/accel/bmi088-accel-core.c line 429
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+ .chip_id = 0x1E, + .channels = bmi088_accel_channels, + .num_channels = ARRAY_SIZE(bmi088_accel_channels), + .scale_table = { {9610, BMI088_ACCEL_RANGE_3G}, + {19122, BMI088_ACCEL_RANGE_6G}, + {38344, BMI088_ACCEL_RANGE_12G}, + {76590, BMI088_ACCEL_RANGE_24G} },
bring the scale table in when you support using it.
Quoted 18 lines
drivers/iio/accel/bmi088-accel-core.c new file +18
-0+ }, +}; + +static const struct iio_info bmi088_accel_info = { + .attrs = &bmi088_accel_attrs_group, + .read_raw = bmi088_accel_read_raw, + .write_raw = bmi088_accel_write_raw, +}; + +static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 }; + + + +#ifdef CONFIG_PM +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on)
drivers/iio/accel/bmi088-accel-core.c line 456
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + +if (on) { + ret =pm_runtime_get_sync (dev); + }else { +pm_runtime_mark_last_busy (dev); + ret =pm_runtime_put_autosuspend (dev);
Seems you are using autosuspend which is good. However, I'm not seeing the setup of times etc that I'd expect to see in probe.
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+ } + +if (ret <0 ) { +dev_err (dev,"Failed: %s(%d)\n" , __func__, on); +if (on) +pm_runtime_put_noidle (dev);
drivers/iio/accel/bmi088-accel-core.c line 472
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ + return ret; + } + +return 0 ; +} +#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{
Hmm. It's a bit irritating that not all the of the runtime_pm calls are safe when it's not built. I guess a few might have unexpected results as 'do nothing' isn't always the right option.
drivers/iio/accel/bmi088-accel-core.c line 484
Quoted 12 lines
drivers/iio/accel/bmi088-accel-core.c new file +12
-0+ return 0; +} +#endif + +static int bmi088_accel_chip_init (struct bmi088_accel_data *data) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret, i; +unsigned int val; + +/* Do a dummy read (of chip ID), to enable SPI interface */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val);
Given this is in the generic code, not the SPI code, should probably put something about "if SPI in use, does no harm otherwise".
Quoted 46 lines
drivers/iio/accel/bmi088-accel-core.c new file +46
-0+ +/* +* Reset chip to get it in a known good state. A delay of 1ms after +* reset is required according to the data sheet +*/ +regmap_write (data->regmap,BMI088_ACCEL_REG_RESET , +BMI088_ACCEL_RESET_VAL ); +usleep_range (1000 ,2000 ); + +/* Do a dummy read (of chip ID), to enable SPI interface after reset */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); + +/* Read chip ID */ + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); +if (ret <0 ) { +dev_err (dev,"Error: Reading chip id\n" ); +return ret; + } + +/* Validate chip ID */ +dev_dbg (dev,"Chip Id %x\n" , val); +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } + +if (!data->chip_info) { +dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + } + +/* Set Active mode (and wait for 5ms) */ + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (5000 ,10000 ); + +/* Enable accelerometer */ + ret =bmi088_accel_enable (data, true); +if (ret <0 ) +return ret; + +/* Set Bandwidth */
drivers/iio/accel/bmi088-accel-core.c line 540
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ ret =bmi088_accel_set_bw (data,BMI088_ACCEL_MODE_ODR_100 , +BMI088_ACCEL_MODE_OSR_NORMAL ); +if (ret <0 ) +return ret; + +/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_RANGE\n" );
In consistent. Either have dev_err for all such cases, or none. I'm perfectly happy with either, but not a mixture :)
Quoted 23 lines
drivers/iio/accel/bmi088-accel-core.c new file +23
-0+return ret; + } + +return 0 ; +} + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap, +int irq,const char *name,bool block_supported) +{ +struct bmi088_accel_data *data; +struct iio_dev *indio_dev; +int ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +dev_set_drvdata (dev, indio_dev); + data->irq = irq; + + data->regmap = regmap; +
drivers/iio/accel/bmi088-accel-core.c line 573
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ ret =bmi088_accel_chip_init (data); +if (ret <0 ) +return ret; + +mutex_init (&data->mutex); + + indio_dev->dev.parent = dev; + indio_dev->channels = data->chip_info->channels; + indio_dev->num_channels = data->chip_info->num_channels; + indio_dev->name = name ? name : data->chip_info->name;
Should probably always be the chip_info->name. If not, please add a comment saying why not.
drivers/iio/accel/bmi088-accel-core.c line 578
Quoted 5 lines
drivers/iio/accel/bmi088-accel-core.c new file +5
-0+ indio_dev->available_scan_masks = bmi088_accel_scan_masks; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->info = &bmi088_accel_info; + +if (ret <0 ) {
Seems like you are currently missing the buffered setup.
Quoted 14 lines
drivers/iio/accel/bmi088-accel-core.c new file +14
-0+dev_err (dev,"Failed: iio triggered buffer setup\n" ); +return ret; + } + + ret =iio_device_register (indio_dev); +if (ret <0 ) { +dev_err (dev,"Unable to register iio device\n" ); +iio_trigger_unregister (data->dready_trig); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_probe); +
drivers/iio/accel/bmi088-accel-core.c line 602
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+int bmi088_accel_core_remove (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +iio_device_unregister (indio_dev); + +pm_runtime_disable (dev); +pm_runtime_set_suspended (dev); +pm_runtime_put_noidle (dev);
This runtime PM stuff doesn't clearly match with undoing stuff set up in probe.
drivers/iio/accel/bmi088-accel-core.c line 612
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +mutex_unlock (&data->mutex); + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_remove); + +#ifdef CONFIG_PM_SLEEP
Change to marking these __maybe_unused. The dance with CONFIG_PM* goes wrong too often so these days it's preferred to just let the compiler / linker deal with these functions not being used if they are never called.
drivers/iio/accel/bmi088-accel-core.c line 619
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+static int bmi088_accel_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND );
Is it worth going further for suspend / resume and looking at whether some of the power supplies can be disabled?
Note that you'd need regulator support to do that.
The first patch we get to almost every driver is when someone finds
they need to add regulator enable / disable for their board. Easier to
add it from the start if you are happy to do so.
Quoted 16 lines
drivers/iio/accel/bmi088-accel-core.c new file +16
-0+mutex_unlock (&data->mutex); + +return 0 ; +} + +static int bmi088_accel_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +mutex_unlock (&data->mutex); + +return 0 ; +}
drivers/iio/accel/bmi088-accel-core.c line 645
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+#endif + +#ifdef CONFIG_PM +static int bmi088_accel_runtime_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +dev_dbg (dev, __func__);
Drop these as no useful information that can't be obtained via numerous other methods (ftrace etc)
drivers/iio/accel/bmi088-accel-core.c line 648
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +if (ret <0 ) +return -EAGAIN ;
I'd like a comment for this to explain why we might want to back off and try again.
Quoted 39 lines
drivers/iio/accel/bmi088-accel-core.c new file +33
-0+ +return 0 ; +} + +static int bmi088_accel_runtime_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +dev_dbg (dev, __func__); + + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 , +BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 *2 ); + +return 0 ; +} +#endif + +const struct dev_pm_ops bmi088_accel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(bmi088_accel_suspend, bmi088_accel_resume) +SET_RUNTIME_PM_OPS (bmi088_accel_runtime_suspend, + bmi088_accel_runtime_resume,NULL ) +}; +EXPORT_SYMBOL_GPL (bmi088_accel_pm_ops); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (core)" );drivers/iio/accel/bmi088-accel-spi.c new file +0
-0
drivers/iio/accel/bmi088-accel-spi.c line 6
Quoted 6 lines
drivers/iio/accel/bmi088-accel-spi.c new file +6
-0@@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018, Topic Embedded Products
Probably change that to 2018-2020 given at least some changes are going to come out of this review :)
drivers/iio/accel/bmi088-accel-spi.c line 11
Quoted 5 lines
drivers/iio/accel/bmi088-accel-spi.c new file +5
-0+*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/acpi.h>
Why acpi header?
drivers/iio/accel/bmi088-accel-spi.c line 13
Quoted 2 lines
drivers/iio/accel/bmi088-accel-spi.c new file +2
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h>
I don't think either of iio headers is used in this file.
Quoted 26 lines
drivers/iio/accel/bmi088-accel-spi.c new file +26
-0+#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +int bmi088_regmap_spi_write (void *context,const void *data,size_t count) +{ +struct spi_device *spi = context; +u8 buf[count]; + +memcpy (buf, data, count); + +dev_dbg (&spi->dev,"Write val: %x to reg: %x\n" , buf[1 ], buf[0 ]); + +/* +* The SPI register address (= full register address without bit 7) +* and the write command (bit7 = RW = '0') +*/ + buf[0 ] &= ~0x80 ; + +return spi_write (spi, buf, count); +} + +int bmi088_regmap_spi_read (void *context,const void *reg, +size_t reg_size,void *val,size_t val_size) +{
drivers/iio/accel/bmi088-accel-spi.c line 49
Quoted 10 lines
drivers/iio/accel/bmi088-accel-spi.c new file +10
-0+struct spi_device *spi = context; +u8 addr[reg_size +1 ]; + + addr[0 ] = *(u8 *)reg; + +dev_dbg (&spi->dev,"Read reg: %x\n" , addr[0 ]); + + addr[0 ] |=0x80 ;/* bit7 = RW = '1' */ + +/* Do a write of 2 to mimic the dummy byte (see datasheet) */
So I'm guessing reg_size is always 1. Hence the 2. I'd make that explicit in this code, perhaps with a sanity check on reg_size. That will make the comment more obviously reflect what is happening.
Quoted 68 lines
drivers/iio/accel/bmi088-accel-spi.c new file +51
-0+return spi_write_then_read (spi, addr,sizeof (addr), val, val_size); +} + +static struct regmap_bus bmi088_regmap_bus = { + .write = bmi088_regmap_spi_write, + .read = bmi088_regmap_spi_read, + .reg_format_endian_default =REGMAP_ENDIAN_BIG , + .val_format_endian_default =REGMAP_ENDIAN_BIG , +}; + +static int bmi088_accel_probe (struct spi_device *spi) +{ +struct regmap *regmap; +const struct spi_device_id *id =spi_get_device_id (spi); + + regmap =devm_regmap_init (&spi->dev, &bmi088_regmap_bus, + spi, &bmi088_regmap_conf); + +if (IS_ERR (regmap)) { +dev_err (&spi->dev,"Failed to initialize spi regmap\n" ); +return PTR_ERR (regmap); + } + +return bmi088_accel_core_probe (&spi->dev, regmap, spi->irq, id->name, + true); +} + +static int bmi088_accel_remove (struct spi_device *spi) +{ +return bmi088_accel_core_remove (&spi->dev); +} + +static const struct spi_device_id bmi088_accel_id[] = { + {"bmi088_accel" ,0 }, + {} +}; +MODULE_DEVICE_TABLE (spi, bmi088_accel_id); + +static struct spi_driver bmi088_accel_driver = { + .driver = { + .name ="bmi088_accel_spi" , + }, + .probe = bmi088_accel_probe, + .remove = bmi088_accel_remove, + .id_table = bmi088_accel_id, +}; +module_spi_driver (bmi088_accel_driver); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (SPI)" );drivers/iio/accel/bmi088-accel.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
Quoted 9 lines · Jonathan Cameron
Quoted 3 lines · On Fri, 13 Mar 2020 15:04:15 +0100 Mike Looijmans <[email protected]>…
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
There doesn't seem to be a specific compatible entry in the bmg160 driver. Perhaps we should look to add one?
I actually have it already, I'll submit it.
Quoted 6 lines
Quoted 3 lines
Signed-off-by Mike Looijmans <[email protected]>For a modern driver I'd normally expect to also see DT bindings. How are you probing this?
DT bindings, should I submit those as a separate patch? They're pretty trivial.
Quoted 3 lines
There is a lot of half implemented code for features that I assume will follow in later patches. Please rip all that out for now. A simple initial driver is great but must only include the stuff it actually uses.
I'll do some cleanup, didn't notice that.
Mike.
Quoted 15 lines · On Mon, 16 Mar 2020 07:27:12 +0100 Mike Looijmans <[email protected]>…
Quoted 9 lines · Jonathan Cameron
Quoted 3 lines · On Fri, 13 Mar 2020 15:04:15 +0100 Mike Looijmans <[email protected]>…
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
There doesn't seem to be a specific compatible entry in the bmg160 driver. Perhaps we should look to add one?
I actually have it already, I'll submit it.
Quoted 2 lines
Quoted 2 lines
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Signed-off-by Mike Looijmans <[email protected]>For a modern driver I'd normally expect to also see DT bindings. How are you probing this?
DT bindings, should I submit those as a separate patch? They're pretty trivial.
Yes. Separate patch for those as it means Rob doesn't have to plough through the whole driver to find them!
Quoted 8 lines
Quoted 4 lines
There is a lot of half implemented code for features that I assume will follow in later patches. Please rip all that out for now. A simple initial driver is great but must only include the stuff it actually uses.
I'll do some cleanup, didn't notice that.
Mike.
PATCH v2 1/1 iio: accel: Add support for the Bosch-Sensortec BMI088
In reply to Jonathan CameronThe BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
---
v2: Remove unused typedefs and variables
Fix error return when iio_device_register fails
drivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 655 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 100 ++++ drivers/iio/accel/bmi088-accel.h | 11 + 5 files changed, 785 insertions(+) create mode 100644 drivers/iio/accel/bmi088-accel-core.c create mode 100644 drivers/iio/accel/bmi088-accel-spi.c create mode 100644 drivers/iio/accel/bmi088-accel.h
drivers/iio/accel/Kconfig +17 -0
@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2C
drivers/iio/accel/Makefile +2 -0
@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.o
drivers/iio/accel/bmi088-accel-core.c new file +655 -0
655 lines not on this page · raw message
drivers/iio/accel/bmi088-accel-spi.c new file +100 -0
100 lines not on this page · raw message
drivers/iio/accel/bmi088-accel.h new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
Signature · 1 line
2.17.1
Quoted 3 lines · Mike Looijmans
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
Looks very good, a few comments inline.
Quoted 13 lines
[...]
drivers/iio/accel/bmi088-accel-core.c new file +12
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value[2 ]; +unsigned int temp; + +mutex_lock (&data->mutex); + +/* Read temp reg MSB */ + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &value,sizeof (value));
drivers/iio/accel/bmi088-accel-core.c line 228
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+if (ret <0 ) { +dev_err (dev,"Error reading BMI088_ACCEL_REG_TEMP\n" ); +mutex_unlock (&data->mutex); +return ret; + } + temp = (unsigned int )value[0 ] <<3 ; + temp |= (value[1 ] >>5 ); + +if (temp >1023 ) + *val = temp -2028 ;
I would be highly surprised if this is not supposed to be 2048.
If it is you can simplify the expression to be able to work without the conditional by using
*val = sign_extend32(temp, 11);
I believe it is 11, better double check.
Quoted 14 lines
drivers/iio/accel/bmi088-accel-core.c new file +13
-0+else + *val = temp; + +mutex_unlock (&data->mutex); + +return IIO_VAL_INT ; +} +static int bmi088_accel_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret;
drivers/iio/accel/bmi088-accel-core.c line 278
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+unsigned int range; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +switch (chan->type) { +case IIO_TEMP : +return bmi088_accel_get_temp (data, val); +case IIO_ACCEL : +if (iio_buffer_enabled (indio_dev)) +return -EBUSY ;
I think there is a race condition here. If the buffer is enabled after the check undefined behavior might occur. Jonathan already mentioned it in his review. Best is to use iio_device_{claim,release}_direct_mode().
Quoted 227 lines
drivers/iio/accel/bmi088-accel-core.c new file +226
-0+ + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , &range); +if (ret <0 ) +return ret; + + ret =bmi088_accel_get_axis (data, chan, val); +if (ret <0 ) +return ret; + + *val = (*val *3 *980 * (0x01 << range)) >>15 ; + +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +} + +static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_set_bw (data, val, val2); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 800 1600"); + +static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL , +}; + +static const struct attribute_group bmi088_accel_attrs_group = { + .attrs = bmi088_accel_attributes, +}; + +#define BMI088_ACCEL_CHANNEL (_axis, bits) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = IIO_MOD_##_axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = AXIS_##_axis, \ + .scan_type = { \ + .sign = 's', \ + .realbits = (bits), \ + .storagebits = 16, \ + .shift = 16 - (bits), \ + .endianness = IIO_LE, \ + }, \ +} + +#define BMI088_ACCEL_CHANNELS (bits) { \ + { \ + .type = IIO_TEMP, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .scan_index = -1, \ + }, \ + BMI088_ACCEL_CHANNEL(X, bits), \ + BMI088_ACCEL_CHANNEL(Y, bits), \ + BMI088_ACCEL_CHANNEL(Z, bits), \ + IIO_CHAN_SOFT_TIMESTAMP(3), \ +} + +static const struct iio_chan_spec bmi088_accel_channels[] = +BMI088_ACCEL_CHANNELS (16 ); + +static const struct bmi088_accel_chip_info bmi088_accel_chip_info_tbl[] = { + [0 ] = { + .name ="BMI088A" , + .chip_id =0x1E , + .channels = bmi088_accel_channels, + .num_channels =ARRAY_SIZE (bmi088_accel_channels), + .scale_table = { {9610 ,BMI088_ACCEL_RANGE_3G }, + {19122 ,BMI088_ACCEL_RANGE_6G }, + {38344 ,BMI088_ACCEL_RANGE_12G }, + {76590 ,BMI088_ACCEL_RANGE_24G } }, + }, +}; + +static const struct iio_info bmi088_accel_info = { + .attrs = &bmi088_accel_attrs_group, + .read_raw = bmi088_accel_read_raw, + .write_raw = bmi088_accel_write_raw, +}; + +static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 }; + + + +#ifdef CONFIG_PM +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + +if (on) { + ret =pm_runtime_get_sync (dev); + }else { +pm_runtime_mark_last_busy (dev); + ret =pm_runtime_put_autosuspend (dev); + } + +if (ret <0 ) { +dev_err (dev,"Failed: %s(%d)\n" , __func__, on); +if (on) +pm_runtime_put_noidle (dev); + +return ret; + } + +return 0 ; +} +#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +return 0 ; +} +#endif + +static int bmi088_accel_chip_init (struct bmi088_accel_data *data) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret, i; +unsigned int val; + +/* Do a dummy read (of chip ID), to enable SPI interface */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); + +/* +* Reset chip to get it in a known good state. A delay of 1ms after +* reset is required according to the data sheet +*/ +regmap_write (data->regmap,BMI088_ACCEL_REG_RESET , +BMI088_ACCEL_RESET_VAL ); +usleep_range (1000 ,2000 ); + +/* Do a dummy read (of chip ID), to enable SPI interface after reset */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); + +/* Read chip ID */ + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); +if (ret <0 ) { +dev_err (dev,"Error: Reading chip id\n" ); +return ret; + } + +/* Validate chip ID */ +dev_dbg (dev,"Chip Id %x\n" , val); +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } + +if (!data->chip_info) { +dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + } + +/* Set Active mode (and wait for 5ms) */ + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (5000 ,10000 ); + +/* Enable accelerometer */ + ret =bmi088_accel_enable (data, true); +if (ret <0 ) +return ret; + +/* Set Bandwidth */ + ret =bmi088_accel_set_bw (data,BMI088_ACCEL_MODE_ODR_100 , +BMI088_ACCEL_MODE_OSR_NORMAL ); +if (ret <0 ) +return ret; + +/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_RANGE\n" ); +return ret; + } + +return 0 ; +} + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap, +int irq,const char *name,bool block_supported) +{ +struct bmi088_accel_data *data; +struct iio_dev *indio_dev; +int ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +dev_set_drvdata (dev, indio_dev); + + data->regmap = regmap; +
drivers/iio/accel/bmi088-accel-core.c line 552
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ ret =bmi088_accel_chip_init (data); +if (ret <0 ) +return ret; + +mutex_init (&data->mutex); + + indio_dev->dev.parent = dev; + indio_dev->channels = data->chip_info->channels; + indio_dev->num_channels = data->chip_info->num_channels; + indio_dev->name = name ? name : data->chip_info->name;
Considering that chip_info is chosen by the product ID register, regardless of what the compatible string was, maybe it is best to always use chip_info->name here.
Quoted 41 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ indio_dev->available_scan_masks = bmi088_accel_scan_masks; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->info = &bmi088_accel_info;drivers/iio/accel/bmi088-accel-spi.c new file +31
-0@@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018, Topic Embedded Products +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +int bmi088_regmap_spi_write (void *context,const void *data,size_t count) +{ +struct spi_device *spi = context; +u8 buf[count]; + +memcpy (buf, data, count); + +dev_dbg (&spi->dev,"Write val: %x to reg: %x\n" , buf[1 ], buf[0 ]); + +/* +* The SPI register address (= full register address without bit 7) +* and the write command (bit7 = RW = '0') +*/
drivers/iio/accel/bmi088-accel-spi.c line 41
Quoted 10 lines
drivers/iio/accel/bmi088-accel-spi.c new file +10
-0+ buf[0 ] &= ~0x80 ; + +return spi_write (spi, buf, count); +} + +int bmi088_regmap_spi_read (void *context,const void *reg, +size_t reg_size,void *val,size_t val_size) +{ +struct spi_device *spi = context; +u8 addr[reg_size +1 ];
I believe there is an effort to eliminate variable length arrays that are placed on the stack from the kernel. reg_size should have a very small upper limit you should be able to get away with a statically sized array.
Quoted 10 lines
drivers/iio/accel/bmi088-accel-spi.c new file +10
-0+ + addr[0 ] = *(u8 *)reg; + +dev_dbg (&spi->dev,"Read reg: %x\n" , addr[0 ]); + + addr[0 ] |=0x80 ;/* bit7 = RW = '1' */ + +/* Do a write of 2 to mimic the dummy byte (see datasheet) */ +return spi_write_then_read (spi, addr,sizeof (addr), val, val_size); +}
[...]
Thanks for the review, expect a v3 once I've had the cance to test it.
Quoted 32 lines · Lars-Peter Clausen
Quoted 3 lines · Mike Looijmans
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
Looks very good, a few comments inline.
Quoted 14 lines
[...]
+static intbmi088_accel_get_temp(struct bmi088_accel_data *data, int *val)drivers/iio/accel/bmi088-accel-core.c new file +11
-0+{ + struct device *dev = regmap_get_device(data->regmap); + int ret; + u8 value[2]; + unsigned int temp; + + mutex_lock(&data->mutex); + + /* Read temp reg MSB */ + ret = regmap_bulk_read(data->regmap, BMI088_ACCEL_REG_TEMP, + &value, sizeof(value));drivers/iio/accel/bmi088-accel-core.c line 228
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ if (ret < 0) { + dev_err(dev, "Error reading BMI088_ACCEL_REG_TEMP\n"); + mutex_unlock(&data->mutex); + return ret; + } + temp = (unsigned int)value[0] << 3; + temp |= (value[1] >> 5); + + if (temp > 1023) + *val = temp - 2028;I would be highly surprised if this is not supposed to be 2048.
Quoted 5 lines
If it is you can simplify the expression to be able to work without the conditional by using
*val =
sign_extend32(temp, 11);I believe it is 11, better double check.
Yeah, the datasheet makes a big fuzz about it, but it's just a signed 11-bit integer. See also my reply to Jonathan Cameron.
Quoted 19 lines
Quoted 19 lines
+ else
+ *val = temp;drivers/iio/accel/bmi088-accel-core.c new file +15
-0+ + mutex_unlock(&data->mutex); + + return IIO_VAL_INT; +} +static int bmi088_accel_read_raw (struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int *val, int *val2, long mask) +{ + struct bmi088_accel_data *data = iio_priv(indio_dev); + int ret; + unsigned int range; + + switch (mask) { + case IIO_CHAN_INFO_RAW:
Quoted 8 lines
Quoted 6 lines
+ switch (
chan->type) {
+ caseIIO_TEMP:
+ returnbmi088_accel_get_temp(data, val); + caseIIO_ACCEL:
+ if (iio_buffer_enabled(indio_dev)) + return-EBUSY;I think there is a race condition here. If the buffer is enabled after the check undefined behavior might occur. Jonathan already mentioned it in his review. Best is to use iio_device_{claim,release}_direct_mode().
Fixed in v3.
Quoted 234 lines
Quoted 234 lines
drivers/iio/accel/bmi088-accel-core.c new file +39
-0+ + ret = regmap_read(data->regmap, + BMI088_ACCEL_REG_ACC_RANGE, &range); + if (ret < 0) + return ret; + + ret = bmi088_accel_get_axis(data, chan, val); + if (ret < 0) + return ret; + + *val = (*val * 3 * 980 * (0x01 << range)) >> 15; + + return IIO_VAL_INT; + default: + return -EINVAL; + } +} + +static int bmi088_accel_write_raw (struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct bmi088_accel_data *data = iio_priv(indio_dev); + int ret; + + switch (mask) { + case IIO_CHAN_INFO_SAMP_FREQ: + mutex_lock(&data->mutex); + ret = bmi088_accel_set_bw(data, val, val2); + mutex_unlock(&data->mutex); + break; + default: + ret = -EINVAL; + } + + return ret; +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 8001600");
drivers/iio/accel/bmi088-accel-core.c new file +45
-0+ +static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, + NULL, +}; + +static const struct attribute_group bmi088_accel_attrs_group = { + .attrs = bmi088_accel_attributes, +}; + +#define BMI088_ACCEL_CHANNEL (_axis, bits) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = IIO_MOD_##_axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = AXIS_##_axis, \ + .scan_type = { \ + .sign = 's', \ + .realbits = (bits), \ + .storagebits = 16, \ + .shift = 16 - (bits), \ + .endianness = IIO_LE, \ + }, \ +} + +#define BMI088_ACCEL_CHANNELS (bits) { \ + { \ + .type = IIO_TEMP, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .scan_index = -1, \ + }, \ + BMI088_ACCEL_CHANNEL(X, bits), \ + BMI088_ACCEL_CHANNEL(Y, bits), \ + BMI088_ACCEL_CHANNEL(Z, bits), \ + IIO_CHAN_SOFT_TIMESTAMP(3), \ +} + +static const struct iio_chan_spec bmi088_accel_channels[] = + BMI088_ACCEL_CHANNELS(16); + +static const struct bmi088_accel_chip_infobmi088_accel_chip_info_tbl[] = {
+ [0] = {
+ .name = "BMI088A",
+ .chip_id =0x1E,
+ .channels =bmi088_accel_channels,
+ .num_channels =ARRAY_SIZE(bmi088_accel_channels), + .scale_table = { {9610,BMI088_ACCEL_RANGE_3G}, + {19122,BMI088_ACCEL_RANGE_6G}, + {38344,BMI088_ACCEL_RANGE_12G}, + {76590,BMI088_ACCEL_RANGE_24G} }, + },drivers/iio/accel/bmi088-accel-core.c new file +64
-0+}; + +static const struct iio_info bmi088_accel_info = { + .attrs = &bmi088_accel_attrs_group, + .read_raw = bmi088_accel_read_raw, + .write_raw = bmi088_accel_write_raw, +}; + +static const unsigned long bmi088_accel_scan_masks[] = { + BIT(AXIS_X) | BIT(AXIS_Y) | BIT(AXIS_Z), + 0}; + + + +#ifdef CONFIG_PM +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, + bool on) +{ + struct device *dev = regmap_get_device(data->regmap); + int ret; + + if (on) { + ret = pm_runtime_get_sync(dev); + } else { + pm_runtime_mark_last_busy(dev); + ret = pm_runtime_put_autosuspend(dev); + } + + if (ret < 0) { + dev_err(dev, "Failed: %s(%d)\n", __func__, on); + if (on) + pm_runtime_put_noidle(dev); + + return ret; + } + + return 0; +} +#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, + bool on) +{ + return 0; +} +#endif + +static int bmi088_accel_chip_init (struct bmi088_accel_data *data) +{ + struct device *dev = regmap_get_device(data->regmap); + int ret, i; + unsigned int val; + + /* Do a dummy read (of chip ID), to enable SPI interface */ + regmap_read(data->regmap, BMI088_ACCEL_REG_CHIP_ID, &val); + + /* + * Reset chip to get it in a known good state. A delay of 1ms after + * reset is required according to the data sheet + */ + regmap_write(data->regmap, BMI088_ACCEL_REG_RESET, + BMI088_ACCEL_RESET_VAL); + usleep_range(1000, 2000); + + /* Do a dummy read (of chip ID), to enable SPI interface afterreset */
+regmap_read(data->regmap, BMI088_ACCEL_REG_CHIP_ID, &val);drivers/iio/accel/bmi088-accel-core.c new file +70
-0+ + /* Read chip ID */ + ret = regmap_read(data->regmap, BMI088_ACCEL_REG_CHIP_ID, &val); + if (ret < 0) { + dev_err(dev, "Error: Reading chip id\n"); + return ret; + } + + /* Validate chip ID */ + dev_dbg(dev, "Chip Id %x\n", val); + for (i = 0; i < ARRAY_SIZE(bmi088_accel_chip_info_tbl); i++) { + if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; + break; + } + } + + if (!data->chip_info) { + dev_err(dev, "Invalid chip %x\n", val); + return -ENODEV; + } + + /* Set Active mode (and wait for 5ms) */ + ret = bmi088_accel_set_mode(data, BMI088_ACCEL_MODE_ACTIVE); + if (ret < 0) + return ret; + + usleep_range(5000, 10000); + + /* Enable accelerometer */ + ret = bmi088_accel_enable(data, true); + if (ret < 0) + return ret; + + /* Set Bandwidth */ + ret = bmi088_accel_set_bw(data, BMI088_ACCEL_MODE_ODR_100, + BMI088_ACCEL_MODE_OSR_NORMAL); + if (ret < 0) + return ret; + + /* Set Default Range */ + ret = regmap_write(data->regmap, BMI088_ACCEL_REG_ACC_RANGE, + BMI088_ACCEL_RANGE_6G); + if (ret < 0) { + dev_err(dev, "Error writing ACC_RANGE\n"); + return ret; + } + + return 0; +} + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap, + int irq, const char *name, bool block_supported) +{ + struct bmi088_accel_data *data; + struct iio_dev *indio_dev; + int ret; + + indio_dev = devm_iio_device_alloc(dev, sizeof(*data)); + if (!indio_dev) + return -ENOMEM; + + data = iio_priv(indio_dev); + dev_set_drvdata(dev, indio_dev); + + data->regmap = regmap; + + ret = bmi088_accel_chip_init(data); + if (ret < 0) + return ret;
Quoted 8 lines
drivers/iio/accel/bmi088-accel-core.c line 552
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+ + mutex_init(&data->mutex); + + indio_dev->dev.parent = dev; + indio_dev->channels = data->chip_info->channels; + indio_dev->num_channels = data->chip_info->num_channels; + indio_dev->name = name ? name : data->chip_info->name;Considering that
chip_infois chosen by the product ID register, regardless of what the compatible string was, maybe it is best to always usechip_info->namehere.
Copied from other driver actually. I'd be glad to replace it and get rid of the name parameter. I have no clue what purpose this serves.
Quoted 67 lines
Quoted 43 lines
+
indio_dev->available_scan_masks=bmi088_accel_scan_masks; +indio_dev->modes=INDIO_DIRECT_MODE;
+indio_dev->info=&bmi088_accel_info;drivers/iio/accel/bmi088-accel-spi.c new file +3
-0@@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips:
+ * - BMI088
+ *
+ * Copyright (c) 2018, Topic Embedded Products
+ */drivers/iio/accel/bmi088-accel-spi.c new file +12
-0+ +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +int bmi088_regmap_spi_write(void *context, const void *data, size_tcount)
drivers/iio/accel/bmi088-accel-spi.c new file +12
-0+{ + struct spi_device *spi = context; + u8 buf[count]; + + memcpy(buf, data, count); + + dev_dbg(&spi->dev, "Write val: %x to reg: %x\n", buf[1], buf[0]); + + /* +* The SPI register address (= full register address without bit 7) +* and the write command (bit7 = RW = '0') +*/ drivers/iio/accel/bmi088-accel-spi.c line 41
Quoted 10 lines
drivers/iio/accel/bmi088-accel-spi.c new file +10
-0+ buf[0] &= ~0x80; + + return spi_write(spi, buf, count); +} + +int bmi088_regmap_spi_read (void *context,const void *reg, + size_t reg_size, void *val, size_t val_size) +{ + struct spi_device *spi = context; + u8 addr[reg_size + 1];I believe there is an effort to eliminate variable length arrays that are placed on the stack from the kernel.
reg_sizeshould have a very small upper limit you should be able to get away with a statically sized array.Quoted 10 lines
drivers/iio/accel/bmi088-accel-spi.c new file +10
-0+ + addr[0] = *(u8 *)reg; + + dev_dbg(&spi->dev, "Read reg: %x\n", addr[0]); + + addr[0] |= 0x80; /* bit7 = RW = '1' */ + + /* Do a write of 2 to mimic the dummy byte (see datasheet) */ + return spi_write_then_read(spi, addr, sizeof(addr), val, val_size); +}[...]
Signature · 1 line
Mike Looijmans
PATCH v3 1/1 iio: accel: Add support for the Bosch-Sensortec BMI088
In reply to Mike LooijmansThe BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
---
v2: Remove unused typedefs and variables
Fix error return when iio_device_register fails
v3: Processed comments from Jonathan Cameron and Lars-Peter Clausen
implement runtime PM (tested by code tracing) and sleep fix scale and offset factors for accel and temperature and return raw values instead of pre-scaled ones
Use iio_device_{claim,release}_direct_mode
Remove unused code and structs
Use a cache-aligned buffer for bulk read
Configure and enable caching register values
drivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 671 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 85 ++++ drivers/iio/accel/bmi088-accel.h | 12 + 5 files changed, 787 insertions(+) create mode 100644 drivers/iio/accel/bmi088-accel-core.c create mode 100644 drivers/iio/accel/bmi088-accel-spi.c create mode 100644 drivers/iio/accel/bmi088-accel.h
drivers/iio/accel/Kconfig +17 -0
@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2C
drivers/iio/accel/Makefile +2 -0
@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.o
drivers/iio/accel/bmi088-accel-core.c new file +671 -0
671 lines not on this page · raw message
drivers/iio/accel/bmi088-accel-spi.c new file +85 -0
85 lines not on this page · raw message
drivers/iio/accel/bmi088-accel.h new file +12 -0
@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; +extern const struct dev_pm_ops bmi088_accel_pm_ops; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
Signature · 1 line
2.17.1
Quoted 3 lines · Mike Looijmans
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
...
Quoted 1 line
+#include <
linux/acpi.h>
How this is being used?
...
drivers/iio/accel/bmi088-accel-core.c line 153
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+EXPORT_SYMBOL_GPL (bmi088_regmap_conf); + +
Too many blank lines
...
Quoted 1 line
+#ifdef
CONFIG_PM
Hmm... Why do you need this? Doesn't PM runtime have the stubs for !PM case?
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +return 0 ; +} +#endif
...
drivers/iio/accel/bmi088-accel-core.c line 194
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CTRL , + on_off ?0x4 :0x0 ); +if (ret <0 ) {
Why all these ' < 0'? I don't remember that regmap API returns positive numbers from this type of calls.
...
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c new file +4
-0+ +static int bmi088_accel_set_sample_freq (struct bmi088_accel_data *data,int val) +{ +unsigned int value =BMI088_ACCEL_MODE_ODR_1600 ;
drivers/iio/accel/bmi088-accel-core.c line 275
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+unsigned int freq =1600 ; +int ret; + +if (val <12 || val >1600 ) +return -EINVAL ; +while (freq > val && value >BMI088_ACCEL_MODE_ODR_12_5 ) { + --value; + freq >>=1 ; + }
You can use bit operations instead of loop.
drivers/iio/accel/bmi088-accel-core.c line 282
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+ ret =regmap_update_bits (data->regmap,BMI088_ACCEL_REG_ACC_CONF , +0x0f , value); +if (ret <0 ) +return ret; + +return 0 ;
return regmap_...(...);
Quoted 1 line
+}
...
drivers/iio/accel/bmi088-accel-core.c line 293
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +8
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +int ret; +__s16 temp; + +mutex_lock (&data->mutex); + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &data->buffer,2 );
sizeof() ?
Quoted 11 lines
drivers/iio/accel/bmi088-accel-core.c new file +11
-0+ temp =get_unaligned_be16 (data->buffer); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = temp >>5 ; + +return IIO_VAL_INT ; +}
...
drivers/iio/accel/bmi088-accel-core.c line 311
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+static int bmi088_accel_get_axis (struct bmi088_accel_data *data, +struct iio_chan_spec const *chan, +int *val) +{ +int ret; +__s16 raw_val;
s16 ?
Also applies to the rest.
Quoted 2 lines
(quoted diff) +2
-0+ return IIO_VAL_INT; +}
...
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ :
drivers/iio/accel/bmi088-accel-core.c line 420
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+mutex_lock (&data->mutex); + ret =bmi088_accel_set_sample_freq (data, val); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret;
Replace break with this?
Quoted 1 line
+}
...
drivers/iio/accel/bmi088-accel-core.c line 427
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL ,
Terminators are good w/o comma.
Quoted 1 line
+};
...
drivers/iio/accel/bmi088-accel-core.c line 475
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 };
Indentation issues.
Review
Quoted 2 lines
(quoted diff) +2
-0+ +
Too many blank lines.
...
drivers/iio/accel/bmi088-accel-core.c line 512
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +8
-0+/* Validate chip ID */ +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } +
No need for this blank line.
drivers/iio/accel/bmi088-accel-core.c line 513
Quoted 1 line
drivers/iio/accel/bmi088-accel-core.c new file +1
-0+if (!data->chip_info) {
More usual pattern to check loop counter against array size.
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + }
...
drivers/iio/accel/bmi088-accel-core.c line 535
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) +return ret; + +return 0 ;
return regmap_...();
...
drivers/iio/accel/bmi088-accel-core.c line 582
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+ ret =iio_device_register (indio_dev); +if (ret <0 ) { +dev_err (dev,"Unable to register iio device\n" ); +return ret; + } + +return 0 ;
if (ret) dev_err(); return ret;
...
drivers/iio/accel/bmi088-accel-core.c line 641
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +if (ret <0 ) +return -EAGAIN ;
Is this error code dictated by PM runtime API?
Otherwise
return bmi088_...();
Quoted 2 lines
(quoted diff) +2
-0+ + return 0;
Signature · 2 lines
With Best Regards, Andy Shevchenko
I'll post a v4 with all requested changes below. Just one remark inline about the shared buffer and sizeof.
Quoted 81 lines · Andy Shevchenko
Quoted 3 lines · Mike Looijmans
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
...
Quoted 1 line
+#include <
linux/acpi.h>How this is being used?
...
drivers/iio/accel/bmi088-accel-core.c line 153
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+EXPORT_SYMBOL_GPL (bmi088_regmap_conf); + +Too many blank lines
...
Quoted 1 line
+#ifdef
CONFIG_PMHmm... Why do you need this? Doesn't PM runtime have the stubs for !PM case?
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +return 0 ; +} +#endif ...
drivers/iio/accel/bmi088-accel-core.c line 194
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CTRL , + on_off ?0x4 :0x0 ); +if (ret <0 ) {Why all these ' < 0'? I don't remember that regmap API returns positive numbers from this type of calls.
...
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c new file +4
-0+ +static int bmi088_accel_set_sample_freq (struct bmi088_accel_data *data,int val) +{ +unsigned int value =BMI088_ACCEL_MODE_ODR_1600 ;drivers/iio/accel/bmi088-accel-core.c line 275
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+unsigned int freq =1600 ; +int ret; + +if (val <12 || val >1600 ) +return -EINVAL ; +while (freq > val && value >BMI088_ACCEL_MODE_ODR_12_5 ) { + --value; + freq >>=1 ; + }You can use bit operations instead of loop.
drivers/iio/accel/bmi088-accel-core.c line 282
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+ ret =regmap_update_bits (data->regmap,BMI088_ACCEL_REG_ACC_CONF , +0x0f , value); +if (ret <0 ) +return ret; + +return 0 ;return regmap_...(...);Quoted 1 line
+}
...
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +int ret; +__s16 temp; + +mutex_lock (&data->mutex);
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c line 293
Quoted 2 lines
drivers/iio/accel/bmi088-accel-core.c new file +2
-0+ ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &data->buffer,2 );
sizeof()?
The buffer is a shared buffer, it will grow to accommodate reading all axis and timestamp in a single read (9 bytes) and for FIFO reads in foreseeable future.
I could use sizeof(temp) here though, but that wouldn't that be more confusing?
Quoted 140 lines
Quoted 12 lines
drivers/iio/accel/bmi088-accel-core.c new file +11
-0+ temp =get_unaligned_be16 (data->buffer); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = temp >>5 ; + +return IIO_VAL_INT ; +}...
drivers/iio/accel/bmi088-accel-core.c line 311
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+static int bmi088_accel_get_axis (struct bmi088_accel_data *data, +struct iio_chan_spec const *chan, +int *val) +{ +int ret; +__s16 raw_val;s16 ?
Also applies to the rest.Quoted 2 lines
(quoted diff) +2
-0+ return IIO_VAL_INT; +}...
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ :drivers/iio/accel/bmi088-accel-core.c line 420
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+mutex_lock (&data->mutex); + ret =bmi088_accel_set_sample_freq (data, val); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret;Replace break with this?
Quoted 1 line
+}
...
drivers/iio/accel/bmi088-accel-core.c line 427
Quoted 4 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL ,Terminators are good w/o comma.
Quoted 1 line
+};
...
drivers/iio/accel/bmi088-accel-core.c line 475
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 };Indentation issues.
Review
Quoted 2 lines
(quoted diff) +2
-0+ +Too many blank lines.
...
drivers/iio/accel/bmi088-accel-core.c line 512
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +8
-0+/* Validate chip ID */ +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } +No need for this blank line.
drivers/iio/accel/bmi088-accel-core.c line 513
Quoted 1 line
drivers/iio/accel/bmi088-accel-core.c new file +1
-0+if (!data->chip_info) {More usual pattern to check loop counter against array size.
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + }...
drivers/iio/accel/bmi088-accel-core.c line 535
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) +return ret; + +return 0 ;return regmap_...();...
drivers/iio/accel/bmi088-accel-core.c line 582
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+ ret =iio_device_register (indio_dev); +if (ret <0 ) { +dev_err (dev,"Unable to register iio device\n" ); +return ret; + } + +return 0 ;if (ret) dev_err(); return ret;...
drivers/iio/accel/bmi088-accel-core.c line 641
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +if (ret <0 ) +return -EAGAIN ;Is this error code dictated by PM runtime API?
Otherwisereturn bmi088_...();Quoted 2 lines
(quoted diff) +2
-0+ + return 0;
Signature · 1 line
Mike Looijmans
Quoted 2 lines · Mike Looijmans
Quoted 1 line · Andy Shevchenko
On Thu, Mar 19, 2020 at 04:48:42PM +0100, Mike Looijmans wrote:
...
Quoted 12 lines
Quoted 11 lines
drivers/iio/accel/bmi088-accel-core.c line 293
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +8
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +int ret; +__s16 temp; + +mutex_lock (&data->mutex); + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &data->buffer,2 );
sizeof()?
Quoted 6 lines
The buffer is a shared buffer, it will grow to accommodate reading all axis and timestamp in a single read (9 bytes) and for FIFO reads in foreseeable future.
I could use sizeof(temp) here though, but that wouldn't that be more confusing?
Yeah, perhaps comment explaining why 2 is being used there and why you write directly to the buffer (no temporary variable being involved)?
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/iio/accel/bmi088-accel-core.c new file +11
-0+ temp =get_unaligned_be16 (data->buffer); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = temp >>5 ; + +return IIO_VAL_INT ; +}
Signature · 2 lines
With Best Regards, Andy Shevchenko
Quoted 22 lines · On Mon, 23 Mar 2020 12:45:43 +0200 Andy Shevchenko…
Quoted 2 lines · Mike Looijmans
Quoted 1 line · Andy Shevchenko
On Thu, Mar 19, 2020 at 04:48:42PM +0100, Mike Looijmans wrote:
...
Quoted 16 lines
Quoted 11 lines
drivers/iio/accel/bmi088-accel-core.c line 293
Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +8
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +int ret; +__s16 temp; + +mutex_lock (&data->mutex); + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &data->buffer,2 );
sizeof()?The buffer is a shared buffer, it will grow to accommodate reading all axis and timestamp in a single read (9 bytes) and for FIFO reads in foreseeable future.
Quoted 5 lines
Quoted 2 lines
I could use sizeof(temp) here though, but that wouldn't that be more confusing?
Yeah, perhaps comment explaining why 2 is being used there and why you write directly to the buffer (no temporary variable being involved)?
This is all about ensuring it's a dma safe buffer without having to explicit kmallocs on eveyr read. buffer is the temporary variable.
I would suggest using sizeof(__be16) which would make it clearer perhaps.
Jonathan
Quoted 13 lines
Quoted 12 lines
Quoted 12 lines
Quoted 12 lines
drivers/iio/accel/bmi088-accel-core.c new file +11
-0+ temp =get_unaligned_be16 (data->buffer); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = temp >>5 ; + +return IIO_VAL_INT ; +}
Jonathan Cameron
maintainerQuoted 5 lines · On Thu, 19 Mar 2020 16:48:42 +0100 Mike Looijmans <[email protected]>…
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
Signed-off-by Mike Looijmans <[email protected]>
Hi Mike,
Please don't post each version as a reply to the previous version. It can nest very deeply and get very confusing.
New thread for each version. We can use the naming to find the previous ones if needed.
I don't have much to add to what Andy found. However, please make sure you are consistent on checking return values form spi accesses. There are a few random ones in here that just get ignored.
That's kind of find in remove paths etc as no way of really reporting the error, but there are a few normal paths in here as well.
Looks pretty good.
Jonathan
Quoted 551 lines
---
v2: Remove unused typedefs and variables
Fix error return wheniio_device_registerfails
v3: Processed comments from Jonathan Cameron and Lars-Peter Clausen
implement runtime PM (tested by code tracing) and sleep fix scale and offset factors for accel and temperature and return raw values instead of pre-scaled ones
Use iio_device_{claim,release}_direct_mode
Remove unused code and structs
Use a cache-aligned buffer for bulk read
Configure and enable caching register valuesdrivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 671 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 85 ++++ drivers/iio/accel/bmi088-accel.h | 12 + 5 files changed, 787 insertions(+) create mode 100644 drivers/iio/accel/bmi088-accel-core.c create mode 100644 drivers/iio/accel/bmi088-accel-spi.c create mode 100644 drivers/iio/accel/bmi088-accel.hdrivers/iio/accel/Kconfig +17
-0@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2Cdrivers/iio/accel/Makefile +2
-0@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.odrivers/iio/accel/bmi088-accel-core.c new file +482
-0@@ -0,0 +1,671 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018-2020, Topic Embedded Products +*/ + +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/events.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> +#include <asm/unaligned.h> + +#include "bmi088-accel.h" + +#define BMI088_ACCEL_DRV_NAME "bmi088_accel" +#define BMI088_ACCEL_IRQ_NAME "bmi088_accel_event" + +#define BMI088_ACCEL_REG_CHIP_ID 0x00 +#define BMI088_ACCEL_REG_ERROR 0x02 + +#define BMI088_ACCEL_REG_INT_STATUS 0x1D +#define BMI088_ACCEL_INT_STATUS_BIT_DRDY BIT(7) + +#define BMI088_ACCEL_REG_RESET 0x7E +#define BMI088_ACCEL_RESET_VAL 0xB6 + +#define BMI088_ACCEL_REG_PWR_CTRL 0x7D +#define BMI088_ACCEL_REG_PWR_CONF 0x7C + +#define BMI088_ACCEL_REG_INT_MAP_DATA 0x58 +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT1_DRDY BIT(2) +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT2_FWM BIT(5) + +#define BMI088_ACCEL_REG_INT1_IO_CONF 0x53 +#define BMI088_ACCEL_INT1_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT1_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_INT2_IO_CONF 0x54 +#define BMI088_ACCEL_INT2_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT2_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_ACC_CONF 0x40 +#define BMI088_ACCEL_REG_ACC_RANGE 0x41 +#define BMI088_ACCEL_RANGE_3G 0x00 +#define BMI088_ACCEL_RANGE_6G 0x01 +#define BMI088_ACCEL_RANGE_12G 0x02 +#define BMI088_ACCEL_RANGE_24G 0x03 + +#define BMI088_ACCEL_REG_TEMP 0x22 +#define BMI088_ACCEL_TEMP_UNIT 125 +#define BMI088_ACCEL_TEMP_OFFSET 23000 + +#define BMI088_ACCEL_REG_XOUT_L 0x12 +#define BMI088_ACCEL_AXIS_TO_REG (axis) \ + (BMI088_ACCEL_REG_XOUT_L + (axis * 2)) + +#define BMI088_ACCEL_MAX_STARTUP_TIME_MS 1 +#define BMI088_AUTO_SUSPEND_DELAY_MS 2000 + +#define BMI088_ACCEL_REG_FIFO_STATUS 0x0E +#define BMI088_ACCEL_REG_FIFO_CONFIG0 0x48 +#define BMI088_ACCEL_REG_FIFO_CONFIG1 0x49 +#define BMI088_ACCEL_REG_FIFO_DATA 0x3F +#define BMI088_ACCEL_FIFO_LENGTH 100 + +#define BMI088_ACCEL_FIFO_MODE_FIFO 0x40 +#define BMI088_ACCEL_FIFO_MODE_STREAM 0x80 + +enum bmi088_accel_axis { +AXIS_X , +AXIS_Y , +AXIS_Z , +AXIS_MAX , +}; + +enum bmi088_power_modes { +BMI088_ACCEL_MODE_ACTIVE , +BMI088_ACCEL_MODE_SUSPEND , +}; + +/* Available OSR (over sampling rate) sets the 3dB cut-off frequency */ +enum bmi088_osr_modes { +BMI088_ACCEL_MODE_OSR_NORMAL =0xA , +BMI088_ACCEL_MODE_OSR_2 =0x9 , +BMI088_ACCEL_MODE_OSR_4 =0x8 , +}; + +/* Available ODR (output data rates) in Hz */ +enum bmi088_odr_modes { +BMI088_ACCEL_MODE_ODR_12_5 =0x5 , +BMI088_ACCEL_MODE_ODR_25 =0x6 , +BMI088_ACCEL_MODE_ODR_50 =0x7 , +BMI088_ACCEL_MODE_ODR_100 =0x8 , +BMI088_ACCEL_MODE_ODR_200 =0x9 , +BMI088_ACCEL_MODE_ODR_400 =0xa , +BMI088_ACCEL_MODE_ODR_800 =0xb , +BMI088_ACCEL_MODE_ODR_1600 =0xc , +}; + +struct bmi088_scale_info { +int scale; +u8 reg_range; +}; + +struct bmi088_accel_chip_info { +const char *name; +u8 chip_id; +const struct iio_chan_spec *channels; +int num_channels; +}; + +struct bmi088_accel_data { +struct regmap *regmap; +struct mutex mutex; +const struct bmi088_accel_chip_info *chip_info; +u8 buffer[2 ]____cacheline_aligned ; +}; + +static const struct regmap_range bmi088_volatile_ranges[] = { +/* All registers below 0x40 are volatile, except the CHIP ID. */ +regmap_reg_range (BMI088_ACCEL_REG_ERROR ,0x3f ), +/* Mark the RESET as volatile too, it is self-clearing */ +regmap_reg_range (BMI088_ACCEL_REG_RESET ,BMI088_ACCEL_REG_RESET ), +}; + +static const struct regmap_access_table bmi088_volatile_table = { + .yes_ranges = bmi088_volatile_ranges, + .n_yes_ranges =ARRAY_SIZE (bmi088_volatile_ranges), +}; + +const struct regmap_config bmi088_regmap_conf = { + .reg_bits =8 , + .val_bits =8 , + .max_register =0x7E , + .volatile_table = &bmi088_volatile_table, + .cache_type =REGCACHE_RBTREE , +}; +EXPORT_SYMBOL_GPL (bmi088_regmap_conf); + + +#ifdef CONFIG_PM +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + +if (on) { + ret =pm_runtime_get_sync (dev); + }else { +pm_runtime_mark_last_busy (dev); + ret =pm_runtime_put_autosuspend (dev); + } + +if (ret <0 ) { +dev_err (dev,"Failed: %s(%d)\n" , __func__, on); +if (on) +pm_runtime_put_noidle (dev); + +return ret; + } + +return 0 ; +} +#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +return 0 ; +} +#endif + +static int bmi088_accel_enable (struct bmi088_accel_data *data, +bool on_off) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CTRL , + on_off ?0x4 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_PWR_CTRL reg\n" ); +return ret; + } +/* Datasheet recommends to wait at least 5ms before communication */ +usleep_range (5000 ,6000 ); + +return 0 ; +} + +/* In suspend mode, only the accelerometer is powered down. */ +static int bmi088_accel_set_mode (struct bmi088_accel_data *data, +enum bmi088_power_modes mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CONF , + mode ==BMI088_ACCEL_MODE_SUSPEND ?0x3 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_set_bw (struct bmi088_accel_data *data, +enum bmi088_odr_modes odr_mode, +enum bmi088_osr_modes osr_mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value = (osr_mode <<4 ) | (odr_mode &0xF ); + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_CONF , value); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_get_sample_freq (struct bmi088_accel_data *data, +int * val,int *val2) +{ +unsigned int value; +int ret; + + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_ACC_CONF , + &value); +if (ret <0 ) +return ret; + + value &=0xf ;/* ODR in lower 4 bits */ +if (value ==BMI088_ACCEL_MODE_ODR_12_5 ) { + *val =12 ; + *val2 =500000 ; + ret =IIO_VAL_INT_PLUS_MICRO ; + }else { + *val =25 << (value -BMI088_ACCEL_MODE_ODR_25 ); + *val2 =0 ; + ret =IIO_VAL_INT ; + } + +return ret; +} + +static int bmi088_accel_set_sample_freq (struct bmi088_accel_data *data,int val) +{ +unsigned int value =BMI088_ACCEL_MODE_ODR_1600 ; +unsigned int freq =1600 ; +int ret; + +if (val <12 || val >1600 ) +return -EINVAL ; + +while (freq > val && value >BMI088_ACCEL_MODE_ODR_12_5 ) { + --value; + freq >>=1 ; + } + + ret =regmap_update_bits (data->regmap,BMI088_ACCEL_REG_ACC_CONF , +0x0f , value); +if (ret <0 ) +return ret; + +return 0 ; +} + +static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +int ret; +__s16 temp; + +mutex_lock (&data->mutex); + + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &data->buffer,2 ); + temp =get_unaligned_be16 (data->buffer); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = temp >>5 ; + +return IIO_VAL_INT ; +} + +static int bmi088_accel_get_axis (struct bmi088_accel_data *data, +struct iio_chan_spec const *chan, +int *val) +{ +int ret; +__s16 raw_val; + +mutex_lock (&data->mutex); + + ret =bmi088_accel_set_power_state (data, true); +if (ret <0 ) +return ret; + + ret =regmap_bulk_read (data->regmap, +BMI088_ACCEL_AXIS_TO_REG (chan->scan_index), + data->buffer,2 ); + raw_val =get_unaligned_le16 (data->buffer); + +bmi088_accel_set_power_state (data, false); + +mutex_unlock (&data->mutex); + +if (ret <0 ) +return ret; + + *val = raw_val; + +return IIO_VAL_INT ; +} + +static int bmi088_accel_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +switch (chan->type) { +case IIO_TEMP : +return bmi088_accel_get_temp (data, val); +case IIO_ACCEL : + ret =iio_device_claim_direct_mode (indio_dev); +if (ret <0 ) +return ret; + + ret =bmi088_accel_get_axis (data, chan, val); +iio_device_release_direct_mode (indio_dev); +if (ret <0 ) +return ret; + +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +switch (chan->type) { +case IIO_TEMP : +/* Offset applies before scale */ + *val =BMI088_ACCEL_TEMP_OFFSET /BMI088_ACCEL_TEMP_UNIT ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_SCALE : + *val =0 ; +switch (chan->type) { +case IIO_TEMP : +/* 0.125 degrees per LSB */ + *val =BMI088_ACCEL_TEMP_UNIT ; +return IIO_VAL_INT ; +case IIO_ACCEL : + { + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , val); +if (ret <0 ) +return ret; + + *val2 =15 - (*val &0x3 ); + *val =3 *980 ; + +return IIO_VAL_FRACTIONAL_LOG2 ; + } +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_get_sample_freq (data, val, val2); +mutex_unlock (&data->mutex); +return ret; +default : +return -EINVAL ; + } +} + +static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_set_sample_freq (data, val); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 800 1600"); + +static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL , +}; + +static const struct attribute_group bmi088_accel_attrs_group = { + .attrs = bmi088_accel_attributes, +}; + +#define BMI088_ACCEL_CHANNEL (_axis) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = IIO_MOD_##_axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = AXIS_##_axis, \ +} + +static const struct iio_chan_spec bmi088_accel_channels[] = { + { + .type =IIO_TEMP , + .info_mask_separate =BIT (IIO_CHAN_INFO_RAW ) | +BIT (IIO_CHAN_INFO_SCALE ) | +BIT (IIO_CHAN_INFO_OFFSET ), + .scan_index =-1 , + }, +BMI088_ACCEL_CHANNEL (X ), +BMI088_ACCEL_CHANNEL (Y ), +BMI088_ACCEL_CHANNEL (Z ), +IIO_CHAN_SOFT_TIMESTAMP (3 ), +}; + +static const struct bmi088_accel_chip_info bmi088_accel_chip_info_tbl[] = { + [0 ] = { + .name ="bmi088a" , + .chip_id =0x1E , + .channels = bmi088_accel_channels, + .num_channels =ARRAY_SIZE (bmi088_accel_channels), + }, +}; + +static const struct iio_info bmi088_accel_info = { + .attrs = &bmi088_accel_attrs_group, + .read_raw = bmi088_accel_read_raw, + .write_raw = bmi088_accel_write_raw, +}; + +static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 }; + + +static int bmi088_accel_chip_init (struct bmi088_accel_data *data) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret, i; +unsigned int val;
drivers/iio/accel/bmi088-accel-core.c line 492
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ +/* Do a dummy read to enable SPI interface, won't harm I2C */ +regmap_read (data->regmap,BMI088_ACCEL_REG_INT_STATUS , &val); + +/* +* Reset chip to get it in a known good state. A delay of 1ms after +* reset is required according to the data sheet +*/ +regmap_write (data->regmap,BMI088_ACCEL_REG_RESET , +BMI088_ACCEL_RESET_VAL );
Be consistent on error checking. They should all be checked unless there is no way of reporting the error onwards.
Quoted 33 lines
drivers/iio/accel/bmi088-accel-core.c new file +33
-0+usleep_range (1000 ,2000 ); + +/* Do a dummy read again after a reset to enable the SPI interface */ +regmap_read (data->regmap,BMI088_ACCEL_REG_INT_STATUS , &val); + +/* Read chip ID */ + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); +if (ret <0 ) { +dev_err (dev,"Error: Reading chip id\n" ); +return ret; + } + +/* Validate chip ID */ +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } + +if (!data->chip_info) { +dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + } + +/* Enable accelerometer after reset */ + ret =bmi088_accel_enable (data, true); +if (ret <0 ) +return ret; + +/* Set sampling frequency and bandwidth defaults */ + ret =bmi088_accel_set_bw (data,BMI088_ACCEL_MODE_ODR_25 , +BMI088_ACCEL_MODE_OSR_NORMAL );
drivers/iio/accel/bmi088-accel-core.c line 535
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+if (ret <0 ) +return ret; + +/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) +return ret; + +return 0 ;
Andy pointed this out, but regmap_read / write always uses negative or zero. Cleaning the checks up to be if (ret) is neater and lets you just do
return regmap_write(...)
for the last call here.
Quoted 245 lines
drivers/iio/accel/bmi088-accel-core.c new file +136
-0+} + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap, +int irq,const char *name,bool block_supported) +{ +struct bmi088_accel_data *data; +struct iio_dev *indio_dev; +int ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +dev_set_drvdata (dev, indio_dev); + + data->regmap = regmap; + + ret =bmi088_accel_chip_init (data); +if (ret <0 ) +return ret; + +mutex_init (&data->mutex); + + indio_dev->dev.parent = dev; + indio_dev->channels = data->chip_info->channels; + indio_dev->num_channels = data->chip_info->num_channels; + indio_dev->name = name ? name : data->chip_info->name; + indio_dev->available_scan_masks = bmi088_accel_scan_masks; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->info = &bmi088_accel_info; + + ret =pm_runtime_set_active (dev); +if (ret) +return ret; + +pm_runtime_enable (dev); +pm_runtime_set_autosuspend_delay (dev,BMI088_AUTO_SUSPEND_DELAY_MS ); +pm_runtime_use_autosuspend (dev); + + ret =iio_device_register (indio_dev); +if (ret <0 ) { +dev_err (dev,"Unable to register iio device\n" ); +return ret; + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_probe); + +int bmi088_accel_core_remove (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +iio_device_unregister (indio_dev); + +pm_runtime_disable (dev); +pm_runtime_set_suspended (dev); +pm_runtime_put_noidle (dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +mutex_unlock (&data->mutex); + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_remove); + +/* When going into system sleep, put the chip in power down */ +static int __maybe_unused bmi088_accel_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +bmi088_accel_set_power_state (data, false); +mutex_unlock (&data->mutex); + +return 0 ; +} + +static int __maybe_unused bmi088_accel_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_power_state (data, true); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +mutex_unlock (&data->mutex); + +return 0 ; +} + +/* For runtime PM put the chip in suspend mode */ +static int __maybe_unused bmi088_accel_runtime_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +if (ret <0 ) +return -EAGAIN ; + +return 0 ; +} + +static int __maybe_unused bmi088_accel_runtime_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 , +BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 *2 ); + +return 0 ; +} + +const struct dev_pm_ops bmi088_accel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(bmi088_accel_suspend, bmi088_accel_resume) +SET_RUNTIME_PM_OPS (bmi088_accel_runtime_suspend, + bmi088_accel_runtime_resume,NULL ) +}; +EXPORT_SYMBOL_GPL (bmi088_accel_pm_ops); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (core)" );drivers/iio/accel/bmi088-accel-spi.c new file +85
-0@@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018-2020, Topic Embedded Products +*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +int bmi088_regmap_spi_write (void *context,const void *data,size_t count) +{ +struct spi_device *spi = context; + +/* Write register is same as generic SPI */ +return spi_write (spi, data, count); +} + +int bmi088_regmap_spi_read (void *context,const void *reg, +size_t reg_size,void *val,size_t val_size) +{ +struct spi_device *spi = context; +u8 addr[2 ]; + + addr[0 ] = *(u8 *)reg; + addr[0 ] |=0x80 ;/* bit7 = RW = '1' */ + addr[1 ] =0 ;/* Read requires a dummy byte transfer */ + +return spi_write_then_read (spi, addr,sizeof (addr), val, val_size); +} + +static struct regmap_bus bmi088_regmap_bus = { + .write = bmi088_regmap_spi_write, + .read = bmi088_regmap_spi_read, + .reg_format_endian_default =REGMAP_ENDIAN_BIG , + .val_format_endian_default =REGMAP_ENDIAN_BIG , +}; + +static int bmi088_accel_probe (struct spi_device *spi) +{ +struct regmap *regmap; +const struct spi_device_id *id =spi_get_device_id (spi); + + regmap =devm_regmap_init (&spi->dev, &bmi088_regmap_bus, + spi, &bmi088_regmap_conf); + +if (IS_ERR (regmap)) { +dev_err (&spi->dev,"Failed to initialize spi regmap\n" ); +return PTR_ERR (regmap); + } + +return bmi088_accel_core_probe (&spi->dev, regmap, spi->irq, id->name, + true); +} + +static int bmi088_accel_remove (struct spi_device *spi) +{ +return bmi088_accel_core_remove (&spi->dev); +} + +static const struct spi_device_id bmi088_accel_id[] = { + {"bmi088_accel" ,0 }, + {} +}; +MODULE_DEVICE_TABLE (spi, bmi088_accel_id); + +static struct spi_driver bmi088_accel_driver = { + .driver = { + .name ="bmi088_accel_spi" , + .pm = &bmi088_accel_pm_ops, + }, + .probe = bmi088_accel_probe, + .remove = bmi088_accel_remove, + .id_table = bmi088_accel_id, +}; +module_spi_driver (bmi088_accel_driver); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (SPI)" );drivers/iio/accel/bmi088-accel.h new file +12
-0@@ -0,0 +1,12 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; +extern const struct dev_pm_ops bmi088_accel_pm_ops; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
See my inline comments. I've implemented most of the changes already, but some weird virus is attacking mortals and I don't have access to the board just now.
The default answer is "Done, will submit v3" to all suggestions
Quoted 9 lines · Jonathan Cameron
Quoted 3 lines · On Fri, 13 Mar 2020 15:04:15 +0100 Mike Looijmans <[email protected]>…
The BMI088 is a combined module with both accelerometer and gyroscope. This adds the accelerometer driver support for the SPI interface. The gyroscope part is already supported by the BMG160 driver.
There doesn't seem to be a specific compatible entry in the bmg160 driver. Perhaps we should look to add one?
Patch is in your mailbox.
Quoted 5 lines
Quoted 2 lines
Signed-off-by Mike Looijmans <[email protected]>For a modern driver I'd normally expect to also see DT bindings. How are you probing this?
DT patch submitted.
Quoted 5 lines
There is a lot of half implemented code for features that I assume will follow in later patches. Please rip all that out for now. A simple initial driver is great but must only include the stuff it actually uses.
I stripped out more of the stuff.
Quoted 281 lines
Quoted 191 lines
--- drivers/iio/accel/Kconfig | 17 + drivers/iio/accel/Makefile | 2 + drivers/iio/accel/bmi088-accel-core.c | 681 ++++++++++++++++++++++++++ drivers/iio/accel/bmi088-accel-spi.c | 100 ++++ drivers/iio/accel/bmi088-accel.h | 11 + 5 files changed, 811 insertions(+)create mode 100644
drivers/iio/accel/bmi088-accel-core.ccreate mode 100644drivers/iio/accel/bmi088-accel-spi.ccreate mode 100644drivers/iio/accel/bmi088-accel.hdrivers/iio/accel/Kconfig +17
-0@@ -151,6 +151,23 @@ config BMC150_ACCEL_SPI tristate select REGMAP_SPI +config BMI088_ACCEL + tristate "Bosch BMI088 Accelerometer Driver" + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER + select REGMAP + select BMI088_ACCEL_SPI + help + Say yes here to build support for the Bosch BMI088 accelerometer. + + This is a combo module with both accelerometer and gyroscope. + This driver is only implementing accelerometer part, which has + its own address and register map. + +config BMI088_ACCEL_SPI + tristate + select REGMAP_SPI + config DA280 tristate "MiraMEMS DA280 3-axis 14-bit digital accelerometer driver" depends on I2Cdrivers/iio/accel/Makefile +2
-0@@ -19,6 +19,8 @@ obj-$(CONFIG_BMA400_I2C) += bma400_i2c.o obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o obj-$(CONFIG_BMC150_ACCEL_SPI) += bmc150-accel-spi.o +obj-$(CONFIG_BMI088_ACCEL) += bmi088-accel-core.o +obj-$(CONFIG_BMI088_ACCEL_SPI) += bmi088-accel-spi.o obj-$(CONFIG_DA280) += da280.o obj-$(CONFIG_DA311) += da311.o obj-$(CONFIG_DMARD06) += dmard06.odrivers/iio/accel/bmi088-accel-core.c new file +132
-0@@ -0,0 +1,681 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018, Topic Embedded Products +*/ + +#include <linux/module.h> +#include <linux/interrupt.h> +#include <linux/delay.h> +#include <linux/slab.h> +#include <linux/acpi.h> +#include <linux/pm.h> +#include <linux/pm_runtime.h> +#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> +#include <linux/iio/buffer.h> +#include <linux/iio/events.h> +#include <linux/iio/trigger.h> +#include <linux/iio/trigger_consumer.h> +#include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +#define BMI088_ACCEL_DRV_NAME "bmi088_accel" +#define BMI088_ACCEL_IRQ_NAME "bmi088_accel_event" + +#define BMI088_ACCEL_REG_CHIP_ID 0x00 + +#define BMI088_ACCEL_REG_INT_STATUS 0x1D +#define BMI088_ACCEL_INT_STATUS_BIT_DRDY BIT(7) + +#define BMI088_ACCEL_REG_RESET 0x7E +#define BMI088_ACCEL_RESET_VAL 0xB6 + +#define BMI088_ACCEL_REG_PWR_CTRL 0x7D +#define BMI088_ACCEL_REG_PWR_CONF 0x7C + +#define BMI088_ACCEL_REG_INT_MAP_DATA 0x58 +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT1_DRDY BIT(2) +#define BMI088_ACCEL_INT_MAP_DATA_BIT_INT2_FWM BIT(5) + +#define BMI088_ACCEL_REG_INT1_IO_CONF 0x53 +#define BMI088_ACCEL_INT1_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT1_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_INT2_IO_CONF 0x54 +#define BMI088_ACCEL_INT2_IO_CONF_BIT_ENABLE_OUT BIT(3) +#define BMI088_ACCEL_INT2_IO_CONF_BIT_LVL BIT(1) + +#define BMI088_ACCEL_REG_ACC_CONF 0x40 +#define BMI088_ACCEL_REG_ACC_RANGE 0x41 +#define BMI088_ACCEL_RANGE_3G 0x00 +#define BMI088_ACCEL_RANGE_6G 0x01 +#define BMI088_ACCEL_RANGE_12G 0x02 +#define BMI088_ACCEL_RANGE_24G 0x03 + +#define BMI088_ACCEL_REG_TEMP 0x22 +#define BMI088_ACCEL_TEMP_CENTER_VAL 23 +#define BMI088_ACCEL_TEMP_UNIT 125 + +#define BMI088_ACCEL_REG_XOUT_L 0x12 +#define BMI088_ACCEL_AXIS_TO_REG (axis) \ + (BMI088_ACCEL_REG_XOUT_L + (axis * 2)) + +#define BMI088_ACCEL_MAX_STARTUP_TIME_MS 1 + +#define BMI088_ACCEL_REG_FIFO_STATUS 0x0E +#define BMI088_ACCEL_REG_FIFO_CONFIG0 0x48 +#define BMI088_ACCEL_REG_FIFO_CONFIG1 0x49 +#define BMI088_ACCEL_REG_FIFO_DATA 0x3F +#define BMI088_ACCEL_FIFO_LENGTH 100 + +#define BMI088_ACCEL_FIFO_MODE_FIFO 0x40 +#define BMI088_ACCEL_FIFO_MODE_STREAM 0x80 + +enum bmi088_accel_axis { +AXIS_X , +AXIS_Y , +AXIS_Z , +AXIS_MAX , +}; + +enum bmi088_power_modes { +BMI088_ACCEL_MODE_ACTIVE , +BMI088_ACCEL_MODE_SUSPEND , +}; + +/* Available OSR (over sampling rate) */ +enum bmi088_osr_modes { +BMI088_ACCEL_MODE_OSR_NORMAL =0xA , +BMI088_ACCEL_MODE_OSR_2 =0x9 , +BMI088_ACCEL_MODE_OSR_4 =0x8 , +}; + +/* Available ODR (output data rates) in Hz */ +enum bmi088_odr_modes { +BMI088_ACCEL_MODE_ODR_12_5 =0x5 , +BMI088_ACCEL_MODE_ODR_25 =0x6 , +BMI088_ACCEL_MODE_ODR_50 =0x7 , +BMI088_ACCEL_MODE_ODR_100 =0x8 , +BMI088_ACCEL_MODE_ODR_200 =0x9 , +BMI088_ACCEL_MODE_ODR_400 =0xa , +BMI088_ACCEL_MODE_ODR_800 =0xb , +BMI088_ACCEL_MODE_ODR_1600 =0xc , +}; + +struct bmi088_scale_info { +int scale; +u8 reg_range; +}; + +struct bmi088_accel_chip_info { +const char *name; +u8 chip_id; +const struct iio_chan_spec *channels; +int num_channels; +const struct bmi088_scale_info scale_table[4 ]; +}; + +struct bmi088_accel_interrupt { +const struct bmi088_accel_interrupt_info *info; +atomic_t users; +}; + + +enum bmi088_accel_interrupt_id { +BMI088_ACCEL_INT_DATA_READY , +BMI088_ACCEL_INT_FIFO_WATERMARK , +BMI088_ACCEL_INTERRUPTS ,drivers/iio/accel/bmi088-accel-core.c line 142
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+}; + +struct bmi088_accel_data { +struct regmap *regmap; +int irq; +struct bmi088_accel_interrupt interrupts[BMI088_ACCEL_INTERRUPTS ]; +struct iio_trigger *dready_trig; +struct mutex mutex; +u8 fifo_mode, watermark; +s16 buffer[8 ];Not used. Please clear out all the parts you aren't currently using and bring them in when they can be reviewed alongside the code adding the feature that needs them.
Quoted 75 lines
drivers/iio/accel/bmi088-accel-core.c new file +75
-0+u8 bw_bits; +int ev_enable_state; +int64_t timestamp, old_timestamp;/* Only used in hw fifo mode. */ +const struct bmi088_accel_chip_info *chip_info; +}; + +const struct regmap_config bmi088_regmap_conf = { + .reg_bits =8 , + .val_bits =8 , + .max_register =0x7E , +}; +EXPORT_SYMBOL_GPL (bmi088_regmap_conf); + + +static int bmi088_accel_enable (struct bmi088_accel_data *data, +bool on_off) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CTRL , + on_off ?0x4 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_PWR_CTRL reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_set_mode (struct bmi088_accel_data *data, +enum bmi088_power_modes mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_PWR_CONF , + mode ==BMI088_ACCEL_MODE_SUSPEND ?0x3 :0x0 ); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_set_bw (struct bmi088_accel_data *data, +enum bmi088_odr_modes odr_mode, +enum bmi088_osr_modes osr_mode) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value = (osr_mode <<4 ) | (odr_mode &0xF ); + + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_CONF , value); +if (ret <0 ) { +dev_err (dev,"Error writing ACCEL_PWR_CONF reg\n" ); +return ret; + } + +return 0 ; +} + +static int bmi088_accel_get_bw (struct bmi088_accel_data *data,int *val, +int *val2) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +unsigned int value; + + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_ACC_CONF , + &value); +if (ret <0 ) { +dev_err (dev,"Error reading ACC_CONF reg\n" ); +mutex_unlock (&data->mutex);
Quoted 8 lines
drivers/iio/accel/bmi088-accel-core.c line 222
Quoted 5 lines
drivers/iio/accel/bmi088-accel-core.c new file +5
-0+return ret; + } + + *val = (value &0xF );/* ODR */ + *val2 = (value >>4 );/* OSR */ Superficially it seems unlikely that will map directly to the IIO defined ABI. See docs ref below.
Yeah, that's a bug. I implemented bmi088_accel_{g|s}et_sample_freq() instead.
The OSR setting is actually the filter bandwidth setting, it's not supported by the driver for now.
Quoted 18 lines
Quoted 5 lines
drivers/iio/accel/bmi088-accel-core.c new file +4
-0+ +return 0 ; +} +drivers/iio/accel/bmi088-accel-core.c line 236
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+static int bmi088_accel_get_temp (struct bmi088_accel_data *data,int *val) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +u8 value[2 ]; +unsigned int temp; + +mutex_lock (&data->mutex); + +/* Read temp reg MSB */ Seems likely it's reading the whole thing..
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c line 238
Quoted 2 lines
drivers/iio/accel/bmi088-accel-core.c new file +2
-0+ ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_REG_TEMP , + &value,sizeof (value));Buffers to
regmap_bulk_readneed to be DMA safe. No buffer on the stack is. Look at how we do it in other drivers with__cacheline_alignedwithin the structure behindiio_priv.
I'll allocate a single buffer in the struct for all bulk reads and protect it with the mutex already there.
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c line 245
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+if (ret <0 ) { +dev_err (dev,"Error reading BMI088_ACCEL_REG_TEMP\n" ); +mutex_unlock (&data->mutex); +return ret; + } + temp = (unsigned int )value[0 ] <<3 ; + temp |= (value[1 ] >>5 );this looks like an endian conversion with a shift after? Please do it as that, rather than explicitly. On some hosts the endian conversion will be a noop.
Yeah, it's just a 11-bit integer. The datasheet had this obscure code, the implementation is just:
*val = sign_extend32(get_unaligned_be16(buffer), 11);
Quoted 66 lines
Quoted 43 lines
drivers/iio/accel/bmi088-accel-core.c new file +42
-0+ +if (temp >1023 ) + *val = temp -2028 ; +else + *val = temp; + +mutex_unlock (&data->mutex); + +return IIO_VAL_INT ; +} + +static int bmi088_accel_get_axis (struct bmi088_accel_data *data, +struct iio_chan_spec const *chan, +int *val) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; +int axis = chan->scan_index; +__le16 raw_val; + +mutex_lock (&data->mutex); + + ret =regmap_bulk_read (data->regmap,BMI088_ACCEL_AXIS_TO_REG (axis), + &raw_val,sizeof (raw_val)); +if (ret <0 ) { +dev_err (dev,"Error reading axis %d\n" , axis); +mutex_unlock (&data->mutex); +return ret; + } + *val =sign_extend32 (le16_to_cpu (raw_val) >> chan->scan_type.shift, + chan->scan_type.realbits -1 ); + +mutex_unlock (&data->mutex); + +return IIO_VAL_INT ; +} + +static int bmi088_accel_read_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int *val,int *val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev);drivers/iio/accel/bmi088-accel-core.c line 297
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+int ret; +unsigned int range; + +switch (mask) { +case IIO_CHAN_INFO_RAW : +switch (chan->type) { +case IIO_TEMP : +return bmi088_accel_get_temp (data, val); +case IIO_ACCEL : +if (iio_buffer_enabled (indio_dev))We have
iio_device_claim_direct_modeand friends
to safely protect against a transition in mode during a sysfs read.Quoted 9 lines
drivers/iio/accel/bmi088-accel-core.c new file +9
-0+return -EBUSY ; + + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , &range); +if (ret <0 ) +return ret; + + ret =bmi088_accel_get_axis (data, chan, val); +if (ret <0 )
Quoted 8 lines
drivers/iio/accel/bmi088-accel-core.c line 309
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+return ret; + + *val = (*val *3 *980 * (0x01 << range)) >>15 ;Rather feels like you are applying some scaling here that should be left to userspace. When you add buffered support you won't want to do this and hence you'll end up with an inconsistent interface if you do it the sysfs path.
Moved this to IIO_CHAN_INFO_SCALE and return the raw value directly.
Quoted 28 lines
Quoted 14 lines
drivers/iio/accel/bmi088-accel-core.c new file +13
-0+ +return IIO_VAL_INT ; +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_OFFSET : +switch (chan->type) { +case IIO_TEMP : + *val =BMI088_ACCEL_TEMP_CENTER_VAL ; +return IIO_VAL_INT ; +default : +return -EINVAL ; + }drivers/iio/accel/bmi088-accel-core.c line 332
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+case IIO_CHAN_INFO_SCALE : + *val =0 ; +switch (chan->type) { +case IIO_TEMP : + *val =BMI088_ACCEL_TEMP_UNIT ; +return IIO_VAL_INT ; +case IIO_ACCEL : + { + ret =regmap_read (data->regmap, +BMI088_ACCEL_REG_ACC_RANGE , val);Feels unlikely that that is is returning an appropriate value for scale. See the ABI docs
Quoted 1 line
Documentation/ABI/testing/sysfs-bus-iio*
Yeah, this is broken. Merge with the scaling function.
Quoted 134 lines
Quoted 54 lines
drivers/iio/accel/bmi088-accel-core.c new file +52
-0+if (ret <0 ) { +dev_err (&indio_dev->dev, +"%s(): Read from device failed(%d)\n" , + __func__, ret); +return -EINVAL ; + } + +return IIO_VAL_INT ; + } +default : +return -EINVAL ; + } +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_get_bw (data, val, val2); +mutex_unlock (&data->mutex); +return ret; +default : +return -EINVAL ; + } +} + +static int bmi088_accel_write_raw (struct iio_dev *indio_dev, +struct iio_chan_spec const *chan, +int val,int val2,long mask) +{ +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +switch (mask) { +case IIO_CHAN_INFO_SAMP_FREQ : +mutex_lock (&data->mutex); + ret =bmi088_accel_set_bw (data, val, val2); +mutex_unlock (&data->mutex); +break ; +default : + ret = -EINVAL ; + } + +return ret; +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL("12.5 25 50 100 200 400 800 1600"); + +static struct attribute *bmi088_accel_attributes[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, +NULL , +}; + +static const struct attribute_group bmi088_accel_attrs_group = { + .attrs = bmi088_accel_attributes, +};drivers/iio/accel/bmi088-accel-core.c line 394
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ +#define BMI088_ACCEL_CHANNEL (_axis, bits) { \ + .type = IIO_ACCEL, \ + .modified = 1, \ + .channel2 = IIO_MOD_##_axis, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ + .scan_index = AXIS_##_axis, \ + .scan_type = { \bring this in only when you add buffered support.
Quoted 18 lines
drivers/iio/accel/bmi088-accel-core.c new file +18
-0+ .sign = 's', \ + .realbits = (bits), \ + .storagebits = 16, \ + .shift = 16 - (bits), \ + .endianness = IIO_LE, \ + }, \ +} + +#define BMI088_ACCEL_CHANNELS (bits) { \ + { \ + .type = IIO_TEMP, \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_OFFSET), \ + .scan_index = -1, \ + }, \ + BMI088_ACCEL_CHANNEL(X, bits), \ + BMI088_ACCEL_CHANNEL(Y, bits), \drivers/iio/accel/bmi088-accel-core.c line 422
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ BMI088_ACCEL_CHANNEL(Z, bits), \ + IIO_CHAN_SOFT_TIMESTAMP(3), \ +} + +static const struct iio_chan_spec bmi088_accel_channels[] = +BMI088_ACCEL_CHANNELS (16 ); + +static const struct bmi088_accel_chip_info bmi088_accel_chip_info_tbl[] = { + [0 ] = { + .name ="BMI088A" ,lower case for names in the sysfs interface (not sure that's actually documented anywhere though... :(
drivers/iio/accel/bmi088-accel-core.c line 429
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+ .chip_id = 0x1E, + .channels = bmi088_accel_channels, + .num_channels = ARRAY_SIZE(bmi088_accel_channels), + .scale_table = { {9610, BMI088_ACCEL_RANGE_3G}, + {19122, BMI088_ACCEL_RANGE_6G}, + {38344, BMI088_ACCEL_RANGE_12G}, + {76590, BMI088_ACCEL_RANGE_24G} },bring the scale table in when you support using it.
Quoted 24 lines
drivers/iio/accel/bmi088-accel-core.c new file +24
-0+ }, +}; + +static const struct iio_info bmi088_accel_info = { + .attrs = &bmi088_accel_attrs_group, + .read_raw = bmi088_accel_read_raw, + .write_raw = bmi088_accel_write_raw, +}; + +static const unsigned long bmi088_accel_scan_masks[] = { +BIT (AXIS_X ) |BIT (AXIS_Y ) |BIT (AXIS_Z ), +0 }; + + + +#ifdef CONFIG_PM +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret; + +if (on) { + ret =pm_runtime_get_sync (dev);
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c line 456
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ }else { +pm_runtime_mark_last_busy (dev); + ret =pm_runtime_put_autosuspend (dev);Seems you are using autosuspend which is good. However, I'm not seeing the setup of times etc that I'd expect to see in probe.
Yep, there's a bunch missing in probe.
Quoted 126 lines
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +6
-0+ } + +if (ret <0 ) { +dev_err (dev,"Failed: %s(%d)\n" , __func__, on); +if (on) +pm_runtime_put_noidle (dev);drivers/iio/accel/bmi088-accel-core.c line 472
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ + return ret; + } + +return 0 ; +} +#else +static int bmi088_accel_set_power_state (struct bmi088_accel_data *data, +bool on) +{Hmm. It's a bit irritating that not all the of the
runtime_pmcalls are safe when it's not built. I guess a few might have unexpected results as 'do nothing' isn't always the right option.drivers/iio/accel/bmi088-accel-core.c line 484
Quoted 12 lines
drivers/iio/accel/bmi088-accel-core.c new file +12
-0+ return 0; +} +#endif + +static int bmi088_accel_chip_init (struct bmi088_accel_data *data) +{ +struct device *dev =regmap_get_device (data->regmap); +int ret, i; +unsigned int val; + +/* Do a dummy read (of chip ID), to enable SPI interface */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val);Given this is in the generic code, not the SPI code, should probably put something about "if SPI in use, does no harm otherwise".
Quoted 46 lines
drivers/iio/accel/bmi088-accel-core.c new file +46
-0+ +/* +* Reset chip to get it in a known good state. A delay of 1ms after +* reset is required according to the data sheet +*/ +regmap_write (data->regmap,BMI088_ACCEL_REG_RESET , +BMI088_ACCEL_RESET_VAL ); +usleep_range (1000 ,2000 ); + +/* Do a dummy read (of chip ID), to enable SPI interface after reset */ +regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); + +/* Read chip ID */ + ret =regmap_read (data->regmap,BMI088_ACCEL_REG_CHIP_ID , &val); +if (ret <0 ) { +dev_err (dev,"Error: Reading chip id\n" ); +return ret; + } + +/* Validate chip ID */ +dev_dbg (dev,"Chip Id %x\n" , val); +for (i =0 ; i <ARRAY_SIZE (bmi088_accel_chip_info_tbl); i++) { +if (bmi088_accel_chip_info_tbl[i].chip_id == val) { + data->chip_info = &bmi088_accel_chip_info_tbl[i]; +break ; + } + } + +if (!data->chip_info) { +dev_err (dev,"Invalid chip %x\n" , val); +return -ENODEV ; + } + +/* Set Active mode (and wait for 5ms) */ + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (5000 ,10000 ); + +/* Enable accelerometer */ + ret =bmi088_accel_enable (data, true); +if (ret <0 ) +return ret; + +/* Set Bandwidth */ drivers/iio/accel/bmi088-accel-core.c line 540
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ ret =bmi088_accel_set_bw (data,BMI088_ACCEL_MODE_ODR_100 , +BMI088_ACCEL_MODE_OSR_NORMAL ); +if (ret <0 ) +return ret; + +/* Set Default Range */ + ret =regmap_write (data->regmap,BMI088_ACCEL_REG_ACC_RANGE , +BMI088_ACCEL_RANGE_6G ); +if (ret <0 ) { +dev_err (dev,"Error writing ACC_RANGE\n" );In consistent. Either have
dev_errfor all such cases, or none. I'm perfectly happy with either, but not a mixture :)Quoted 28 lines
drivers/iio/accel/bmi088-accel-core.c new file +28
-0+return ret; + } + +return 0 ; +} + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap, +int irq,const char *name,bool block_supported) +{ +struct bmi088_accel_data *data; +struct iio_dev *indio_dev; +int ret; + + indio_dev =devm_iio_device_alloc (dev,sizeof (*data)); +if (!indio_dev) +return -ENOMEM ; + + data =iio_priv (indio_dev); +dev_set_drvdata (dev, indio_dev); + data->irq = irq; + + data->regmap = regmap; + + ret =bmi088_accel_chip_init (data); +if (ret <0 ) +return ret; + +mutex_init (&data->mutex);
Quoted 8 lines
drivers/iio/accel/bmi088-accel-core.c line 573
Quoted 5 lines
drivers/iio/accel/bmi088-accel-core.c new file +5
-0+ + indio_dev->dev.parent = dev; + indio_dev->channels = data->chip_info->channels; + indio_dev->num_channels = data->chip_info->num_channels; + indio_dev->name = name ? name : data->chip_info->name;Should probably always be the
chip_info->name. If not, please add a comment saying why not.
This bit was just copied blindly from other drivers (e.g. the bmc150). I'll happily replace it and get rid of the "name" parameter. I have no idea whatsoever what the rationale behind it was.
Quoted 64 lines
drivers/iio/accel/bmi088-accel-core.c line 578
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c new file +5
-0+ indio_dev->available_scan_masks = bmi088_accel_scan_masks; + indio_dev->modes =INDIO_DIRECT_MODE ; + indio_dev->info = &bmi088_accel_info; + +if (ret <0 ) {Seems like you are currently missing the buffered setup.
Quoted 14 lines
drivers/iio/accel/bmi088-accel-core.c new file +14
-0+dev_err (dev,"Failed: iio triggered buffer setup\n" ); +return ret; + } + + ret =iio_device_register (indio_dev); +if (ret <0 ) { +dev_err (dev,"Unable to register iio device\n" ); +iio_trigger_unregister (data->dready_trig); + } + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_probe); +drivers/iio/accel/bmi088-accel-core.c line 602
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+int bmi088_accel_core_remove (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +iio_device_unregister (indio_dev); + +pm_runtime_disable (dev); +pm_runtime_set_suspended (dev); +pm_runtime_put_noidle (dev);This runtime PM stuff doesn't clearly match with undoing stuff set up in probe.
drivers/iio/accel/bmi088-accel-core.c line 612
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+ +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +mutex_unlock (&data->mutex); + +return 0 ; +} +EXPORT_SYMBOL_GPL (bmi088_accel_core_remove); + +#ifdef CONFIG_PM_SLEEP Change to marking these
__maybe_unused. The dance with CONFIG_PM* goes wrong too often so these days it's preferred to just let the compiler / linker deal with these functions not being used if they are never called.drivers/iio/accel/bmi088-accel-core.c line 619
Quoted 7 lines
drivers/iio/accel/bmi088-accel-core.c new file +7
-0+static int bmi088_accel_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND );Is it worth going further for suspend / resume and looking at whether some of the power supplies can be disabled?
Quoted 5 lines
Note that you'd need regulator support to do that.
The first patch we get to almost every driver is when someone finds
they need to add regulator enable / disable for their board. Easier to
add it from the start if you are happy to do so.
I think it's unlikely for this chip. It's designed for battery use, so in standby it's already really efficient.
Tuning off its power supply would also require remembering config settings across power downs. Don't think it's worth the effort here.
Quoted 31 lines
Quoted 17 lines
drivers/iio/accel/bmi088-accel-core.c new file +16
-0+mutex_unlock (&data->mutex); + +return 0 ; +} + +static int bmi088_accel_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); + +mutex_lock (&data->mutex); +bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +mutex_unlock (&data->mutex); + +return 0 ; +}drivers/iio/accel/bmi088-accel-core.c line 645
Quoted 10 lines
drivers/iio/accel/bmi088-accel-core.c new file +10
-0+#endif + +#ifdef CONFIG_PM +static int bmi088_accel_runtime_suspend (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +dev_dbg (dev, __func__);Drop these as no useful information that can't be obtained via numerous other methods (ftrace etc)
Quoted 6 lines
drivers/iio/accel/bmi088-accel-core.c line 648
Quoted 3 lines
drivers/iio/accel/bmi088-accel-core.c new file +3
-0+ ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_SUSPEND ); +if (ret <0 ) +return -EAGAIN ;I'd like a comment for this to explain why we might want to back off and try again.
Blindly copied from another driver. Also does not makes sense to me. Just a "return ret" is much more logical.
Quoted 41 lines
Quoted 41 lines
drivers/iio/accel/bmi088-accel-core.c new file +33
-0+ +return 0 ; +} + +static int bmi088_accel_runtime_resume (struct device *dev) +{ +struct iio_dev *indio_dev =dev_get_drvdata (dev); +struct bmi088_accel_data *data =iio_priv (indio_dev); +int ret; + +dev_dbg (dev, __func__); + + ret =bmi088_accel_set_mode (data,BMI088_ACCEL_MODE_ACTIVE ); +if (ret <0 ) +return ret; + +usleep_range (BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 , +BMI088_ACCEL_MAX_STARTUP_TIME_MS *1000 *2 ); + +return 0 ; +} +#endif + +const struct dev_pm_ops bmi088_accel_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(bmi088_accel_suspend, bmi088_accel_resume) +SET_RUNTIME_PM_OPS (bmi088_accel_runtime_suspend, + bmi088_accel_runtime_resume,NULL ) +}; +EXPORT_SYMBOL_GPL (bmi088_accel_pm_ops); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (core)" );drivers/iio/accel/bmi088-accel-spi.c new file +1
-0@@ -0,0 +1,100 @@ +// SPDX-License-Identifier: GPL-2.0
Quoted 8 lines
drivers/iio/accel/bmi088-accel-spi.c line 6
Quoted 5 lines
drivers/iio/accel/bmi088-accel-spi.c new file +5
-0+/* +* 3-axis accelerometer driver supporting following Bosch-Sensortec chips: +* - BMI088 +* +* Copyright (c) 2018, Topic Embedded Products Probably change that to 2018-2020 given at least some changes are going to come out of this review :)
Yeah. Wouldn't want legal to come down on me...
Quoted 46 lines
drivers/iio/accel/bmi088-accel-spi.c line 11
Quoted 6 lines
drivers/iio/accel/bmi088-accel-spi.c new file +5
-0+*/ + +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/acpi.h> Why acpi header?
drivers/iio/accel/bmi088-accel-spi.c line 13
Quoted 2 lines
drivers/iio/accel/bmi088-accel-spi.c new file +2
-0+#include <linux/iio/iio.h> +#include <linux/iio/sysfs.h> I don't think either of iio headers is used in this file.
Quoted 32 lines
drivers/iio/accel/bmi088-accel-spi.c new file +32
-0+#include <linux/spi/spi.h> +#include <linux/regmap.h> + +#include "bmi088-accel.h" + +int bmi088_regmap_spi_write (void *context,const void *data,size_t count) +{ +struct spi_device *spi = context; +u8 buf[count]; + +memcpy (buf, data, count); + +dev_dbg (&spi->dev,"Write val: %x to reg: %x\n" , buf[1 ], buf[0 ]); + +/* +* The SPI register address (= full register address without bit 7) +* and the write command (bit7 = RW = '0') +*/ + buf[0 ] &= ~0x80 ; + +return spi_write (spi, buf, count); +} + +int bmi088_regmap_spi_read (void *context,const void *reg, +size_t reg_size,void *val,size_t val_size) +{ +struct spi_device *spi = context; +u8 addr[reg_size +1 ]; + + addr[0 ] = *(u8 *)reg; + +dev_dbg (&spi->dev,"Read reg: %x\n" , addr[0 ]);
Quoted 8 lines
drivers/iio/accel/bmi088-accel-spi.c line 49
Quoted 4 lines
drivers/iio/accel/bmi088-accel-spi.c new file +4
-0+ + addr[0 ] |=0x80 ;/* bit7 = RW = '1' */ + +/* Do a write of 2 to mimic the dummy byte (see datasheet) */ So I'm guessing
reg_sizeis always 1. Hence the 2. I'd make that explicit in this code, perhaps with a sanity check onreg_size. That will make the comment more obviously reflect what is happening.
Yeah, the size must be 1. Making that explicit also gets rid of the dynamic buffer size.
Quoted 70 lines
Quoted 69 lines
drivers/iio/accel/bmi088-accel-spi.c new file +51
-0+return spi_write_then_read (spi, addr,sizeof (addr), val, val_size); +} + +static struct regmap_bus bmi088_regmap_bus = { + .write = bmi088_regmap_spi_write, + .read = bmi088_regmap_spi_read, + .reg_format_endian_default =REGMAP_ENDIAN_BIG , + .val_format_endian_default =REGMAP_ENDIAN_BIG , +}; + +static int bmi088_accel_probe (struct spi_device *spi) +{ +struct regmap *regmap; +const struct spi_device_id *id =spi_get_device_id (spi); + + regmap =devm_regmap_init (&spi->dev, &bmi088_regmap_bus, + spi, &bmi088_regmap_conf); + +if (IS_ERR (regmap)) { +dev_err (&spi->dev,"Failed to initialize spi regmap\n" ); +return PTR_ERR (regmap); + } + +return bmi088_accel_core_probe (&spi->dev, regmap, spi->irq, id->name, + true); +} + +static int bmi088_accel_remove (struct spi_device *spi) +{ +return bmi088_accel_core_remove (&spi->dev); +} + +static const struct spi_device_id bmi088_accel_id[] = { + {"bmi088_accel" ,0 }, + {} +}; +MODULE_DEVICE_TABLE (spi, bmi088_accel_id); + +static struct spi_driver bmi088_accel_driver = { + .driver = { + .name ="bmi088_accel_spi" , + }, + .probe = bmi088_accel_probe, + .remove = bmi088_accel_remove, + .id_table = bmi088_accel_id, +}; +module_spi_driver (bmi088_accel_driver); + +MODULE_AUTHOR ("Niek van Agt <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMI088 accelerometer driver (SPI)" );drivers/iio/accel/bmi088-accel.h new file +11
-0@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef BMI088_ACCEL_H +#define BMI088_ACCEL_H + +extern const struct regmap_config bmi088_regmap_conf; + +int bmi088_accel_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name,bool block_supported); +int bmi088_accel_core_remove (struct device *dev); + +#endif /* BMI088_ACCEL_H */
Signature · 1 line
Mike Looijmans