Skip to content

L
linux
Commit 4011eda6 authored by Markus Pargmann's avatar Markus Pargmann Committed by Jonathan Cameron
Browse files
Options

iio: bmc150: Use i2c regmap 

This replaces all usage of direct i2c accesses with regmap accesses.
Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Tested-by: default avatarIrina Tirdea <irina.tirdea@intel.com>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 0f079650
Show whitespace changes
Inline Side-by-side
Showing with 99 additions and 128 deletions
drivers/iio/accel/Kconfig
View file @ 4011eda6
...@@ -22,6 +22,8 @@ config BMC150_ACCEL ...@@ -22,6 +22,8 @@ config BMC150_ACCEL
depends on I2C depends on I2C
select IIO_BUFFER select IIO_BUFFER
select IIO_TRIGGERED_BUFFER select IIO_TRIGGERED_BUFFER
select REGMAP
select REGMAP_I2C
help help
Say yes here to build support for the following Bosch accelerometers: Say yes here to build support for the following Bosch accelerometers:
BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280. BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
......
drivers/iio/accel/bmc150-accel.c
View file @ 4011eda6
...@@ -35,6 +35,7 @@ ...@@ -35,6 +35,7 @@
#include <linux/iio/trigger.h> #include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h> #include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h> #include <linux/iio/triggered_buffer.h>
#include <linux/regmap.h>
#define BMC150_ACCEL_DRV_NAME "bmc150_accel" #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
#define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event" #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
...@@ -185,6 +186,8 @@ enum bmc150_accel_trigger_id { ...@@ -185,6 +186,8 @@ enum bmc150_accel_trigger_id {
struct bmc150_accel_data { struct bmc150_accel_data {
struct i2c_client *client; struct i2c_client *client;
struct regmap *regmap;
struct device *dev;
struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS]; struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
atomic_t active_intr; atomic_t active_intr;
struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS]; struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
...@@ -241,6 +244,12 @@ static const struct { ...@@ -241,6 +244,12 @@ static const struct {
{500000, BMC150_ACCEL_SLEEP_500_MS}, {500000, BMC150_ACCEL_SLEEP_500_MS},
{1000000, BMC150_ACCEL_SLEEP_1_SEC} }; {1000000, BMC150_ACCEL_SLEEP_1_SEC} };
static const struct regmap_config bmc150_i2c_regmap_conf = {
.reg_bits = 8,
.val_bits = 8,
.max_register = 0x3f,
};
static int bmc150_accel_set_mode(struct bmc150_accel_data *data, static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
enum bmc150_power_modes mode, enum bmc150_power_modes mode,
int dur_us) int dur_us)
...@@ -270,8 +279,7 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data, ...@@ -270,8 +279,7 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits); dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n"); dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
return ret; return ret;
...@@ -289,8 +297,7 @@ static int bmc150_accel_set_bw(struct bmc150_accel_data *data, int val, ...@@ -289,8 +297,7 @@ static int bmc150_accel_set_bw(struct bmc150_accel_data *data, int val,
for (i = 0; i < ARRAY_SIZE(bmc150_accel_samp_freq_table); ++i) { for (i = 0; i < ARRAY_SIZE(bmc150_accel_samp_freq_table); ++i) {
if (bmc150_accel_samp_freq_table[i].val == val && if (bmc150_accel_samp_freq_table[i].val == val &&
bmc150_accel_samp_freq_table[i].val2 == val2) { bmc150_accel_samp_freq_table[i].val2 == val2) {
ret = i2c_smbus_write_byte_data( ret = regmap_write(data->regmap,
data->client,
BMC150_ACCEL_REG_PMU_BW, BMC150_ACCEL_REG_PMU_BW,
bmc150_accel_samp_freq_table[i].bw_bits); bmc150_accel_samp_freq_table[i].bw_bits);
if (ret < 0) if (ret < 0)
...@@ -307,26 +314,19 @@ static int bmc150_accel_set_bw(struct bmc150_accel_data *data, int val, ...@@ -307,26 +314,19 @@ static int bmc150_accel_set_bw(struct bmc150_accel_data *data, int val,
static int bmc150_accel_update_slope(struct bmc150_accel_data *data) static int bmc150_accel_update_slope(struct bmc150_accel_data *data)
{ {
int ret, val; int ret;
ret = i2c_smbus_write_byte_data(data->client, BMC150_ACCEL_REG_INT_6, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_6,
data->slope_thres); data->slope_thres);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_6\n"); dev_err(&data->client->dev, "Error writing reg_int_6\n");
return ret; return ret;
} }
ret = i2c_smbus_read_byte_data(data->client, BMC150_ACCEL_REG_INT_5); ret = regmap_update_bits(data->regmap, BMC150_ACCEL_REG_INT_5,
if (ret < 0) { BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
dev_err(&data->client->dev, "Error reading reg_int_5\n");
return ret;
}
val = (ret & ~BMC150_ACCEL_SLOPE_DUR_MASK) | data->slope_dur;
ret = i2c_smbus_write_byte_data(data->client, BMC150_ACCEL_REG_INT_5,
val);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error write reg_int_5\n"); dev_err(&data->client->dev, "Error updating reg_int_5\n");
return ret; return ret;
} }
...@@ -469,38 +469,18 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i, ...@@ -469,38 +469,18 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
return ret; return ret;
/* map the interrupt to the appropriate pins */ /* map the interrupt to the appropriate pins */
ret = i2c_smbus_read_byte_data(data->client, info->map_reg); ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
if (ret < 0) { (state ? info->map_bitmask : 0));
dev_err(&data->client->dev, "Error reading reg_int_map\n");
goto out_fix_power_state;
}
if (state)
ret |= info->map_bitmask;
else
ret &= ~info->map_bitmask;
ret = i2c_smbus_write_byte_data(data->client, info->map_reg,
ret);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_map\n"); dev_err(&data->client->dev, "Error updating reg_int_map\n");
goto out_fix_power_state; goto out_fix_power_state;
} }
/* enable/disable the interrupt */ /* enable/disable the interrupt */
ret = i2c_smbus_read_byte_data(data->client, info->en_reg); ret = regmap_update_bits(data->regmap, info->en_reg, info->en_bitmask,
if (ret < 0) { (state ? info->en_bitmask : 0));
dev_err(&data->client->dev, "Error reading reg_int_en\n");
goto out_fix_power_state;
}
if (state)
ret |= info->en_bitmask;
else
ret &= ~info->en_bitmask;
ret = i2c_smbus_write_byte_data(data->client, info->en_reg, ret);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_en\n"); dev_err(&data->client->dev, "Error updating reg_int_en\n");
goto out_fix_power_state; goto out_fix_power_state;
} }
...@@ -522,8 +502,7 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val) ...@@ -522,8 +502,7 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
for (i = 0; i < ARRAY_SIZE(data->chip_info->scale_table); ++i) { for (i = 0; i < ARRAY_SIZE(data->chip_info->scale_table); ++i) {
if (data->chip_info->scale_table[i].scale == val) { if (data->chip_info->scale_table[i].scale == val) {
ret = i2c_smbus_write_byte_data( ret = regmap_write(data->regmap,
data->client,
BMC150_ACCEL_REG_PMU_RANGE, BMC150_ACCEL_REG_PMU_RANGE,
data->chip_info->scale_table[i].reg_range); data->chip_info->scale_table[i].reg_range);
if (ret < 0) { if (ret < 0) {
...@@ -543,16 +522,17 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val) ...@@ -543,16 +522,17 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
static int bmc150_accel_get_temp(struct bmc150_accel_data *data, int *val) static int bmc150_accel_get_temp(struct bmc150_accel_data *data, int *val)
{ {
int ret; int ret;
unsigned int value;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
ret = i2c_smbus_read_byte_data(data->client, BMC150_ACCEL_REG_TEMP); ret = regmap_read(data->regmap, BMC150_ACCEL_REG_TEMP, &value);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error reading reg_temp\n"); dev_err(&data->client->dev, "Error reading reg_temp\n");
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;
} }
*val = sign_extend32(ret, 7); *val = sign_extend32(value, 7);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
...@@ -565,6 +545,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data, ...@@ -565,6 +545,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
{ {
int ret; int ret;
int axis = chan->scan_index; int axis = chan->scan_index;
unsigned int raw_val;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
ret = bmc150_accel_set_power_state(data, true); ret = bmc150_accel_set_power_state(data, true);
...@@ -573,15 +554,15 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data, ...@@ -573,15 +554,15 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
return ret; return ret;
} }
ret = i2c_smbus_read_word_data(data->client, ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
BMC150_ACCEL_AXIS_TO_REG(axis)); &raw_val, 2);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error reading axis %d\n", axis); dev_err(&data->client->dev, "Error reading axis %d\n", axis);
bmc150_accel_set_power_state(data, false); bmc150_accel_set_power_state(data, false);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
return ret; return ret;
} }
*val = sign_extend32(ret >> chan->scan_type.shift, *val = sign_extend32(raw_val >> chan->scan_type.shift,
chan->scan_type.realbits - 1); chan->scan_type.realbits - 1);
ret = bmc150_accel_set_power_state(data, false); ret = bmc150_accel_set_power_state(data, false);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
...@@ -845,52 +826,34 @@ static int bmc150_accel_set_watermark(struct iio_dev *indio_dev, unsigned val) ...@@ -845,52 +826,34 @@ static int bmc150_accel_set_watermark(struct iio_dev *indio_dev, unsigned val)
* We must read at least one full frame in one burst, otherwise the rest of the * We must read at least one full frame in one burst, otherwise the rest of the
* frame data is discarded. * frame data is discarded.
*/ */
static int bmc150_accel_fifo_transfer(const struct i2c_client *client, static int bmc150_accel_fifo_transfer(struct bmc150_accel_data *data,
char *buffer, int samples) char *buffer, int samples)
{ {
int sample_length = 3 * 2; int sample_length = 3 * 2;
u8 reg_fifo_data = BMC150_ACCEL_REG_FIFO_DATA; int ret;
int ret = -EIO; int total_length = samples * sample_length;
int i;
size_t step = regmap_get_raw_read_max(data->regmap);
if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) { if (!step || step > total_length)
struct i2c_msg msg[2] = { step = total_length;
{ else if (step < total_length)
.addr = client->addr, step = sample_length;
.flags = 0,
.buf = &reg_fifo_data,
.len = sizeof(reg_fifo_data),
},
{
.addr = client->addr,
.flags = I2C_M_RD,
.buf = (u8 *)buffer,
.len = samples * sample_length,
}
};
ret = i2c_transfer(client->adapter, msg, 2); /*
if (ret != 2) * Seems we have a bus with size limitation so we have to execute
ret = -EIO; * multiple reads
else */
ret = 0; for (i = 0; i < total_length; i += step) {
} else { ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
int i, step = I2C_SMBUS_BLOCK_MAX / sample_length; &buffer[i], step);
if (ret)
for (i = 0; i < samples * sample_length; i += step) {
ret = i2c_smbus_read_i2c_block_data(client,
reg_fifo_data, step,
&buffer[i]);
if (ret != step) {
ret = -EIO;
break; break;
} }
ret = 0;
}
}
if (ret) if (ret)
dev_err(&client->dev, "Error transferring data from fifo\n"); dev_err(data->dev, "Error transferring data from fifo in single steps of %zu\n",
step);
return ret; return ret;
} }
...@@ -904,15 +867,15 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev, ...@@ -904,15 +867,15 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
u16 buffer[BMC150_ACCEL_FIFO_LENGTH * 3]; u16 buffer[BMC150_ACCEL_FIFO_LENGTH * 3];
int64_t tstamp; int64_t tstamp;
uint64_t sample_period; uint64_t sample_period;
unsigned int val;
ret = i2c_smbus_read_byte_data(data->client, ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
BMC150_ACCEL_REG_FIFO_STATUS);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error reading reg_fifo_status\n"); dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
return ret; return ret;
} }
count = ret & 0x7F; count = val & 0x7F;
if (!count) if (!count)
return 0; return 0;
...@@ -951,7 +914,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev, ...@@ -951,7 +914,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
if (samples && count > samples) if (samples && count > samples)
count = samples; count = samples;
ret = bmc150_accel_fifo_transfer(data->client, (u8 *)buffer, count); ret = bmc150_accel_fifo_transfer(data, (u8 *)buffer, count);
if (ret) if (ret)
return ret; return ret;
...@@ -1154,17 +1117,19 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p) ...@@ -1154,17 +1117,19 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p)
struct iio_dev *indio_dev = pf->indio_dev; struct iio_dev *indio_dev = pf->indio_dev;
struct bmc150_accel_data *data = iio_priv(indio_dev); struct bmc150_accel_data *data = iio_priv(indio_dev);
int bit, ret, i = 0; int bit, ret, i = 0;
unsigned int raw_val;
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
for_each_set_bit(bit, indio_dev->active_scan_mask, for_each_set_bit(bit, indio_dev->active_scan_mask,
indio_dev->masklength) { indio_dev->masklength) {
ret = i2c_smbus_read_word_data(data->client, ret = regmap_bulk_read(data->regmap,
BMC150_ACCEL_AXIS_TO_REG(bit)); BMC150_ACCEL_AXIS_TO_REG(bit), &raw_val,
2);
if (ret < 0) { if (ret < 0) {
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
goto err_read; goto err_read;
} }
data->buffer[i++] = ret; data->buffer[i++] = raw_val;
} }
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
...@@ -1188,8 +1153,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig) ...@@ -1188,8 +1153,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
mutex_lock(&data->mutex); mutex_lock(&data->mutex);
/* clear any latched interrupt */ /* clear any latched interrupt */
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_INT_MODE_LATCH_INT | BMC150_ACCEL_INT_MODE_LATCH_INT |
BMC150_ACCEL_INT_MODE_LATCH_RESET); BMC150_ACCEL_INT_MODE_LATCH_RESET);
mutex_unlock(&data->mutex); mutex_unlock(&data->mutex);
...@@ -1248,20 +1212,20 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev) ...@@ -1248,20 +1212,20 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
struct bmc150_accel_data *data = iio_priv(indio_dev); struct bmc150_accel_data *data = iio_priv(indio_dev);
int dir; int dir;
int ret; int ret;
unsigned int val;
ret = i2c_smbus_read_byte_data(data->client, ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
BMC150_ACCEL_REG_INT_STATUS_2);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error reading reg_int_status_2\n"); dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
return ret; return ret;
} }
if (ret & BMC150_ACCEL_ANY_MOTION_BIT_SIGN) if (val & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
dir = IIO_EV_DIR_FALLING; dir = IIO_EV_DIR_FALLING;
else else
dir = IIO_EV_DIR_RISING; dir = IIO_EV_DIR_RISING;
if (ret & BMC150_ACCEL_ANY_MOTION_BIT_X) if (val & BMC150_ACCEL_ANY_MOTION_BIT_X)
iio_push_event(indio_dev, iio_push_event(indio_dev,
IIO_MOD_EVENT_CODE(IIO_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
...@@ -1270,7 +1234,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev) ...@@ -1270,7 +1234,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
dir), dir),
data->timestamp); data->timestamp);
if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Y) if (val & BMC150_ACCEL_ANY_MOTION_BIT_Y)
iio_push_event(indio_dev, iio_push_event(indio_dev,
IIO_MOD_EVENT_CODE(IIO_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
...@@ -1279,7 +1243,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev) ...@@ -1279,7 +1243,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
dir), dir),
data->timestamp); data->timestamp);
if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Z) if (val & BMC150_ACCEL_ANY_MOTION_BIT_Z)
iio_push_event(indio_dev, iio_push_event(indio_dev,
IIO_MOD_EVENT_CODE(IIO_ACCEL, IIO_MOD_EVENT_CODE(IIO_ACCEL,
0, 0,
...@@ -1314,8 +1278,7 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private) ...@@ -1314,8 +1278,7 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
} }
if (ack) { if (ack) {
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_INT_MODE_LATCH_INT | BMC150_ACCEL_INT_MODE_LATCH_INT |
BMC150_ACCEL_INT_MODE_LATCH_RESET); BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret) if (ret)
...@@ -1432,7 +1395,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data) ...@@ -1432,7 +1395,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
u8 reg = BMC150_ACCEL_REG_FIFO_CONFIG1; u8 reg = BMC150_ACCEL_REG_FIFO_CONFIG1;
int ret; int ret;
ret = i2c_smbus_write_byte_data(data->client, reg, data->fifo_mode); ret = regmap_write(data->regmap, reg, data->fifo_mode);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_fifo_config1\n"); dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
return ret; return ret;
...@@ -1441,8 +1404,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data) ...@@ -1441,8 +1404,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
if (!data->fifo_mode) if (!data->fifo_mode)
return 0; return 0;
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
BMC150_ACCEL_REG_FIFO_CONFIG0,
data->watermark); data->watermark);
if (ret < 0) if (ret < 0)
dev_err(&data->client->dev, "Error writing reg_fifo_config0\n"); dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
...@@ -1530,23 +1492,25 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = { ...@@ -1530,23 +1492,25 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = {
static int bmc150_accel_chip_init(struct bmc150_accel_data *data) static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
{ {
int ret, i; int ret, i;
unsigned int val;
ret = i2c_smbus_read_byte_data(data->client, BMC150_ACCEL_REG_CHIP_ID); ret = regmap_read(data->regmap, BMC150_ACCEL_REG_CHIP_ID, &val);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error: Reading chip id\n"); dev_err(&data->client->dev,
"Error: Reading chip id\n");
return ret; return ret;
} }
dev_dbg(&data->client->dev, "Chip Id %x\n", ret); dev_dbg(&data->client->dev, "Chip Id %x\n", val);
for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) { for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) {
if (bmc150_accel_chip_info_tbl[i].chip_id == ret) { if (bmc150_accel_chip_info_tbl[i].chip_id == val) {
data->chip_info = &bmc150_accel_chip_info_tbl[i]; data->chip_info = &bmc150_accel_chip_info_tbl[i];
break; break;
} }
} }
if (!data->chip_info) { if (!data->chip_info) {
dev_err(&data->client->dev, "Unsupported chip %x\n", ret); dev_err(&data->client->dev, "Invalid chip %x\n", val);
return -ENODEV; return -ENODEV;
} }
...@@ -1560,11 +1524,11 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data) ...@@ -1560,11 +1524,11 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
return ret; return ret;
/* Set Default Range */ /* Set Default Range */
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
BMC150_ACCEL_REG_PMU_RANGE,
BMC150_ACCEL_DEF_RANGE_4G); BMC150_ACCEL_DEF_RANGE_4G);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_pmu_range\n"); dev_err(&data->client->dev,
"Error writing reg_pmu_range\n");
return ret; return ret;
} }
...@@ -1578,8 +1542,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data) ...@@ -1578,8 +1542,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
return ret; return ret;
/* Set default as latched interrupts */ /* Set default as latched interrupts */
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_INT_MODE_LATCH_INT | BMC150_ACCEL_INT_MODE_LATCH_INT |
BMC150_ACCEL_INT_MODE_LATCH_RESET); BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
...@@ -1606,6 +1569,13 @@ static int bmc150_accel_probe(struct i2c_client *client, ...@@ -1606,6 +1569,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
data = iio_priv(indio_dev); data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev); i2c_set_clientdata(client, indio_dev);
data->client = client; data->client = client;
data->dev = &client->dev;
data->regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
if (IS_ERR(data->regmap)) {
dev_err(&client->dev, "Failed to initialize i2c regmap\n");
return PTR_ERR(data->regmap);
}
if (id) if (id)
name = id->name; name = id->name;
...@@ -1649,8 +1619,7 @@ static int bmc150_accel_probe(struct i2c_client *client, ...@@ -1649,8 +1619,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
* want to use latch mode when we can to prevent interrupt * want to use latch mode when we can to prevent interrupt
* flooding. * flooding.
*/ */
ret = i2c_smbus_write_byte_data(data->client, ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_INT_MODE_LATCH_RESET); BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) { if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n"); dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7