* [PATCH v3 0/4] iio: bmc150 regmap and SPI
@ 2015-09-21 10:55 Markus Pargmann
2015-09-21 10:55 ` [PATCH v3 1/4] iio: bmc150: Use i2c regmap Markus Pargmann
` (4 more replies)
0 siblings, 5 replies; 18+ messages in thread
From: Markus Pargmann @ 2015-09-21 10:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel, Markus Pargmann
Hi,
this series converts the bmc150 driver to use regmap and adds an SPI interface.
Thanks for testing and review so far. I rebased the series onto v4.3-rc2 now
(the togreg branch seems to be on v4.2).
It still works for me but there were some differences regarding the chip id.
Changes in v3:
- Fixed type of variable 'step' which lead to compile warnings. Type is now
size_t.
- Fixed patch that moved irq variable without reason
- Readded MODULE_* to the core driver
- Reintroduced check id NULL check
Changes in v2:
- Removed default values for regmap_config fields.
- Redesigned the fifo_transfer function to avoid running in errors first.
- Dropped irq checks patch as it is already mainline
- Core can now be built as module with autoselection of i2c and spi parts
As my hardware is missing an interrupt line from the SPI connected bmc150 I am
not able to test the iio buffer code path and the i2c code path. Tests would be
appreciated.
@Srinivas:
As there were some rebase conflicts on the first patch, I removed your
reviewed-by tag again for the moment.
Best regards,
Markus
Markus Pargmann (4):
iio: bmc150: Use i2c regmap
iio: bcm150: Remove i2c_client from private data
iio: bmc150: Split the driver into core and i2c
iio: bmc150: Add SPI driver
drivers/iio/accel/Kconfig | 14 +-
drivers/iio/accel/Makefile | 4 +-
.../accel/{bmc150-accel.c => bmc150-accel-core.c} | 388 ++++++++-------------
drivers/iio/accel/bmc150-accel-i2c.c | 102 ++++++
drivers/iio/accel/bmc150-accel-spi.c | 80 +++++
drivers/iio/accel/bmc150-accel.h | 20 ++
6 files changed, 366 insertions(+), 242 deletions(-)
rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (82%)
create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
create mode 100644 drivers/iio/accel/bmc150-accel.h
--
2.5.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* [PATCH v3 1/4] iio: bmc150: Use i2c regmap
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
@ 2015-09-21 10:55 ` Markus Pargmann
2015-09-23 12:47 ` Tirdea, Irina
2015-09-21 10:55 ` [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data Markus Pargmann
` (3 subsequent siblings)
4 siblings, 1 reply; 18+ messages in thread
From: Markus Pargmann @ 2015-09-21 10:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel, Markus Pargmann
This replaces all usage of direct i2c accesses with regmap accesses.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/iio/accel/Kconfig | 2 +
drivers/iio/accel/bmc150-accel.c | 225 +++++++++++++++++----------------------
2 files changed, 99 insertions(+), 128 deletions(-)
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index a59047d7657e..3ff2c83f7492 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -22,6 +22,8 @@ config BMC150_ACCEL
depends on I2C
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
+ select REGMAP
+ select REGMAP_I2C
help
Say yes here to build support for the following Bosch accelerometers:
BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
index 0104cdef8709..a17034fd53fb 100644
--- a/drivers/iio/accel/bmc150-accel.c
+++ b/drivers/iio/accel/bmc150-accel.c
@@ -35,6 +35,7 @@
#include <linux/iio/trigger.h>
#include <linux/iio/trigger_consumer.h>
#include <linux/iio/triggered_buffer.h>
+#include <linux/regmap.h>
#define BMC150_ACCEL_DRV_NAME "bmc150_accel"
#define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
@@ -186,6 +187,8 @@ enum bmc150_accel_trigger_id {
struct bmc150_accel_data {
struct i2c_client *client;
+ struct regmap *regmap;
+ struct device *dev;
struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
atomic_t active_intr;
struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
@@ -242,6 +245,12 @@ static const struct {
{500000, BMC150_ACCEL_SLEEP_500_MS},
{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,
enum bmc150_power_modes mode,
int dur_us)
@@ -271,8 +280,7 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
return ret;
@@ -290,8 +298,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) {
if (bmc150_accel_samp_freq_table[i].val == val &&
bmc150_accel_samp_freq_table[i].val2 == val2) {
- ret = i2c_smbus_write_byte_data(
- data->client,
+ ret = regmap_write(data->regmap,
BMC150_ACCEL_REG_PMU_BW,
bmc150_accel_samp_freq_table[i].bw_bits);
if (ret < 0)
@@ -308,26 +315,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)
{
- 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);
if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_6\n");
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,
+ BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
if (ret < 0) {
- 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) {
- dev_err(&data->client->dev, "Error write reg_int_5\n");
+ dev_err(&data->client->dev, "Error updating reg_int_5\n");
return ret;
}
@@ -470,38 +470,18 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
return ret;
/* map the interrupt to the appropriate pins */
- ret = i2c_smbus_read_byte_data(data->client, info->map_reg);
- if (ret < 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);
+ ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
+ (state ? info->map_bitmask : 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;
}
/* 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,
+ (state ? info->en_bitmask : 0));
if (ret < 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) {
- 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;
}
@@ -523,8 +503,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) {
if (data->chip_info->scale_table[i].scale == val) {
- ret = i2c_smbus_write_byte_data(
- data->client,
+ ret = regmap_write(data->regmap,
BMC150_ACCEL_REG_PMU_RANGE,
data->chip_info->scale_table[i].reg_range);
if (ret < 0) {
@@ -544,16 +523,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)
{
int ret;
+ unsigned int value;
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) {
dev_err(&data->client->dev, "Error reading reg_temp\n");
mutex_unlock(&data->mutex);
return ret;
}
- *val = sign_extend32(ret, 7);
+ *val = sign_extend32(value, 7);
mutex_unlock(&data->mutex);
@@ -566,6 +546,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
{
int ret;
int axis = chan->scan_index;
+ unsigned int raw_val;
mutex_lock(&data->mutex);
ret = bmc150_accel_set_power_state(data, true);
@@ -574,15 +555,15 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
return ret;
}
- ret = i2c_smbus_read_word_data(data->client,
- BMC150_ACCEL_AXIS_TO_REG(axis));
+ ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
+ &raw_val, 2);
if (ret < 0) {
dev_err(&data->client->dev, "Error reading axis %d\n", axis);
bmc150_accel_set_power_state(data, false);
mutex_unlock(&data->mutex);
return ret;
}
- *val = sign_extend32(ret >> chan->scan_type.shift,
+ *val = sign_extend32(raw_val >> chan->scan_type.shift,
chan->scan_type.realbits - 1);
ret = bmc150_accel_set_power_state(data, false);
mutex_unlock(&data->mutex);
@@ -846,52 +827,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
* 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)
{
int sample_length = 3 * 2;
- u8 reg_fifo_data = BMC150_ACCEL_REG_FIFO_DATA;
- int ret = -EIO;
-
- if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
- struct i2c_msg msg[2] = {
- {
- .addr = client->addr,
- .flags = 0,
- .buf = ®_fifo_data,
- .len = sizeof(reg_fifo_data),
- },
- {
- .addr = client->addr,
- .flags = I2C_M_RD,
- .buf = (u8 *)buffer,
- .len = samples * sample_length,
- }
- };
+ int ret;
+ int total_length = samples * sample_length;
+ int i;
+ size_t step = regmap_get_raw_read_max(data->regmap);
- ret = i2c_transfer(client->adapter, msg, 2);
- if (ret != 2)
- ret = -EIO;
- else
- ret = 0;
- } else {
- int i, step = I2C_SMBUS_BLOCK_MAX / sample_length;
-
- 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;
- }
+ if (!step || step > total_length)
+ step = total_length;
+ else if (step < total_length)
+ step = sample_length;
- ret = 0;
- }
+ /*
+ * Seems we have a bus with size limitation so we have to execute
+ * multiple reads
+ */
+ for (i = 0; i < total_length; i += step) {
+ ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
+ &buffer[i], step);
+ if (ret)
+ break;
}
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;
}
@@ -905,15 +868,15 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
u16 buffer[BMC150_ACCEL_FIFO_LENGTH * 3];
int64_t tstamp;
uint64_t sample_period;
+ unsigned int val;
- ret = i2c_smbus_read_byte_data(data->client,
- BMC150_ACCEL_REG_FIFO_STATUS);
+ ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
if (ret < 0) {
dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
return ret;
}
- count = ret & 0x7F;
+ count = val & 0x7F;
if (!count)
return 0;
@@ -952,7 +915,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
if (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)
return ret;
@@ -1155,17 +1118,19 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p)
struct iio_dev *indio_dev = pf->indio_dev;
struct bmc150_accel_data *data = iio_priv(indio_dev);
int bit, ret, i = 0;
+ unsigned int raw_val;
mutex_lock(&data->mutex);
for_each_set_bit(bit, indio_dev->active_scan_mask,
indio_dev->masklength) {
- ret = i2c_smbus_read_word_data(data->client,
- BMC150_ACCEL_AXIS_TO_REG(bit));
+ ret = regmap_bulk_read(data->regmap,
+ BMC150_ACCEL_AXIS_TO_REG(bit), &raw_val,
+ 2);
if (ret < 0) {
mutex_unlock(&data->mutex);
goto err_read;
}
- data->buffer[i++] = ret;
+ data->buffer[i++] = raw_val;
}
mutex_unlock(&data->mutex);
@@ -1189,10 +1154,9 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
mutex_lock(&data->mutex);
/* clear any latched interrupt */
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_INT_RST_LATCH,
- BMC150_ACCEL_INT_MODE_LATCH_INT |
- BMC150_ACCEL_INT_MODE_LATCH_RESET);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
+ BMC150_ACCEL_INT_MODE_LATCH_INT |
+ BMC150_ACCEL_INT_MODE_LATCH_RESET);
mutex_unlock(&data->mutex);
if (ret < 0) {
dev_err(&data->client->dev,
@@ -1249,20 +1213,20 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
struct bmc150_accel_data *data = iio_priv(indio_dev);
int dir;
int ret;
+ unsigned int val;
- ret = i2c_smbus_read_byte_data(data->client,
- BMC150_ACCEL_REG_INT_STATUS_2);
+ ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
if (ret < 0) {
dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
return ret;
}
- if (ret & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
+ if (val & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
dir = IIO_EV_DIR_FALLING;
else
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_MOD_EVENT_CODE(IIO_ACCEL,
0,
@@ -1271,7 +1235,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
dir),
data->timestamp);
- if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Y)
+ if (val & BMC150_ACCEL_ANY_MOTION_BIT_Y)
iio_push_event(indio_dev,
IIO_MOD_EVENT_CODE(IIO_ACCEL,
0,
@@ -1280,7 +1244,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
dir),
data->timestamp);
- if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Z)
+ if (val & BMC150_ACCEL_ANY_MOTION_BIT_Z)
iio_push_event(indio_dev,
IIO_MOD_EVENT_CODE(IIO_ACCEL,
0,
@@ -1315,10 +1279,9 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
}
if (ack) {
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_INT_RST_LATCH,
- BMC150_ACCEL_INT_MODE_LATCH_INT |
- BMC150_ACCEL_INT_MODE_LATCH_RESET);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
+ BMC150_ACCEL_INT_MODE_LATCH_INT |
+ BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret)
dev_err(&data->client->dev,
"Error writing reg_int_rst_latch\n");
@@ -1459,7 +1422,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
u8 reg = BMC150_ACCEL_REG_FIFO_CONFIG1;
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) {
dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
return ret;
@@ -1468,9 +1431,8 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
if (!data->fifo_mode)
return 0;
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_FIFO_CONFIG0,
- data->watermark);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
+ data->watermark);
if (ret < 0)
dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
@@ -1557,23 +1519,25 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = {
static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
{
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) {
- dev_err(&data->client->dev, "Error: Reading chip id\n");
+ dev_err(&data->client->dev,
+ "Error: Reading chip id\n");
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++) {
- 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];
break;
}
}
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;
}
@@ -1587,11 +1551,11 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
return ret;
/* Set Default Range */
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_PMU_RANGE,
- BMC150_ACCEL_DEF_RANGE_4G);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
+ BMC150_ACCEL_DEF_RANGE_4G);
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;
}
@@ -1605,10 +1569,9 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
return ret;
/* Set default as latched interrupts */
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_INT_RST_LATCH,
- BMC150_ACCEL_INT_MODE_LATCH_INT |
- BMC150_ACCEL_INT_MODE_LATCH_RESET);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
+ BMC150_ACCEL_INT_MODE_LATCH_INT |
+ BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) {
dev_err(&data->client->dev,
"Error writing reg_int_rst_latch\n");
@@ -1633,6 +1596,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev);
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)
name = id->name;
@@ -1679,9 +1649,8 @@ static int bmc150_accel_probe(struct i2c_client *client,
* want to use latch mode when we can to prevent interrupt
* flooding.
*/
- ret = i2c_smbus_write_byte_data(data->client,
- BMC150_ACCEL_REG_INT_RST_LATCH,
- BMC150_ACCEL_INT_MODE_LATCH_RESET);
+ ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
+ BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) {
dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
goto err_buffer_cleanup;
--
2.5.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
2015-09-21 10:55 ` [PATCH v3 1/4] iio: bmc150: Use i2c regmap Markus Pargmann
@ 2015-09-21 10:55 ` Markus Pargmann
2015-09-23 12:47 ` Tirdea, Irina
2015-09-21 10:55 ` [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c Markus Pargmann
` (2 subsequent siblings)
4 siblings, 1 reply; 18+ messages in thread
From: Markus Pargmann @ 2015-09-21 10:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel, Markus Pargmann
i2c_client struct is now only used for debugging output. We can use the
device struct as well so we can remove all struct i2c_client usage.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
---
drivers/iio/accel/bmc150-accel.c | 116 +++++++++++++++++++--------------------
1 file changed, 56 insertions(+), 60 deletions(-)
diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
index a17034fd53fb..425885dc6800 100644
--- a/drivers/iio/accel/bmc150-accel.c
+++ b/drivers/iio/accel/bmc150-accel.c
@@ -186,9 +186,9 @@ enum bmc150_accel_trigger_id {
};
struct bmc150_accel_data {
- struct i2c_client *client;
struct regmap *regmap;
struct device *dev;
+ int irq;
struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
atomic_t active_intr;
struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
@@ -278,11 +278,11 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
lpw_bits = mode << BMC150_ACCEL_PMU_MODE_SHIFT;
lpw_bits |= (dur_val << BMC150_ACCEL_PMU_BIT_SLEEP_DUR_SHIFT);
- dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
+ dev_dbg(data->dev, "Set Mode bits %x\n", lpw_bits);
ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
if (ret < 0) {
- dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
+ dev_err(data->dev, "Error writing reg_pmu_lpw\n");
return ret;
}
@@ -320,18 +320,18 @@ static int bmc150_accel_update_slope(struct bmc150_accel_data *data)
ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_6,
data->slope_thres);
if (ret < 0) {
- dev_err(&data->client->dev, "Error writing reg_int_6\n");
+ dev_err(data->dev, "Error writing reg_int_6\n");
return ret;
}
ret = regmap_update_bits(data->regmap, BMC150_ACCEL_REG_INT_5,
BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
if (ret < 0) {
- dev_err(&data->client->dev, "Error updating reg_int_5\n");
+ dev_err(data->dev, "Error updating reg_int_5\n");
return ret;
}
- dev_dbg(&data->client->dev, "%s: %x %x\n", __func__, data->slope_thres,
+ dev_dbg(data->dev, "%s: %x %x\n", __func__, data->slope_thres,
data->slope_dur);
return ret;
@@ -380,17 +380,17 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)
int ret;
if (on) {
- ret = pm_runtime_get_sync(&data->client->dev);
+ ret = pm_runtime_get_sync(data->dev);
} else {
- pm_runtime_mark_last_busy(&data->client->dev);
- ret = pm_runtime_put_autosuspend(&data->client->dev);
+ pm_runtime_mark_last_busy(data->dev);
+ ret = pm_runtime_put_autosuspend(data->dev);
}
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Failed: bmc150_accel_set_power_state for %d\n", on);
if (on)
- pm_runtime_put_noidle(&data->client->dev);
+ pm_runtime_put_noidle(data->dev);
return ret;
}
@@ -473,7 +473,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
(state ? info->map_bitmask : 0));
if (ret < 0) {
- dev_err(&data->client->dev, "Error updating reg_int_map\n");
+ dev_err(data->dev, "Error updating reg_int_map\n");
goto out_fix_power_state;
}
@@ -481,7 +481,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
ret = regmap_update_bits(data->regmap, info->en_reg, info->en_bitmask,
(state ? info->en_bitmask : 0));
if (ret < 0) {
- dev_err(&data->client->dev, "Error updating reg_int_en\n");
+ dev_err(data->dev, "Error updating reg_int_en\n");
goto out_fix_power_state;
}
@@ -507,7 +507,7 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
BMC150_ACCEL_REG_PMU_RANGE,
data->chip_info->scale_table[i].reg_range);
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Error writing pmu_range\n");
return ret;
}
@@ -529,7 +529,7 @@ static int bmc150_accel_get_temp(struct bmc150_accel_data *data, int *val)
ret = regmap_read(data->regmap, BMC150_ACCEL_REG_TEMP, &value);
if (ret < 0) {
- dev_err(&data->client->dev, "Error reading reg_temp\n");
+ dev_err(data->dev, "Error reading reg_temp\n");
mutex_unlock(&data->mutex);
return ret;
}
@@ -558,7 +558,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
&raw_val, 2);
if (ret < 0) {
- dev_err(&data->client->dev, "Error reading axis %d\n", axis);
+ dev_err(data->dev, "Error reading axis %d\n", axis);
bmc150_accel_set_power_state(data, false);
mutex_unlock(&data->mutex);
return ret;
@@ -872,7 +872,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
if (ret < 0) {
- dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
+ dev_err(data->dev, "Error reading reg_fifo_status\n");
return ret;
}
@@ -1159,7 +1159,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
BMC150_ACCEL_INT_MODE_LATCH_RESET);
mutex_unlock(&data->mutex);
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Error writing reg_int_rst_latch\n");
return ret;
}
@@ -1217,7 +1217,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
if (ret < 0) {
- dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
+ dev_err(data->dev, "Error reading reg_int_status_2\n");
return ret;
}
@@ -1283,8 +1283,7 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
BMC150_ACCEL_INT_MODE_LATCH_INT |
BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret)
- dev_err(&data->client->dev,
- "Error writing reg_int_rst_latch\n");
+ dev_err(data->dev, "Error writing reg_int_rst_latch\n");
ret = IRQ_HANDLED;
} else {
@@ -1323,17 +1322,13 @@ static irqreturn_t bmc150_accel_irq_handler(int irq, void *private)
return IRQ_NONE;
}
-static int bmc150_accel_gpio_probe(struct i2c_client *client,
- struct bmc150_accel_data *data)
+static int bmc150_accel_gpio_probe(struct bmc150_accel_data *data)
{
struct device *dev;
struct gpio_desc *gpio;
int ret;
- if (!client)
- return -EINVAL;
-
- dev = &client->dev;
+ dev = data->dev;
/* data ready gpio interrupt pin */
gpio = devm_gpiod_get_index(dev, BMC150_ACCEL_GPIO_NAME, 0, GPIOD_IN);
@@ -1386,7 +1381,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
for (i = 0; i < BMC150_ACCEL_TRIGGERS; i++) {
struct bmc150_accel_trigger *t = &data->triggers[i];
- t->indio_trig = devm_iio_trigger_alloc(&data->client->dev,
+ t->indio_trig = devm_iio_trigger_alloc(data->dev,
bmc150_accel_triggers[i].name,
indio_dev->name,
indio_dev->id);
@@ -1395,7 +1390,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
break;
}
- t->indio_trig->dev.parent = &data->client->dev;
+ t->indio_trig->dev.parent = data->dev;
t->indio_trig->ops = &bmc150_accel_trigger_ops;
t->intr = bmc150_accel_triggers[i].intr;
t->data = data;
@@ -1424,7 +1419,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
ret = regmap_write(data->regmap, reg, data->fifo_mode);
if (ret < 0) {
- dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
+ dev_err(data->dev, "Error writing reg_fifo_config1\n");
return ret;
}
@@ -1434,7 +1429,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
data->watermark);
if (ret < 0)
- dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
+ dev_err(data->dev, "Error writing reg_fifo_config0\n");
return ret;
}
@@ -1523,12 +1518,12 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
ret = regmap_read(data->regmap, BMC150_ACCEL_REG_CHIP_ID, &val);
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Error: Reading chip id\n");
return ret;
}
- dev_dbg(&data->client->dev, "Chip Id %x\n", val);
+ dev_dbg(data->dev, "Chip Id %x\n", val);
for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) {
if (bmc150_accel_chip_info_tbl[i].chip_id == val) {
data->chip_info = &bmc150_accel_chip_info_tbl[i];
@@ -1537,7 +1532,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
}
if (!data->chip_info) {
- dev_err(&data->client->dev, "Invalid chip %x\n", val);
+ dev_err(data->dev, "Invalid chip %x\n", val);
return -ENODEV;
}
@@ -1554,7 +1549,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
BMC150_ACCEL_DEF_RANGE_4G);
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Error writing reg_pmu_range\n");
return ret;
}
@@ -1573,7 +1568,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
BMC150_ACCEL_INT_MODE_LATCH_INT |
BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) {
- dev_err(&data->client->dev,
+ dev_err(data->dev,
"Error writing reg_int_rst_latch\n");
return ret;
}
@@ -1588,6 +1583,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
struct iio_dev *indio_dev;
int ret;
const char *name = NULL;
+ struct device *dev;
indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
if (!indio_dev)
@@ -1595,12 +1591,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
data = iio_priv(indio_dev);
i2c_set_clientdata(client, indio_dev);
- data->client = client;
data->dev = &client->dev;
+ dev = &client->dev;
+ data->irq = client->irq;
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");
+ dev_err(dev, "Failed to initialize i2c regmap\n");
return PTR_ERR(data->regmap);
}
@@ -1613,7 +1610,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
mutex_init(&data->mutex);
- indio_dev->dev.parent = &client->dev;
+ 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;
@@ -1625,16 +1622,16 @@ static int bmc150_accel_probe(struct i2c_client *client,
bmc150_accel_trigger_handler,
&bmc150_accel_buffer_ops);
if (ret < 0) {
- dev_err(&client->dev, "Failed: iio triggered buffer setup\n");
+ dev_err(data->dev, "Failed: iio triggered buffer setup\n");
return ret;
}
- if (client->irq < 0)
- client->irq = bmc150_accel_gpio_probe(client, data);
+ if (data->irq <= 0)
+ data->irq = bmc150_accel_gpio_probe(data);
- if (client->irq > 0) {
+ if (data->irq > 0) {
ret = devm_request_threaded_irq(
- &client->dev, client->irq,
+ data->dev, data->irq,
bmc150_accel_irq_handler,
bmc150_accel_irq_thread_handler,
IRQF_TRIGGER_RISING,
@@ -1652,7 +1649,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
BMC150_ACCEL_INT_MODE_LATCH_RESET);
if (ret < 0) {
- dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
+ dev_err(data->dev, "Error writing reg_int_rst_latch\n");
goto err_buffer_cleanup;
}
@@ -1673,18 +1670,17 @@ static int bmc150_accel_probe(struct i2c_client *client,
ret = iio_device_register(indio_dev);
if (ret < 0) {
- dev_err(&client->dev, "Unable to register iio device\n");
+ dev_err(data->dev, "Unable to register iio device\n");
goto err_trigger_unregister;
}
- ret = pm_runtime_set_active(&client->dev);
+ ret = pm_runtime_set_active(dev);
if (ret)
goto err_iio_unregister;
- pm_runtime_enable(&client->dev);
- pm_runtime_set_autosuspend_delay(&client->dev,
- BMC150_AUTO_SUSPEND_DELAY_MS);
- pm_runtime_use_autosuspend(&client->dev);
+ pm_runtime_enable(dev);
+ pm_runtime_set_autosuspend_delay(dev, BMC150_AUTO_SUSPEND_DELAY_MS);
+ pm_runtime_use_autosuspend(dev);
return 0;
@@ -1703,9 +1699,9 @@ static int bmc150_accel_remove(struct i2c_client *client)
struct iio_dev *indio_dev = i2c_get_clientdata(client);
struct bmc150_accel_data *data = iio_priv(indio_dev);
- pm_runtime_disable(&client->dev);
- pm_runtime_set_suspended(&client->dev);
- pm_runtime_put_noidle(&client->dev);
+ pm_runtime_disable(data->dev);
+ pm_runtime_set_suspended(data->dev);
+ pm_runtime_put_noidle(data->dev);
iio_device_unregister(indio_dev);
@@ -1723,7 +1719,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
#ifdef CONFIG_PM_SLEEP
static int bmc150_accel_suspend(struct device *dev)
{
- struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_accel_data *data = iio_priv(indio_dev);
mutex_lock(&data->mutex);
@@ -1735,7 +1731,7 @@ static int bmc150_accel_suspend(struct device *dev)
static int bmc150_accel_resume(struct device *dev)
{
- struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_accel_data *data = iio_priv(indio_dev);
mutex_lock(&data->mutex);
@@ -1751,11 +1747,11 @@ static int bmc150_accel_resume(struct device *dev)
#ifdef CONFIG_PM
static int bmc150_accel_runtime_suspend(struct device *dev)
{
- struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_accel_data *data = iio_priv(indio_dev);
int ret;
- dev_dbg(&data->client->dev, __func__);
+ dev_dbg(data->dev, __func__);
ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);
if (ret < 0)
return -EAGAIN;
@@ -1765,12 +1761,12 @@ static int bmc150_accel_runtime_suspend(struct device *dev)
static int bmc150_accel_runtime_resume(struct device *dev)
{
- struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_accel_data *data = iio_priv(indio_dev);
int ret;
int sleep_val;
- dev_dbg(&data->client->dev, __func__);
+ dev_dbg(data->dev, __func__);
ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
if (ret < 0)
--
2.5.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
2015-09-21 10:55 ` [PATCH v3 1/4] iio: bmc150: Use i2c regmap Markus Pargmann
2015-09-21 10:55 ` [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data Markus Pargmann
@ 2015-09-21 10:55 ` Markus Pargmann
2015-09-23 12:51 ` Tirdea, Irina
2015-10-03 11:07 ` Jonathan Cameron
2015-09-21 10:55 ` [PATCH v3 4/4] iio: bmc150: Add SPI driver Markus Pargmann
2015-09-23 12:46 ` [PATCH v3 0/4] iio: bmc150 regmap and SPI Tirdea, Irina
4 siblings, 2 replies; 18+ messages in thread
From: Markus Pargmann @ 2015-09-21 10:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel, Markus Pargmann
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/iio/accel/Kconfig | 9 +-
drivers/iio/accel/Makefile | 3 +-
.../accel/{bmc150-accel.c => bmc150-accel-core.c} | 85 ++++-------------
drivers/iio/accel/bmc150-accel-i2c.c | 102 +++++++++++++++++++++
drivers/iio/accel/bmc150-accel.h | 20 ++++
5 files changed, 145 insertions(+), 74 deletions(-)
rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (96%)
create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
create mode 100644 drivers/iio/accel/bmc150-accel.h
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 3ff2c83f7492..280635545240 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -19,21 +19,22 @@ config BMA180
config BMC150_ACCEL
tristate "Bosch BMC150 Accelerometer Driver"
- depends on I2C
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
select REGMAP
- select REGMAP_I2C
+ select BMC150_ACCEL_I2C if I2C
help
Say yes here to build support for the following Bosch accelerometers:
BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
- Currently this only supports the device via an i2c interface.
-
This is a combo module with both accelerometer and magnetometer.
This driver is only implementing accelerometer part, which has
its own address and register map.
+config BMC150_ACCEL_I2C
+ tristate
+ select REGMAP_I2C
+
config HID_SENSOR_ACCEL_3D
depends on HID_SENSOR_HUB
select IIO_BUFFER
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index ebd2675b2a02..5ef8bdbad092 100644
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -4,7 +4,8 @@
# When adding new entries keep the list in alphabetical order
obj-$(CONFIG_BMA180) += bma180.o
-obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel.o
+obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
+obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
obj-$(CONFIG_KXSD9) += kxsd9.o
diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel-core.c
similarity index 96%
rename from drivers/iio/accel/bmc150-accel.c
rename to drivers/iio/accel/bmc150-accel-core.c
index 425885dc6800..f492d2a4bce5 100644
--- a/drivers/iio/accel/bmc150-accel.c
+++ b/drivers/iio/accel/bmc150-accel-core.c
@@ -37,6 +37,8 @@
#include <linux/iio/triggered_buffer.h>
#include <linux/regmap.h>
+#include "bmc150-accel.h"
+
#define BMC150_ACCEL_DRV_NAME "bmc150_accel"
#define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
#define BMC150_ACCEL_GPIO_NAME "bmc150_accel_int"
@@ -1015,15 +1017,6 @@ static const struct iio_chan_spec bmc150_accel_channels[] =
static const struct iio_chan_spec bma280_accel_channels[] =
BMC150_ACCEL_CHANNELS(14);
-enum {
- bmc150,
- bmi055,
- bma255,
- bma250e,
- bma222e,
- bma280,
-};
-
static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
[bmc150] = {
.name = "BMC150A",
@@ -1576,33 +1569,23 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
return 0;
}
-static int bmc150_accel_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
+ const char *name, bool block_supported)
{
struct bmc150_accel_data *data;
struct iio_dev *indio_dev;
int ret;
- const char *name = NULL;
- struct device *dev;
- indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
+ indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
if (!indio_dev)
return -ENOMEM;
data = iio_priv(indio_dev);
- i2c_set_clientdata(client, indio_dev);
- data->dev = &client->dev;
- dev = &client->dev;
- data->irq = client->irq;
-
- data->regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
- if (IS_ERR(data->regmap)) {
- dev_err(dev, "Failed to initialize i2c regmap\n");
- return PTR_ERR(data->regmap);
- }
+ dev_set_drvdata(dev, indio_dev);
+ data->dev = dev;
+ data->irq = irq;
- if (id)
- name = id->name;
+ data->regmap = regmap;
ret = bmc150_accel_chip_init(data);
if (ret < 0)
@@ -1659,9 +1642,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
if (ret)
goto err_buffer_cleanup;
- if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
- i2c_check_functionality(client->adapter,
- I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
+ if (block_supported) {
indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
indio_dev->info = &bmc150_accel_info_fifo;
indio_dev->buffer->attrs = bmc150_accel_fifo_attributes;
@@ -1670,7 +1651,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
ret = iio_device_register(indio_dev);
if (ret < 0) {
- dev_err(data->dev, "Unable to register iio device\n");
+ dev_err(dev, "Unable to register iio device\n");
goto err_trigger_unregister;
}
@@ -1693,10 +1674,11 @@ err_buffer_cleanup:
return ret;
}
+EXPORT_SYMBOL_GPL(bmc150_accel_core_probe);
-static int bmc150_accel_remove(struct i2c_client *client)
+int bmc150_accel_core_remove(struct device *dev)
{
- struct iio_dev *indio_dev = i2c_get_clientdata(client);
+ struct iio_dev *indio_dev = dev_get_drvdata(dev);
struct bmc150_accel_data *data = iio_priv(indio_dev);
pm_runtime_disable(data->dev);
@@ -1715,6 +1697,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
return 0;
}
+EXPORT_SYMBOL_GPL(bmc150_accel_core_remove);
#ifdef CONFIG_PM_SLEEP
static int bmc150_accel_suspend(struct device *dev)
@@ -1785,48 +1768,12 @@ static int bmc150_accel_runtime_resume(struct device *dev)
}
#endif
-static const struct dev_pm_ops bmc150_accel_pm_ops = {
+const struct dev_pm_ops bmc150_accel_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(bmc150_accel_suspend, bmc150_accel_resume)
SET_RUNTIME_PM_OPS(bmc150_accel_runtime_suspend,
bmc150_accel_runtime_resume, NULL)
};
-static const struct acpi_device_id bmc150_accel_acpi_match[] = {
- {"BSBA0150", bmc150},
- {"BMC150A", bmc150},
- {"BMI055A", bmi055},
- {"BMA0255", bma255},
- {"BMA250E", bma250e},
- {"BMA222E", bma222e},
- {"BMA0280", bma280},
- { },
-};
-MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
-
-static const struct i2c_device_id bmc150_accel_id[] = {
- {"bmc150_accel", bmc150},
- {"bmi055_accel", bmi055},
- {"bma255", bma255},
- {"bma250e", bma250e},
- {"bma222e", bma222e},
- {"bma280", bma280},
- {}
-};
-
-MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
-
-static struct i2c_driver bmc150_accel_driver = {
- .driver = {
- .name = BMC150_ACCEL_DRV_NAME,
- .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
- .pm = &bmc150_accel_pm_ops,
- },
- .probe = bmc150_accel_probe,
- .remove = bmc150_accel_remove,
- .id_table = bmc150_accel_id,
-};
-module_i2c_driver(bmc150_accel_driver);
-
MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
MODULE_LICENSE("GPL v2");
MODULE_DESCRIPTION("BMC150 accelerometer driver");
diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
new file mode 100644
index 000000000000..b41404ba32fc
--- /dev/null
+++ b/drivers/iio/accel/bmc150-accel-i2c.c
@@ -0,0 +1,102 @@
+/*
+ * 3-axis accelerometer driver supporting following I2C Bosch-Sensortec chips:
+ * - BMC150
+ * - BMI055
+ * - BMA255
+ * - BMA250E
+ * - BMA222E
+ * - BMA280
+ *
+ * Copyright (c) 2014, Intel Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
+ * more details.
+ */
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/regmap.h>
+
+#include "bmc150-accel.h"
+
+static const struct regmap_config bmc150_i2c_regmap_conf = {
+ .reg_bits = 8,
+ .val_bits = 8,
+};
+
+static int bmc150_accel_probe(struct i2c_client *client,
+ const struct i2c_device_id *id)
+{
+ struct regmap *regmap;
+ const char *name = NULL;
+ bool block_supported =
+ i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
+ i2c_check_functionality(client->adapter,
+ I2C_FUNC_SMBUS_READ_I2C_BLOCK);
+
+ regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
+ if (IS_ERR(regmap)) {
+ dev_err(&client->dev, "Failed to initialize i2c regmap\n");
+ return PTR_ERR(regmap);
+ }
+
+ if (id)
+ name = id->name;
+
+ return bmc150_accel_core_probe(&client->dev, regmap, client->irq, name,
+ block_supported);
+}
+
+static int bmc150_accel_remove(struct i2c_client *client)
+{
+ return bmc150_accel_core_remove(&client->dev);
+}
+
+static const struct acpi_device_id bmc150_accel_acpi_match[] = {
+ {"BSBA0150", bmc150},
+ {"BMC150A", bmc150},
+ {"BMI055A", bmi055},
+ {"BMA0255", bma255},
+ {"BMA250E", bma250e},
+ {"BMA222E", bma222e},
+ {"BMA0280", bma280},
+ { },
+};
+MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
+
+static const struct i2c_device_id bmc150_accel_id[] = {
+ {"bmc150_accel", bmc150},
+ {"bmi055_accel", bmi055},
+ {"bma255", bma255},
+ {"bma250e", bma250e},
+ {"bma222e", bma222e},
+ {"bma280", bma280},
+ {}
+};
+
+MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
+
+static struct i2c_driver bmc150_accel_driver = {
+ .driver = {
+ .name = "bmc150_accel_i2c",
+ .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
+ .pm = &bmc150_accel_pm_ops,
+ },
+ .probe = bmc150_accel_probe,
+ .remove = bmc150_accel_remove,
+ .id_table = bmc150_accel_id,
+};
+module_i2c_driver(bmc150_accel_driver);
+
+MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("BMC150 I2C accelerometer driver");
diff --git a/drivers/iio/accel/bmc150-accel.h b/drivers/iio/accel/bmc150-accel.h
new file mode 100644
index 000000000000..ba0335987f94
--- /dev/null
+++ b/drivers/iio/accel/bmc150-accel.h
@@ -0,0 +1,20 @@
+#ifndef _BMC150_ACCEL_H_
+#define _BMC150_ACCEL_H_
+
+struct regmap;
+
+enum {
+ bmc150,
+ bmi055,
+ bma255,
+ bma250e,
+ bma222e,
+ bma280,
+};
+
+int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
+ const char *name, bool block_supported);
+int bmc150_accel_core_remove(struct device *dev);
+extern const struct dev_pm_ops bmc150_accel_pm_ops;
+
+#endif /* _BMC150_ACCEL_H_ */
--
2.5.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH v3 4/4] iio: bmc150: Add SPI driver
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
` (2 preceding siblings ...)
2015-09-21 10:55 ` [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c Markus Pargmann
@ 2015-09-21 10:55 ` Markus Pargmann
2015-10-03 11:04 ` Jonathan Cameron
2015-09-23 12:46 ` [PATCH v3 0/4] iio: bmc150 regmap and SPI Tirdea, Irina
4 siblings, 1 reply; 18+ messages in thread
From: Markus Pargmann @ 2015-09-21 10:55 UTC (permalink / raw)
To: Jonathan Cameron
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel, Markus Pargmann
Add a simple SPI driver which initializes the spi regmap for the bmc150
core driver.
Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
---
drivers/iio/accel/Kconfig | 5 +++
drivers/iio/accel/Makefile | 1 +
drivers/iio/accel/bmc150-accel-spi.c | 80 ++++++++++++++++++++++++++++++++++++
3 files changed, 86 insertions(+)
create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
index 280635545240..a010329f7d06 100644
--- a/drivers/iio/accel/Kconfig
+++ b/drivers/iio/accel/Kconfig
@@ -23,6 +23,7 @@ config BMC150_ACCEL
select IIO_TRIGGERED_BUFFER
select REGMAP
select BMC150_ACCEL_I2C if I2C
+ select BMC150_ACCEL_SPI if SPI
help
Say yes here to build support for the following Bosch accelerometers:
BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
@@ -35,6 +36,10 @@ config BMC150_ACCEL_I2C
tristate
select REGMAP_I2C
+config BMC150_ACCEL_SPI
+ tristate
+ select REGMAP_SPI
+
config HID_SENSOR_ACCEL_3D
depends on HID_SENSOR_HUB
select IIO_BUFFER
diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
index 5ef8bdbad092..e579e93bf022 100644
--- a/drivers/iio/accel/Makefile
+++ b/drivers/iio/accel/Makefile
@@ -6,6 +6,7 @@
obj-$(CONFIG_BMA180) += bma180.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_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
obj-$(CONFIG_KXSD9) += kxsd9.o
diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c
new file mode 100644
index 000000000000..41dd842996b0
--- /dev/null
+++ b/drivers/iio/accel/bmc150-accel-spi.c
@@ -0,0 +1,80 @@
+/*
+ * 3-axis accelerometer driver supporting SPI Bosch-Sensortec accelerometer chip
+ * Copyright © 2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/device.h>
+#include <linux/mod_devicetable.h>
+#include <linux/module.h>
+#include <linux/acpi.h>
+#include <linux/regmap.h>
+#include <linux/spi/spi.h>
+
+#include "bmc150-accel.h"
+
+static const struct regmap_config bmc150_spi_regmap_conf = {
+ .reg_bits = 8,
+ .val_bits = 8,
+ .max_register = 0x3f,
+};
+
+static int bmc150_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(spi, &bmc150_spi_regmap_conf);
+ if (IS_ERR(regmap)) {
+ dev_err(&spi->dev, "Failed to initialize spi regmap\n");
+ return PTR_ERR(regmap);
+ }
+
+ return bmc150_accel_core_probe(&spi->dev, regmap, spi->irq, id->name,
+ true);
+}
+
+static int bmc150_accel_remove(struct spi_device *spi)
+{
+ return bmc150_accel_core_remove(&spi->dev);
+}
+
+static const struct spi_device_id bmc150_accel_id[] = {
+ {"bmc150_accel", bmc150},
+ {"bmi055_accel", bmi055},
+ {"bma255", bma255},
+ {"bma250e", bma250e},
+ {"bma222e", bma222e},
+ {"bma280", bma280},
+ {}
+};
+
+MODULE_DEVICE_TABLE(spi, bmc150_accel_id);
+
+static struct spi_driver bmc150_accel_driver = {
+ .driver = {
+ .name = "bmc150_accel_spi",
+ .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
+ .pm = &bmc150_accel_pm_ops,
+ },
+ .probe = bmc150_accel_probe,
+ .remove = bmc150_accel_remove,
+ .id_table = bmc150_accel_id,
+};
+module_spi_driver(bmc150_accel_driver);
+
+MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>");
+MODULE_LICENSE("GPL v2");
+MODULE_DESCRIPTION("BMC150 SPI accelerometer driver");
--
2.5.1
^ permalink raw reply related [flat|nested] 18+ messages in thread
* RE: [PATCH v3 0/4] iio: bmc150 regmap and SPI
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
` (3 preceding siblings ...)
2015-09-21 10:55 ` [PATCH v3 4/4] iio: bmc150: Add SPI driver Markus Pargmann
@ 2015-09-23 12:46 ` Tirdea, Irina
2015-09-24 7:11 ` Markus Pargmann
4 siblings, 1 reply; 18+ messages in thread
From: Tirdea, Irina @ 2015-09-23 12:46 UTC (permalink / raw)
To: Markus Pargmann, Jonathan Cameron
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
> -----Original Message-----
> From: Markus Pargmann [mailto:mpa@pengutronix.de]
> Sent: 21 September, 2015 13:55
> To: Jonathan Cameron
> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
> kernel@pengutronix.de; Markus Pargmann
> Subject: [PATCH v3 0/4] iio: bmc150 regmap and SPI
>
> Hi,
>
Hi Markus,
I tested the new version of you patches and everything works fine.
I used a BMA250E chip connected on the i2c bus.
The tests included the iio buffer code path and the i2c code path
(including using the fifo and forcing the i2c bus to use
the regmap_i2c_smbus_i2c_block calls you added to regmap).
> this series converts the bmc150 driver to use regmap and adds an SPI interface.
>
> Thanks for testing and review so far. I rebased the series onto v4.3-rc2 now
> (the togreg branch seems to be on v4.2).
> It still works for me but there were some differences regarding the chip id.
>
I actually used the togreg branch (to get the latest bmc150 driver changes) and
cherry-picked the regmap patches. Everything applied without any conflicts.
Thanks,
Irina
> Changes in v3:
> - Fixed type of variable 'step' which lead to compile warnings. Type is now
> size_t.
> - Fixed patch that moved irq variable without reason
> - Readded MODULE_* to the core driver
> - Reintroduced check id NULL check
>
> Changes in v2:
> - Removed default values for regmap_config fields.
> - Redesigned the fifo_transfer function to avoid running in errors first.
> - Dropped irq checks patch as it is already mainline
> - Core can now be built as module with autoselection of i2c and spi parts
>
> As my hardware is missing an interrupt line from the SPI connected bmc150 I am
> not able to test the iio buffer code path and the i2c code path. Tests would be
> appreciated.
>
> @Srinivas:
> As there were some rebase conflicts on the first patch, I removed your
> reviewed-by tag again for the moment.
>
> Best regards,
>
> Markus
>
>
> Markus Pargmann (4):
> iio: bmc150: Use i2c regmap
> iio: bcm150: Remove i2c_client from private data
> iio: bmc150: Split the driver into core and i2c
> iio: bmc150: Add SPI driver
>
> drivers/iio/accel/Kconfig | 14 +-
> drivers/iio/accel/Makefile | 4 +-
> .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 388 ++++++++-------------
> drivers/iio/accel/bmc150-accel-i2c.c | 102 ++++++
> drivers/iio/accel/bmc150-accel-spi.c | 80 +++++
> drivers/iio/accel/bmc150-accel.h | 20 ++
> 6 files changed, 366 insertions(+), 242 deletions(-)
> rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (82%)
> create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
> create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
> create mode 100644 drivers/iio/accel/bmc150-accel.h
>
> --
> 2.5.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v3 1/4] iio: bmc150: Use i2c regmap
2015-09-21 10:55 ` [PATCH v3 1/4] iio: bmc150: Use i2c regmap Markus Pargmann
@ 2015-09-23 12:47 ` Tirdea, Irina
2015-10-03 11:08 ` Jonathan Cameron
0 siblings, 1 reply; 18+ messages in thread
From: Tirdea, Irina @ 2015-09-23 12:47 UTC (permalink / raw)
To: Markus Pargmann, Jonathan Cameron
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
> -----Original Message-----
> From: Markus Pargmann [mailto:mpa@pengutronix.de]
> Sent: 21 September, 2015 13:55
> To: Jonathan Cameron
> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
> kernel@pengutronix.de; Markus Pargmann
> Subject: [PATCH v3 1/4] iio: bmc150: Use i2c regmap
>
> This replaces all usage of direct i2c accesses with regmap accesses.
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Irina Tirdea <irina.tirdea@intel.com>
> ---
> drivers/iio/accel/Kconfig | 2 +
> drivers/iio/accel/bmc150-accel.c | 225 +++++++++++++++++----------------------
> 2 files changed, 99 insertions(+), 128 deletions(-)
>
> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
> index a59047d7657e..3ff2c83f7492 100644
> --- a/drivers/iio/accel/Kconfig
> +++ b/drivers/iio/accel/Kconfig
> @@ -22,6 +22,8 @@ config BMC150_ACCEL
> depends on I2C
> select IIO_BUFFER
> select IIO_TRIGGERED_BUFFER
> + select REGMAP
> + select REGMAP_I2C
> help
> Say yes here to build support for the following Bosch accelerometers:
> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
> index 0104cdef8709..a17034fd53fb 100644
> --- a/drivers/iio/accel/bmc150-accel.c
> +++ b/drivers/iio/accel/bmc150-accel.c
> @@ -35,6 +35,7 @@
> #include <linux/iio/trigger.h>
> #include <linux/iio/trigger_consumer.h>
> #include <linux/iio/triggered_buffer.h>
> +#include <linux/regmap.h>
>
> #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
> #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
> @@ -186,6 +187,8 @@ enum bmc150_accel_trigger_id {
>
> struct bmc150_accel_data {
> struct i2c_client *client;
> + struct regmap *regmap;
> + struct device *dev;
> struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
> atomic_t active_intr;
> struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
> @@ -242,6 +245,12 @@ static const struct {
> {500000, BMC150_ACCEL_SLEEP_500_MS},
> {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,
> enum bmc150_power_modes mode,
> int dur_us)
> @@ -271,8 +280,7 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
>
> dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
>
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
> return ret;
> @@ -290,8 +298,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) {
> if (bmc150_accel_samp_freq_table[i].val == val &&
> bmc150_accel_samp_freq_table[i].val2 == val2) {
> - ret = i2c_smbus_write_byte_data(
> - data->client,
> + ret = regmap_write(data->regmap,
> BMC150_ACCEL_REG_PMU_BW,
> bmc150_accel_samp_freq_table[i].bw_bits);
> if (ret < 0)
> @@ -308,26 +315,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)
> {
> - 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);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error writing reg_int_6\n");
> 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,
> + BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
> if (ret < 0) {
> - 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) {
> - dev_err(&data->client->dev, "Error write reg_int_5\n");
> + dev_err(&data->client->dev, "Error updating reg_int_5\n");
> return ret;
> }
>
> @@ -470,38 +470,18 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
> return ret;
>
> /* map the interrupt to the appropriate pins */
> - ret = i2c_smbus_read_byte_data(data->client, info->map_reg);
> - if (ret < 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);
> + ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
> + (state ? info->map_bitmask : 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;
> }
>
> /* 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,
> + (state ? info->en_bitmask : 0));
> if (ret < 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) {
> - 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;
> }
>
> @@ -523,8 +503,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) {
> if (data->chip_info->scale_table[i].scale == val) {
> - ret = i2c_smbus_write_byte_data(
> - data->client,
> + ret = regmap_write(data->regmap,
> BMC150_ACCEL_REG_PMU_RANGE,
> data->chip_info->scale_table[i].reg_range);
> if (ret < 0) {
> @@ -544,16 +523,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)
> {
> int ret;
> + unsigned int value;
>
> 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) {
> dev_err(&data->client->dev, "Error reading reg_temp\n");
> mutex_unlock(&data->mutex);
> return ret;
> }
> - *val = sign_extend32(ret, 7);
> + *val = sign_extend32(value, 7);
>
> mutex_unlock(&data->mutex);
>
> @@ -566,6 +546,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
> {
> int ret;
> int axis = chan->scan_index;
> + unsigned int raw_val;
>
> mutex_lock(&data->mutex);
> ret = bmc150_accel_set_power_state(data, true);
> @@ -574,15 +555,15 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
> return ret;
> }
>
> - ret = i2c_smbus_read_word_data(data->client,
> - BMC150_ACCEL_AXIS_TO_REG(axis));
> + ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
> + &raw_val, 2);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error reading axis %d\n", axis);
> bmc150_accel_set_power_state(data, false);
> mutex_unlock(&data->mutex);
> return ret;
> }
> - *val = sign_extend32(ret >> chan->scan_type.shift,
> + *val = sign_extend32(raw_val >> chan->scan_type.shift,
> chan->scan_type.realbits - 1);
> ret = bmc150_accel_set_power_state(data, false);
> mutex_unlock(&data->mutex);
> @@ -846,52 +827,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
> * 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)
> {
> int sample_length = 3 * 2;
> - u8 reg_fifo_data = BMC150_ACCEL_REG_FIFO_DATA;
> - int ret = -EIO;
> -
> - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
> - struct i2c_msg msg[2] = {
> - {
> - .addr = client->addr,
> - .flags = 0,
> - .buf = ®_fifo_data,
> - .len = sizeof(reg_fifo_data),
> - },
> - {
> - .addr = client->addr,
> - .flags = I2C_M_RD,
> - .buf = (u8 *)buffer,
> - .len = samples * sample_length,
> - }
> - };
> + int ret;
> + int total_length = samples * sample_length;
> + int i;
> + size_t step = regmap_get_raw_read_max(data->regmap);
>
> - ret = i2c_transfer(client->adapter, msg, 2);
> - if (ret != 2)
> - ret = -EIO;
> - else
> - ret = 0;
> - } else {
> - int i, step = I2C_SMBUS_BLOCK_MAX / sample_length;
> -
> - 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;
> - }
> + if (!step || step > total_length)
> + step = total_length;
> + else if (step < total_length)
> + step = sample_length;
>
> - ret = 0;
> - }
> + /*
> + * Seems we have a bus with size limitation so we have to execute
> + * multiple reads
> + */
> + for (i = 0; i < total_length; i += step) {
> + ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
> + &buffer[i], step);
> + if (ret)
> + break;
> }
>
> 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;
> }
> @@ -905,15 +868,15 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
> u16 buffer[BMC150_ACCEL_FIFO_LENGTH * 3];
> int64_t tstamp;
> uint64_t sample_period;
> + unsigned int val;
>
> - ret = i2c_smbus_read_byte_data(data->client,
> - BMC150_ACCEL_REG_FIFO_STATUS);
> + ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
> return ret;
> }
>
> - count = ret & 0x7F;
> + count = val & 0x7F;
>
> if (!count)
> return 0;
> @@ -952,7 +915,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
> if (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)
> return ret;
>
> @@ -1155,17 +1118,19 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p)
> struct iio_dev *indio_dev = pf->indio_dev;
> struct bmc150_accel_data *data = iio_priv(indio_dev);
> int bit, ret, i = 0;
> + unsigned int raw_val;
>
> mutex_lock(&data->mutex);
> for_each_set_bit(bit, indio_dev->active_scan_mask,
> indio_dev->masklength) {
> - ret = i2c_smbus_read_word_data(data->client,
> - BMC150_ACCEL_AXIS_TO_REG(bit));
> + ret = regmap_bulk_read(data->regmap,
> + BMC150_ACCEL_AXIS_TO_REG(bit), &raw_val,
> + 2);
> if (ret < 0) {
> mutex_unlock(&data->mutex);
> goto err_read;
> }
> - data->buffer[i++] = ret;
> + data->buffer[i++] = raw_val;
> }
> mutex_unlock(&data->mutex);
>
> @@ -1189,10 +1154,9 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
>
> mutex_lock(&data->mutex);
> /* clear any latched interrupt */
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_INT_RST_LATCH,
> - BMC150_ACCEL_INT_MODE_LATCH_INT |
> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
> + BMC150_ACCEL_INT_MODE_LATCH_INT |
> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
> mutex_unlock(&data->mutex);
> if (ret < 0) {
> dev_err(&data->client->dev,
> @@ -1249,20 +1213,20 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
> struct bmc150_accel_data *data = iio_priv(indio_dev);
> int dir;
> int ret;
> + unsigned int val;
>
> - ret = i2c_smbus_read_byte_data(data->client,
> - BMC150_ACCEL_REG_INT_STATUS_2);
> + ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
> return ret;
> }
>
> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
> dir = IIO_EV_DIR_FALLING;
> else
> 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_MOD_EVENT_CODE(IIO_ACCEL,
> 0,
> @@ -1271,7 +1235,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
> dir),
> data->timestamp);
>
> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Y)
> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_Y)
> iio_push_event(indio_dev,
> IIO_MOD_EVENT_CODE(IIO_ACCEL,
> 0,
> @@ -1280,7 +1244,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
> dir),
> data->timestamp);
>
> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Z)
> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_Z)
> iio_push_event(indio_dev,
> IIO_MOD_EVENT_CODE(IIO_ACCEL,
> 0,
> @@ -1315,10 +1279,9 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
> }
>
> if (ack) {
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_INT_RST_LATCH,
> - BMC150_ACCEL_INT_MODE_LATCH_INT |
> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
> + BMC150_ACCEL_INT_MODE_LATCH_INT |
> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret)
> dev_err(&data->client->dev,
> "Error writing reg_int_rst_latch\n");
> @@ -1459,7 +1422,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
> u8 reg = BMC150_ACCEL_REG_FIFO_CONFIG1;
> 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) {
> dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
> return ret;
> @@ -1468,9 +1431,8 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
> if (!data->fifo_mode)
> return 0;
>
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_FIFO_CONFIG0,
> - data->watermark);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
> + data->watermark);
> if (ret < 0)
> dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
>
> @@ -1557,23 +1519,25 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = {
> static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> {
> 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) {
> - dev_err(&data->client->dev, "Error: Reading chip id\n");
> + dev_err(&data->client->dev,
> + "Error: Reading chip id\n");
> 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++) {
> - 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];
> break;
> }
> }
>
> 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;
> }
>
> @@ -1587,11 +1551,11 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> return ret;
>
> /* Set Default Range */
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_PMU_RANGE,
> - BMC150_ACCEL_DEF_RANGE_4G);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
> + BMC150_ACCEL_DEF_RANGE_4G);
> 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;
> }
>
> @@ -1605,10 +1569,9 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> return ret;
>
> /* Set default as latched interrupts */
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_INT_RST_LATCH,
> - BMC150_ACCEL_INT_MODE_LATCH_INT |
> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
> + BMC150_ACCEL_INT_MODE_LATCH_INT |
> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret < 0) {
> dev_err(&data->client->dev,
> "Error writing reg_int_rst_latch\n");
> @@ -1633,6 +1596,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> 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)
> name = id->name;
> @@ -1679,9 +1649,8 @@ static int bmc150_accel_probe(struct i2c_client *client,
> * want to use latch mode when we can to prevent interrupt
> * flooding.
> */
> - ret = i2c_smbus_write_byte_data(data->client,
> - BMC150_ACCEL_REG_INT_RST_LATCH,
> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret < 0) {
> dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
> goto err_buffer_cleanup;
> --
> 2.5.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data
2015-09-21 10:55 ` [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data Markus Pargmann
@ 2015-09-23 12:47 ` Tirdea, Irina
2015-10-03 11:09 ` Jonathan Cameron
0 siblings, 1 reply; 18+ messages in thread
From: Tirdea, Irina @ 2015-09-23 12:47 UTC (permalink / raw)
To: Markus Pargmann, Jonathan Cameron
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
> -----Original Message-----
> From: Markus Pargmann [mailto:mpa@pengutronix.de]
> Sent: 21 September, 2015 13:55
> To: Jonathan Cameron
> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
> kernel@pengutronix.de; Markus Pargmann
> Subject: [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data
>
> i2c_client struct is now only used for debugging output. We can use the
> device struct as well so we can remove all struct i2c_client usage.
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> Acked-by: Jonathan Cameron <jic23@kernel.org>
Tested-by: Irina Tirdea <irina.tirdea@intel.com>
> ---
> drivers/iio/accel/bmc150-accel.c | 116 +++++++++++++++++++--------------------
> 1 file changed, 56 insertions(+), 60 deletions(-)
>
> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
> index a17034fd53fb..425885dc6800 100644
> --- a/drivers/iio/accel/bmc150-accel.c
> +++ b/drivers/iio/accel/bmc150-accel.c
> @@ -186,9 +186,9 @@ enum bmc150_accel_trigger_id {
> };
>
> struct bmc150_accel_data {
> - struct i2c_client *client;
> struct regmap *regmap;
> struct device *dev;
> + int irq;
> struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
> atomic_t active_intr;
> struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
> @@ -278,11 +278,11 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
> lpw_bits = mode << BMC150_ACCEL_PMU_MODE_SHIFT;
> lpw_bits |= (dur_val << BMC150_ACCEL_PMU_BIT_SLEEP_DUR_SHIFT);
>
> - dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
> + dev_dbg(data->dev, "Set Mode bits %x\n", lpw_bits);
>
> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
> + dev_err(data->dev, "Error writing reg_pmu_lpw\n");
> return ret;
> }
>
> @@ -320,18 +320,18 @@ static int bmc150_accel_update_slope(struct bmc150_accel_data *data)
> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_6,
> data->slope_thres);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error writing reg_int_6\n");
> + dev_err(data->dev, "Error writing reg_int_6\n");
> return ret;
> }
>
> ret = regmap_update_bits(data->regmap, BMC150_ACCEL_REG_INT_5,
> BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error updating reg_int_5\n");
> + dev_err(data->dev, "Error updating reg_int_5\n");
> return ret;
> }
>
> - dev_dbg(&data->client->dev, "%s: %x %x\n", __func__, data->slope_thres,
> + dev_dbg(data->dev, "%s: %x %x\n", __func__, data->slope_thres,
> data->slope_dur);
>
> return ret;
> @@ -380,17 +380,17 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)
> int ret;
>
> if (on) {
> - ret = pm_runtime_get_sync(&data->client->dev);
> + ret = pm_runtime_get_sync(data->dev);
> } else {
> - pm_runtime_mark_last_busy(&data->client->dev);
> - ret = pm_runtime_put_autosuspend(&data->client->dev);
> + pm_runtime_mark_last_busy(data->dev);
> + ret = pm_runtime_put_autosuspend(data->dev);
> }
>
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Failed: bmc150_accel_set_power_state for %d\n", on);
> if (on)
> - pm_runtime_put_noidle(&data->client->dev);
> + pm_runtime_put_noidle(data->dev);
>
> return ret;
> }
> @@ -473,7 +473,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
> ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
> (state ? info->map_bitmask : 0));
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error updating reg_int_map\n");
> + dev_err(data->dev, "Error updating reg_int_map\n");
> goto out_fix_power_state;
> }
>
> @@ -481,7 +481,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
> ret = regmap_update_bits(data->regmap, info->en_reg, info->en_bitmask,
> (state ? info->en_bitmask : 0));
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error updating reg_int_en\n");
> + dev_err(data->dev, "Error updating reg_int_en\n");
> goto out_fix_power_state;
> }
>
> @@ -507,7 +507,7 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
> BMC150_ACCEL_REG_PMU_RANGE,
> data->chip_info->scale_table[i].reg_range);
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Error writing pmu_range\n");
> return ret;
> }
> @@ -529,7 +529,7 @@ static int bmc150_accel_get_temp(struct bmc150_accel_data *data, int *val)
>
> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_TEMP, &value);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error reading reg_temp\n");
> + dev_err(data->dev, "Error reading reg_temp\n");
> mutex_unlock(&data->mutex);
> return ret;
> }
> @@ -558,7 +558,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
> ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
> &raw_val, 2);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error reading axis %d\n", axis);
> + dev_err(data->dev, "Error reading axis %d\n", axis);
> bmc150_accel_set_power_state(data, false);
> mutex_unlock(&data->mutex);
> return ret;
> @@ -872,7 +872,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
>
> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
> + dev_err(data->dev, "Error reading reg_fifo_status\n");
> return ret;
> }
>
> @@ -1159,7 +1159,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
> BMC150_ACCEL_INT_MODE_LATCH_RESET);
> mutex_unlock(&data->mutex);
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Error writing reg_int_rst_latch\n");
> return ret;
> }
> @@ -1217,7 +1217,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
>
> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
> + dev_err(data->dev, "Error reading reg_int_status_2\n");
> return ret;
> }
>
> @@ -1283,8 +1283,7 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
> BMC150_ACCEL_INT_MODE_LATCH_INT |
> BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret)
> - dev_err(&data->client->dev,
> - "Error writing reg_int_rst_latch\n");
> + dev_err(data->dev, "Error writing reg_int_rst_latch\n");
>
> ret = IRQ_HANDLED;
> } else {
> @@ -1323,17 +1322,13 @@ static irqreturn_t bmc150_accel_irq_handler(int irq, void *private)
> return IRQ_NONE;
> }
>
> -static int bmc150_accel_gpio_probe(struct i2c_client *client,
> - struct bmc150_accel_data *data)
> +static int bmc150_accel_gpio_probe(struct bmc150_accel_data *data)
> {
> struct device *dev;
> struct gpio_desc *gpio;
> int ret;
>
> - if (!client)
> - return -EINVAL;
> -
> - dev = &client->dev;
> + dev = data->dev;
>
> /* data ready gpio interrupt pin */
> gpio = devm_gpiod_get_index(dev, BMC150_ACCEL_GPIO_NAME, 0, GPIOD_IN);
> @@ -1386,7 +1381,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
> for (i = 0; i < BMC150_ACCEL_TRIGGERS; i++) {
> struct bmc150_accel_trigger *t = &data->triggers[i];
>
> - t->indio_trig = devm_iio_trigger_alloc(&data->client->dev,
> + t->indio_trig = devm_iio_trigger_alloc(data->dev,
> bmc150_accel_triggers[i].name,
> indio_dev->name,
> indio_dev->id);
> @@ -1395,7 +1390,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
> break;
> }
>
> - t->indio_trig->dev.parent = &data->client->dev;
> + t->indio_trig->dev.parent = data->dev;
> t->indio_trig->ops = &bmc150_accel_trigger_ops;
> t->intr = bmc150_accel_triggers[i].intr;
> t->data = data;
> @@ -1424,7 +1419,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
>
> ret = regmap_write(data->regmap, reg, data->fifo_mode);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
> + dev_err(data->dev, "Error writing reg_fifo_config1\n");
> return ret;
> }
>
> @@ -1434,7 +1429,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
> data->watermark);
> if (ret < 0)
> - dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
> + dev_err(data->dev, "Error writing reg_fifo_config0\n");
>
> return ret;
> }
> @@ -1523,12 +1518,12 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>
> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_CHIP_ID, &val);
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Error: Reading chip id\n");
> return ret;
> }
>
> - dev_dbg(&data->client->dev, "Chip Id %x\n", val);
> + dev_dbg(data->dev, "Chip Id %x\n", val);
> for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) {
> if (bmc150_accel_chip_info_tbl[i].chip_id == val) {
> data->chip_info = &bmc150_accel_chip_info_tbl[i];
> @@ -1537,7 +1532,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> }
>
> if (!data->chip_info) {
> - dev_err(&data->client->dev, "Invalid chip %x\n", val);
> + dev_err(data->dev, "Invalid chip %x\n", val);
> return -ENODEV;
> }
>
> @@ -1554,7 +1549,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
> BMC150_ACCEL_DEF_RANGE_4G);
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Error writing reg_pmu_range\n");
> return ret;
> }
> @@ -1573,7 +1568,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> BMC150_ACCEL_INT_MODE_LATCH_INT |
> BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret < 0) {
> - dev_err(&data->client->dev,
> + dev_err(data->dev,
> "Error writing reg_int_rst_latch\n");
> return ret;
> }
> @@ -1588,6 +1583,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
> struct iio_dev *indio_dev;
> int ret;
> const char *name = NULL;
> + struct device *dev;
>
> indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> if (!indio_dev)
> @@ -1595,12 +1591,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
>
> data = iio_priv(indio_dev);
> i2c_set_clientdata(client, indio_dev);
> - data->client = client;
> data->dev = &client->dev;
> + dev = &client->dev;
> + data->irq = client->irq;
>
> 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");
> + dev_err(dev, "Failed to initialize i2c regmap\n");
> return PTR_ERR(data->regmap);
> }
>
> @@ -1613,7 +1610,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>
> mutex_init(&data->mutex);
>
> - indio_dev->dev.parent = &client->dev;
> + 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;
> @@ -1625,16 +1622,16 @@ static int bmc150_accel_probe(struct i2c_client *client,
> bmc150_accel_trigger_handler,
> &bmc150_accel_buffer_ops);
> if (ret < 0) {
> - dev_err(&client->dev, "Failed: iio triggered buffer setup\n");
> + dev_err(data->dev, "Failed: iio triggered buffer setup\n");
> return ret;
> }
>
> - if (client->irq < 0)
> - client->irq = bmc150_accel_gpio_probe(client, data);
> + if (data->irq <= 0)
> + data->irq = bmc150_accel_gpio_probe(data);
>
> - if (client->irq > 0) {
> + if (data->irq > 0) {
> ret = devm_request_threaded_irq(
> - &client->dev, client->irq,
> + data->dev, data->irq,
> bmc150_accel_irq_handler,
> bmc150_accel_irq_thread_handler,
> IRQF_TRIGGER_RISING,
> @@ -1652,7 +1649,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
> BMC150_ACCEL_INT_MODE_LATCH_RESET);
> if (ret < 0) {
> - dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
> + dev_err(data->dev, "Error writing reg_int_rst_latch\n");
> goto err_buffer_cleanup;
> }
>
> @@ -1673,18 +1670,17 @@ static int bmc150_accel_probe(struct i2c_client *client,
>
> ret = iio_device_register(indio_dev);
> if (ret < 0) {
> - dev_err(&client->dev, "Unable to register iio device\n");
> + dev_err(data->dev, "Unable to register iio device\n");
> goto err_trigger_unregister;
> }
>
> - ret = pm_runtime_set_active(&client->dev);
> + ret = pm_runtime_set_active(dev);
> if (ret)
> goto err_iio_unregister;
>
> - pm_runtime_enable(&client->dev);
> - pm_runtime_set_autosuspend_delay(&client->dev,
> - BMC150_AUTO_SUSPEND_DELAY_MS);
> - pm_runtime_use_autosuspend(&client->dev);
> + pm_runtime_enable(dev);
> + pm_runtime_set_autosuspend_delay(dev, BMC150_AUTO_SUSPEND_DELAY_MS);
> + pm_runtime_use_autosuspend(dev);
>
> return 0;
>
> @@ -1703,9 +1699,9 @@ static int bmc150_accel_remove(struct i2c_client *client)
> struct iio_dev *indio_dev = i2c_get_clientdata(client);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
>
> - pm_runtime_disable(&client->dev);
> - pm_runtime_set_suspended(&client->dev);
> - pm_runtime_put_noidle(&client->dev);
> + pm_runtime_disable(data->dev);
> + pm_runtime_set_suspended(data->dev);
> + pm_runtime_put_noidle(data->dev);
>
> iio_device_unregister(indio_dev);
>
> @@ -1723,7 +1719,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
> #ifdef CONFIG_PM_SLEEP
> static int bmc150_accel_suspend(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
>
> mutex_lock(&data->mutex);
> @@ -1735,7 +1731,7 @@ static int bmc150_accel_suspend(struct device *dev)
>
> static int bmc150_accel_resume(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
>
> mutex_lock(&data->mutex);
> @@ -1751,11 +1747,11 @@ static int bmc150_accel_resume(struct device *dev)
> #ifdef CONFIG_PM
> static int bmc150_accel_runtime_suspend(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
> int ret;
>
> - dev_dbg(&data->client->dev, __func__);
> + dev_dbg(data->dev, __func__);
> ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);
> if (ret < 0)
> return -EAGAIN;
> @@ -1765,12 +1761,12 @@ static int bmc150_accel_runtime_suspend(struct device *dev)
>
> static int bmc150_accel_runtime_resume(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
> int ret;
> int sleep_val;
>
> - dev_dbg(&data->client->dev, __func__);
> + dev_dbg(data->dev, __func__);
>
> ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
> if (ret < 0)
> --
> 2.5.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* RE: [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
2015-09-21 10:55 ` [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c Markus Pargmann
@ 2015-09-23 12:51 ` Tirdea, Irina
2015-10-03 11:10 ` Jonathan Cameron
2015-10-03 11:07 ` Jonathan Cameron
1 sibling, 1 reply; 18+ messages in thread
From: Tirdea, Irina @ 2015-09-23 12:51 UTC (permalink / raw)
To: Markus Pargmann, Jonathan Cameron
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
> -----Original Message-----
> From: Markus Pargmann [mailto:mpa@pengutronix.de]
> Sent: 21 September, 2015 13:55
> To: Jonathan Cameron
> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
> kernel@pengutronix.de; Markus Pargmann
> Subject: [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
Tested-by: Irina Tirdea <irina.tirdea@intel.com>
> ---
> drivers/iio/accel/Kconfig | 9 +-
> drivers/iio/accel/Makefile | 3 +-
> .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 85 ++++-------------
> drivers/iio/accel/bmc150-accel-i2c.c | 102 +++++++++++++++++++++
> drivers/iio/accel/bmc150-accel.h | 20 ++++
> 5 files changed, 145 insertions(+), 74 deletions(-)
> rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (96%)
> create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
> create mode 100644 drivers/iio/accel/bmc150-accel.h
>
> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
> index 3ff2c83f7492..280635545240 100644
> --- a/drivers/iio/accel/Kconfig
> +++ b/drivers/iio/accel/Kconfig
> @@ -19,21 +19,22 @@ config BMA180
>
> config BMC150_ACCEL
> tristate "Bosch BMC150 Accelerometer Driver"
> - depends on I2C
> select IIO_BUFFER
> select IIO_TRIGGERED_BUFFER
> select REGMAP
> - select REGMAP_I2C
> + select BMC150_ACCEL_I2C if I2C
> help
> Say yes here to build support for the following Bosch accelerometers:
> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
>
> - Currently this only supports the device via an i2c interface.
> -
> This is a combo module with both accelerometer and magnetometer.
> This driver is only implementing accelerometer part, which has
> its own address and register map.
>
> +config BMC150_ACCEL_I2C
> + tristate
> + select REGMAP_I2C
> +
> config HID_SENSOR_ACCEL_3D
> depends on HID_SENSOR_HUB
> select IIO_BUFFER
> diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
> index ebd2675b2a02..5ef8bdbad092 100644
> --- a/drivers/iio/accel/Makefile
> +++ b/drivers/iio/accel/Makefile
> @@ -4,7 +4,8 @@
>
> # When adding new entries keep the list in alphabetical order
> obj-$(CONFIG_BMA180) += bma180.o
> -obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel.o
> +obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
> +obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
> obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
> obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
> obj-$(CONFIG_KXSD9) += kxsd9.o
> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel-core.c
> similarity index 96%
> rename from drivers/iio/accel/bmc150-accel.c
> rename to drivers/iio/accel/bmc150-accel-core.c
> index 425885dc6800..f492d2a4bce5 100644
> --- a/drivers/iio/accel/bmc150-accel.c
> +++ b/drivers/iio/accel/bmc150-accel-core.c
> @@ -37,6 +37,8 @@
> #include <linux/iio/triggered_buffer.h>
> #include <linux/regmap.h>
>
> +#include "bmc150-accel.h"
> +
> #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
> #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
> #define BMC150_ACCEL_GPIO_NAME "bmc150_accel_int"
> @@ -1015,15 +1017,6 @@ static const struct iio_chan_spec bmc150_accel_channels[] =
> static const struct iio_chan_spec bma280_accel_channels[] =
> BMC150_ACCEL_CHANNELS(14);
>
> -enum {
> - bmc150,
> - bmi055,
> - bma255,
> - bma250e,
> - bma222e,
> - bma280,
> -};
> -
> static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
> [bmc150] = {
> .name = "BMC150A",
> @@ -1576,33 +1569,23 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> return 0;
> }
>
> -static int bmc150_accel_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
> + const char *name, bool block_supported)
> {
> struct bmc150_accel_data *data;
> struct iio_dev *indio_dev;
> int ret;
> - const char *name = NULL;
> - struct device *dev;
>
> - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> + indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
> if (!indio_dev)
> return -ENOMEM;
>
> data = iio_priv(indio_dev);
> - i2c_set_clientdata(client, indio_dev);
> - data->dev = &client->dev;
> - dev = &client->dev;
> - data->irq = client->irq;
> -
> - data->regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
> - if (IS_ERR(data->regmap)) {
> - dev_err(dev, "Failed to initialize i2c regmap\n");
> - return PTR_ERR(data->regmap);
> - }
> + dev_set_drvdata(dev, indio_dev);
> + data->dev = dev;
> + data->irq = irq;
>
> - if (id)
> - name = id->name;
> + data->regmap = regmap;
>
> ret = bmc150_accel_chip_init(data);
> if (ret < 0)
> @@ -1659,9 +1642,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
> if (ret)
> goto err_buffer_cleanup;
>
> - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
> - i2c_check_functionality(client->adapter,
> - I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
> + if (block_supported) {
> indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
> indio_dev->info = &bmc150_accel_info_fifo;
> indio_dev->buffer->attrs = bmc150_accel_fifo_attributes;
> @@ -1670,7 +1651,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>
> ret = iio_device_register(indio_dev);
> if (ret < 0) {
> - dev_err(data->dev, "Unable to register iio device\n");
> + dev_err(dev, "Unable to register iio device\n");
> goto err_trigger_unregister;
> }
>
> @@ -1693,10 +1674,11 @@ err_buffer_cleanup:
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(bmc150_accel_core_probe);
>
> -static int bmc150_accel_remove(struct i2c_client *client)
> +int bmc150_accel_core_remove(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
>
> pm_runtime_disable(data->dev);
> @@ -1715,6 +1697,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
>
> return 0;
> }
> +EXPORT_SYMBOL_GPL(bmc150_accel_core_remove);
>
> #ifdef CONFIG_PM_SLEEP
> static int bmc150_accel_suspend(struct device *dev)
> @@ -1785,48 +1768,12 @@ static int bmc150_accel_runtime_resume(struct device *dev)
> }
> #endif
>
> -static const struct dev_pm_ops bmc150_accel_pm_ops = {
> +const struct dev_pm_ops bmc150_accel_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(bmc150_accel_suspend, bmc150_accel_resume)
> SET_RUNTIME_PM_OPS(bmc150_accel_runtime_suspend,
> bmc150_accel_runtime_resume, NULL)
> };
>
> -static const struct acpi_device_id bmc150_accel_acpi_match[] = {
> - {"BSBA0150", bmc150},
> - {"BMC150A", bmc150},
> - {"BMI055A", bmi055},
> - {"BMA0255", bma255},
> - {"BMA250E", bma250e},
> - {"BMA222E", bma222e},
> - {"BMA0280", bma280},
> - { },
> -};
> -MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
> -
> -static const struct i2c_device_id bmc150_accel_id[] = {
> - {"bmc150_accel", bmc150},
> - {"bmi055_accel", bmi055},
> - {"bma255", bma255},
> - {"bma250e", bma250e},
> - {"bma222e", bma222e},
> - {"bma280", bma280},
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
> -
> -static struct i2c_driver bmc150_accel_driver = {
> - .driver = {
> - .name = BMC150_ACCEL_DRV_NAME,
> - .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> - .pm = &bmc150_accel_pm_ops,
> - },
> - .probe = bmc150_accel_probe,
> - .remove = bmc150_accel_remove,
> - .id_table = bmc150_accel_id,
> -};
> -module_i2c_driver(bmc150_accel_driver);
> -
> MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
> MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("BMC150 accelerometer driver");
> diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
> new file mode 100644
> index 000000000000..b41404ba32fc
> --- /dev/null
> +++ b/drivers/iio/accel/bmc150-accel-i2c.c
> @@ -0,0 +1,102 @@
> +/*
> + * 3-axis accelerometer driver supporting following I2C Bosch-Sensortec chips:
> + * - BMC150
> + * - BMI055
> + * - BMA255
> + * - BMA250E
> + * - BMA222E
> + * - BMA280
> + *
> + * Copyright (c) 2014, Intel Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/acpi.h>
> +#include <linux/regmap.h>
> +
> +#include "bmc150-accel.h"
> +
> +static const struct regmap_config bmc150_i2c_regmap_conf = {
> + .reg_bits = 8,
> + .val_bits = 8,
> +};
Just one minor comment here. You forgot to remove the definition
for bmc150_i2c_regmap_conf from bmc150-accel-core.c. The
definition from bmc150-accel-core.c also sets max_register, so
you might want to add it here as well.
You can keep my Tested-by tag if you only make this change.
Thanks,
Irina
> +
> +static int bmc150_accel_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + struct regmap *regmap;
> + const char *name = NULL;
> + bool block_supported =
> + i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
> + i2c_check_functionality(client->adapter,
> + I2C_FUNC_SMBUS_READ_I2C_BLOCK);
> +
> + regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
> + if (IS_ERR(regmap)) {
> + dev_err(&client->dev, "Failed to initialize i2c regmap\n");
> + return PTR_ERR(regmap);
> + }
> +
> + if (id)
> + name = id->name;
> +
> + return bmc150_accel_core_probe(&client->dev, regmap, client->irq, name,
> + block_supported);
> +}
> +
> +static int bmc150_accel_remove(struct i2c_client *client)
> +{
> + return bmc150_accel_core_remove(&client->dev);
> +}
> +
> +static const struct acpi_device_id bmc150_accel_acpi_match[] = {
> + {"BSBA0150", bmc150},
> + {"BMC150A", bmc150},
> + {"BMI055A", bmi055},
> + {"BMA0255", bma255},
> + {"BMA250E", bma250e},
> + {"BMA222E", bma222e},
> + {"BMA0280", bma280},
> + { },
> +};
> +MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
> +
> +static const struct i2c_device_id bmc150_accel_id[] = {
> + {"bmc150_accel", bmc150},
> + {"bmi055_accel", bmi055},
> + {"bma255", bma255},
> + {"bma250e", bma250e},
> + {"bma222e", bma222e},
> + {"bma280", bma280},
> + {}
> +};
> +
> +MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
> +
> +static struct i2c_driver bmc150_accel_driver = {
> + .driver = {
> + .name = "bmc150_accel_i2c",
> + .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> + .pm = &bmc150_accel_pm_ops,
> + },
> + .probe = bmc150_accel_probe,
> + .remove = bmc150_accel_remove,
> + .id_table = bmc150_accel_id,
> +};
> +module_i2c_driver(bmc150_accel_driver);
> +
> +MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("BMC150 I2C accelerometer driver");
> diff --git a/drivers/iio/accel/bmc150-accel.h b/drivers/iio/accel/bmc150-accel.h
> new file mode 100644
> index 000000000000..ba0335987f94
> --- /dev/null
> +++ b/drivers/iio/accel/bmc150-accel.h
> @@ -0,0 +1,20 @@
> +#ifndef _BMC150_ACCEL_H_
> +#define _BMC150_ACCEL_H_
> +
> +struct regmap;
> +
> +enum {
> + bmc150,
> + bmi055,
> + bma255,
> + bma250e,
> + bma222e,
> + bma280,
> +};
> +
> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
> + const char *name, bool block_supported);
> +int bmc150_accel_core_remove(struct device *dev);
> +extern const struct dev_pm_ops bmc150_accel_pm_ops;
> +
> +#endif /* _BMC150_ACCEL_H_ */
> --
> 2.5.1
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] iio: bmc150 regmap and SPI
2015-09-23 12:46 ` [PATCH v3 0/4] iio: bmc150 regmap and SPI Tirdea, Irina
@ 2015-09-24 7:11 ` Markus Pargmann
2015-09-24 11:30 ` Jonathan Cameron
2015-10-03 11:12 ` Jonathan Cameron
0 siblings, 2 replies; 18+ messages in thread
From: Markus Pargmann @ 2015-09-24 7:11 UTC (permalink / raw)
To: Tirdea, Irina
Cc: Jonathan Cameron, Srinivas Pandruvada, Lars-Peter Clausen,
linux-iio, linux-kernel, kernel
[-- Attachment #1: Type: text/plain, Size: 3736 bytes --]
Hi Irina,
On Wed, Sep 23, 2015 at 12:46:04PM +0000, Tirdea, Irina wrote:
>
>
> > -----Original Message-----
> > From: Markus Pargmann [mailto:mpa@pengutronix.de]
> > Sent: 21 September, 2015 13:55
> > To: Jonathan Cameron
> > Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
> > kernel@pengutronix.de; Markus Pargmann
> > Subject: [PATCH v3 0/4] iio: bmc150 regmap and SPI
> >
> > Hi,
> >
>
> Hi Markus,
>
> I tested the new version of you patches and everything works fine.
>
> I used a BMA250E chip connected on the i2c bus.
> The tests included the iio buffer code path and the i2c code path
> (including using the fifo and forcing the i2c bus to use
> the regmap_i2c_smbus_i2c_block calls you added to regmap).
>
> > this series converts the bmc150 driver to use regmap and adds an SPI interface.
> >
> > Thanks for testing and review so far. I rebased the series onto v4.3-rc2 now
> > (the togreg branch seems to be on v4.2).
> > It still works for me but there were some differences regarding the chip id.
> >
>
> I actually used the togreg branch (to get the latest bmc150 driver changes) and
> cherry-picked the regmap patches. Everything applied without any conflicts.
Thank you.
It is probably best if I rebase this onto togreg then as soon as it is
based on v4.3 to have the necessary regmap dependencies.
Best Regards,
Markus
>
> Thanks,
> Irina
>
> > Changes in v3:
> > - Fixed type of variable 'step' which lead to compile warnings. Type is now
> > size_t.
> > - Fixed patch that moved irq variable without reason
> > - Readded MODULE_* to the core driver
> > - Reintroduced check id NULL check
> >
> > Changes in v2:
> > - Removed default values for regmap_config fields.
> > - Redesigned the fifo_transfer function to avoid running in errors first.
> > - Dropped irq checks patch as it is already mainline
> > - Core can now be built as module with autoselection of i2c and spi parts
> >
> > As my hardware is missing an interrupt line from the SPI connected bmc150 I am
> > not able to test the iio buffer code path and the i2c code path. Tests would be
> > appreciated.
> >
> > @Srinivas:
> > As there were some rebase conflicts on the first patch, I removed your
> > reviewed-by tag again for the moment.
> >
> > Best regards,
> >
> > Markus
> >
> >
> > Markus Pargmann (4):
> > iio: bmc150: Use i2c regmap
> > iio: bcm150: Remove i2c_client from private data
> > iio: bmc150: Split the driver into core and i2c
> > iio: bmc150: Add SPI driver
> >
> > drivers/iio/accel/Kconfig | 14 +-
> > drivers/iio/accel/Makefile | 4 +-
> > .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 388 ++++++++-------------
> > drivers/iio/accel/bmc150-accel-i2c.c | 102 ++++++
> > drivers/iio/accel/bmc150-accel-spi.c | 80 +++++
> > drivers/iio/accel/bmc150-accel.h | 20 ++
> > 6 files changed, 366 insertions(+), 242 deletions(-)
> > rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (82%)
> > create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
> > create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
> > create mode 100644 drivers/iio/accel/bmc150-accel.h
> >
> > --
> > 2.5.1
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] iio: bmc150 regmap and SPI
2015-09-24 7:11 ` Markus Pargmann
@ 2015-09-24 11:30 ` Jonathan Cameron
2015-10-03 11:12 ` Jonathan Cameron
1 sibling, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-09-24 11:30 UTC (permalink / raw)
To: Markus Pargmann, Tirdea, Irina
Cc: Jonathan Cameron, Srinivas Pandruvada, Lars-Peter Clausen,
linux-iio, linux-kernel, kernel
On 24 September 2015 08:11:07 BST, Markus Pargmann <mpa@pengutronix.de> wrote:
>Hi Irina,
>
>On Wed, Sep 23, 2015 at 12:46:04PM +0000, Tirdea, Irina wrote:
>>
>>
>> > -----Original Message-----
>> > From: Markus Pargmann [mailto:mpa@pengutronix.de]
>> > Sent: 21 September, 2015 13:55
>> > To: Jonathan Cameron
>> > Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen;
>linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
>> > kernel@pengutronix.de; Markus Pargmann
>> > Subject: [PATCH v3 0/4] iio: bmc150 regmap and SPI
>> >
>> > Hi,
>> >
>>
>> Hi Markus,
>>
>> I tested the new version of you patches and everything works fine.
>>
>> I used a BMA250E chip connected on the i2c bus.
>> The tests included the iio buffer code path and the i2c code path
>> (including using the fifo and forcing the i2c bus to use
>> the regmap_i2c_smbus_i2c_block calls you added to regmap).
>>
>> > this series converts the bmc150 driver to use regmap and adds an
>SPI interface.
>> >
>> > Thanks for testing and review so far. I rebased the series onto
>v4.3-rc2 now
>> > (the togreg branch seems to be on v4.2).
>> > It still works for me but there were some differences regarding the
>chip id.
>> >
>>
>> I actually used the togreg branch (to get the latest bmc150 driver
>changes) and
>> cherry-picked the regmap patches. Everything applied without any
>conflicts.
>
>Thank you.
>
>It is probably best if I rebase this onto togreg then as soon as it is
>based on v4.3 to have the necessary regmap dependencies.
I will hopefully get a pull request off to Greg this evening then fast forward that branch sometime over the weekend.
>
>Best Regards,
>
>Markus
>
>>
>> Thanks,
>> Irina
>>
>> > Changes in v3:
>> > - Fixed type of variable 'step' which lead to compile warnings.
>Type is now
>> > size_t.
>> > - Fixed patch that moved irq variable without reason
>> > - Readded MODULE_* to the core driver
>> > - Reintroduced check id NULL check
>> >
>> > Changes in v2:
>> > - Removed default values for regmap_config fields.
>> > - Redesigned the fifo_transfer function to avoid running in errors
>first.
>> > - Dropped irq checks patch as it is already mainline
>> > - Core can now be built as module with autoselection of i2c and spi
>parts
>> >
>> > As my hardware is missing an interrupt line from the SPI connected
>bmc150 I am
>> > not able to test the iio buffer code path and the i2c code path.
>Tests would be
>> > appreciated.
>> >
>> > @Srinivas:
>> > As there were some rebase conflicts on the first patch, I removed
>your
>> > reviewed-by tag again for the moment.
>> >
>> > Best regards,
>> >
>> > Markus
>> >
>> >
>> > Markus Pargmann (4):
>> > iio: bmc150: Use i2c regmap
>> > iio: bcm150: Remove i2c_client from private data
>> > iio: bmc150: Split the driver into core and i2c
>> > iio: bmc150: Add SPI driver
>> >
>> > drivers/iio/accel/Kconfig | 14 +-
>> > drivers/iio/accel/Makefile | 4 +-
>> > .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 388
>++++++++-------------
>> > drivers/iio/accel/bmc150-accel-i2c.c | 102 ++++++
>> > drivers/iio/accel/bmc150-accel-spi.c | 80 +++++
>> > drivers/iio/accel/bmc150-accel.h | 20 ++
>> > 6 files changed, 366 insertions(+), 242 deletions(-)
>> > rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c}
>(82%)
>> > create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
>> > create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
>> > create mode 100644 drivers/iio/accel/bmc150-accel.h
>> >
>> > --
>> > 2.5.1
>>
>>
--
Sent from my Android device with K-9 Mail. Please excuse my brevity.
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] iio: bmc150: Add SPI driver
2015-09-21 10:55 ` [PATCH v3 4/4] iio: bmc150: Add SPI driver Markus Pargmann
@ 2015-10-03 11:04 ` Jonathan Cameron
2015-10-03 11:11 ` Jonathan Cameron
0 siblings, 1 reply; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:04 UTC (permalink / raw)
To: Markus Pargmann
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel
On 21/09/15 11:55, Markus Pargmann wrote:
> Add a simple SPI driver which initializes the spi regmap for the bmc150
> core driver.
>
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
After applying this one to latest togreg I get:
drivers/iio/accel/bmc150-accel-spi.c:69:37: error: undefined identifier 'bmc150_accel_acpi_match'
CC [M] drivers/iio/accel/bmc150-accel-spi.o
In file included from drivers/iio/accel/bmc150-accel-spi.c:22:0:
drivers/iio/accel/bmc150-accel-spi.c:69:32: error: ‘bmc150_accel_acpi_match’ undeclared here (not in a function)
.acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
^
include/linux/acpi.h:446:25: note: in definition of macro ‘ACPI_PTR’
#define ACPI_PTR(_ptr) (_ptr)
^
As per the other table I cut and paste it across from the i2c driver and
all now looks good.
It might make sense to do a follow up patch moving both the match tables into
the core driver. However, we may end up with a divergence in them if ST ever
release an i2c or SPI only part...
Up to you.
Jonathan
> ---
> drivers/iio/accel/Kconfig | 5 +++
> drivers/iio/accel/Makefile | 1 +
> drivers/iio/accel/bmc150-accel-spi.c | 80 ++++++++++++++++++++++++++++++++++++
> 3 files changed, 86 insertions(+)
> create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
>
> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
> index 280635545240..a010329f7d06 100644
> --- a/drivers/iio/accel/Kconfig
> +++ b/drivers/iio/accel/Kconfig
> @@ -23,6 +23,7 @@ config BMC150_ACCEL
> select IIO_TRIGGERED_BUFFER
> select REGMAP
> select BMC150_ACCEL_I2C if I2C
> + select BMC150_ACCEL_SPI if SPI
> help
> Say yes here to build support for the following Bosch accelerometers:
> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
> @@ -35,6 +36,10 @@ config BMC150_ACCEL_I2C
> tristate
> select REGMAP_I2C
>
> +config BMC150_ACCEL_SPI
> + tristate
> + select REGMAP_SPI
> +
> config HID_SENSOR_ACCEL_3D
> depends on HID_SENSOR_HUB
> select IIO_BUFFER
> diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
> index 5ef8bdbad092..e579e93bf022 100644
> --- a/drivers/iio/accel/Makefile
> +++ b/drivers/iio/accel/Makefile
> @@ -6,6 +6,7 @@
> obj-$(CONFIG_BMA180) += bma180.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_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
> obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
> obj-$(CONFIG_KXSD9) += kxsd9.o
> diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c
> new file mode 100644
> index 000000000000..41dd842996b0
> --- /dev/null
> +++ b/drivers/iio/accel/bmc150-accel-spi.c
> @@ -0,0 +1,80 @@
> +/*
> + * 3-axis accelerometer driver supporting SPI Bosch-Sensortec accelerometer chip
> + * Copyright © 2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
> + * GNU General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/module.h>
> +#include <linux/acpi.h>
> +#include <linux/regmap.h>
> +#include <linux/spi/spi.h>
> +
> +#include "bmc150-accel.h"
> +
> +static const struct regmap_config bmc150_spi_regmap_conf = {
> + .reg_bits = 8,
> + .val_bits = 8,
> + .max_register = 0x3f,
> +};
> +
> +static int bmc150_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(spi, &bmc150_spi_regmap_conf);
> + if (IS_ERR(regmap)) {
> + dev_err(&spi->dev, "Failed to initialize spi regmap\n");
> + return PTR_ERR(regmap);
> + }
> +
> + return bmc150_accel_core_probe(&spi->dev, regmap, spi->irq, id->name,
> + true);
> +}
> +
> +static int bmc150_accel_remove(struct spi_device *spi)
> +{
> + return bmc150_accel_core_remove(&spi->dev);
> +}
> +
> +static const struct spi_device_id bmc150_accel_id[] = {
> + {"bmc150_accel", bmc150},
> + {"bmi055_accel", bmi055},
> + {"bma255", bma255},
> + {"bma250e", bma250e},
> + {"bma222e", bma222e},
> + {"bma280", bma280},
> + {}
> +};
> +
> +MODULE_DEVICE_TABLE(spi, bmc150_accel_id);
> +
> +static struct spi_driver bmc150_accel_driver = {
> + .driver = {
> + .name = "bmc150_accel_spi",
> + .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> + .pm = &bmc150_accel_pm_ops,
> + },
> + .probe = bmc150_accel_probe,
> + .remove = bmc150_accel_remove,
> + .id_table = bmc150_accel_id,
> +};
> +module_spi_driver(bmc150_accel_driver);
> +
> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("BMC150 SPI accelerometer driver");
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
2015-09-21 10:55 ` [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c Markus Pargmann
2015-09-23 12:51 ` Tirdea, Irina
@ 2015-10-03 11:07 ` Jonathan Cameron
1 sibling, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:07 UTC (permalink / raw)
To: Markus Pargmann
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel
On 21/09/15 11:55, Markus Pargmann wrote:
> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
You didn't have the pm_ops structure exported which gave:
ERROR: "bmc150_accel_pm_ops" [drivers/iio/accel/bmc150-accel-i2c.ko] undefined!
scripts/Makefile.modpost:90: recipe for target '__modpost' failed
I added an EXPORT_SYMBOL_GPL to it and all seems fine.
> ---
> drivers/iio/accel/Kconfig | 9 +-
> drivers/iio/accel/Makefile | 3 +-
> .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 85 ++++-------------
> drivers/iio/accel/bmc150-accel-i2c.c | 102 +++++++++++++++++++++
> drivers/iio/accel/bmc150-accel.h | 20 ++++
> 5 files changed, 145 insertions(+), 74 deletions(-)
> rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (96%)
> create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
> create mode 100644 drivers/iio/accel/bmc150-accel.h
>
> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
> index 3ff2c83f7492..280635545240 100644
> --- a/drivers/iio/accel/Kconfig
> +++ b/drivers/iio/accel/Kconfig
> @@ -19,21 +19,22 @@ config BMA180
>
> config BMC150_ACCEL
> tristate "Bosch BMC150 Accelerometer Driver"
> - depends on I2C
> select IIO_BUFFER
> select IIO_TRIGGERED_BUFFER
> select REGMAP
> - select REGMAP_I2C
> + select BMC150_ACCEL_I2C if I2C
> help
> Say yes here to build support for the following Bosch accelerometers:
> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
>
> - Currently this only supports the device via an i2c interface.
> -
> This is a combo module with both accelerometer and magnetometer.
> This driver is only implementing accelerometer part, which has
> its own address and register map.
>
> +config BMC150_ACCEL_I2C
> + tristate
> + select REGMAP_I2C
> +
> config HID_SENSOR_ACCEL_3D
> depends on HID_SENSOR_HUB
> select IIO_BUFFER
> diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
> index ebd2675b2a02..5ef8bdbad092 100644
> --- a/drivers/iio/accel/Makefile
> +++ b/drivers/iio/accel/Makefile
> @@ -4,7 +4,8 @@
>
> # When adding new entries keep the list in alphabetical order
> obj-$(CONFIG_BMA180) += bma180.o
> -obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel.o
> +obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
> +obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
> obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
> obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
> obj-$(CONFIG_KXSD9) += kxsd9.o
> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel-core.c
> similarity index 96%
> rename from drivers/iio/accel/bmc150-accel.c
> rename to drivers/iio/accel/bmc150-accel-core.c
> index 425885dc6800..f492d2a4bce5 100644
> --- a/drivers/iio/accel/bmc150-accel.c
> +++ b/drivers/iio/accel/bmc150-accel-core.c
> @@ -37,6 +37,8 @@
> #include <linux/iio/triggered_buffer.h>
> #include <linux/regmap.h>
>
> +#include "bmc150-accel.h"
> +
> #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
> #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
> #define BMC150_ACCEL_GPIO_NAME "bmc150_accel_int"
> @@ -1015,15 +1017,6 @@ static const struct iio_chan_spec bmc150_accel_channels[] =
> static const struct iio_chan_spec bma280_accel_channels[] =
> BMC150_ACCEL_CHANNELS(14);
>
> -enum {
> - bmc150,
> - bmi055,
> - bma255,
> - bma250e,
> - bma222e,
> - bma280,
> -};
> -
> static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
> [bmc150] = {
> .name = "BMC150A",
> @@ -1576,33 +1569,23 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
> return 0;
> }
>
> -static int bmc150_accel_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
> + const char *name, bool block_supported)
> {
> struct bmc150_accel_data *data;
> struct iio_dev *indio_dev;
> int ret;
> - const char *name = NULL;
> - struct device *dev;
>
> - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
> + indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
> if (!indio_dev)
> return -ENOMEM;
>
> data = iio_priv(indio_dev);
> - i2c_set_clientdata(client, indio_dev);
> - data->dev = &client->dev;
> - dev = &client->dev;
> - data->irq = client->irq;
> -
> - data->regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
> - if (IS_ERR(data->regmap)) {
> - dev_err(dev, "Failed to initialize i2c regmap\n");
> - return PTR_ERR(data->regmap);
> - }
> + dev_set_drvdata(dev, indio_dev);
> + data->dev = dev;
> + data->irq = irq;
>
> - if (id)
> - name = id->name;
> + data->regmap = regmap;
>
> ret = bmc150_accel_chip_init(data);
> if (ret < 0)
> @@ -1659,9 +1642,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
> if (ret)
> goto err_buffer_cleanup;
>
> - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
> - i2c_check_functionality(client->adapter,
> - I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
> + if (block_supported) {
> indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
> indio_dev->info = &bmc150_accel_info_fifo;
> indio_dev->buffer->attrs = bmc150_accel_fifo_attributes;
> @@ -1670,7 +1651,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>
> ret = iio_device_register(indio_dev);
> if (ret < 0) {
> - dev_err(data->dev, "Unable to register iio device\n");
> + dev_err(dev, "Unable to register iio device\n");
> goto err_trigger_unregister;
> }
>
> @@ -1693,10 +1674,11 @@ err_buffer_cleanup:
>
> return ret;
> }
> +EXPORT_SYMBOL_GPL(bmc150_accel_core_probe);
>
> -static int bmc150_accel_remove(struct i2c_client *client)
> +int bmc150_accel_core_remove(struct device *dev)
> {
> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
> struct bmc150_accel_data *data = iio_priv(indio_dev);
>
> pm_runtime_disable(data->dev);
> @@ -1715,6 +1697,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
>
> return 0;
> }
> +EXPORT_SYMBOL_GPL(bmc150_accel_core_remove);
>
> #ifdef CONFIG_PM_SLEEP
> static int bmc150_accel_suspend(struct device *dev)
> @@ -1785,48 +1768,12 @@ static int bmc150_accel_runtime_resume(struct device *dev)
> }
> #endif
>
> -static const struct dev_pm_ops bmc150_accel_pm_ops = {
> +const struct dev_pm_ops bmc150_accel_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(bmc150_accel_suspend, bmc150_accel_resume)
> SET_RUNTIME_PM_OPS(bmc150_accel_runtime_suspend,
> bmc150_accel_runtime_resume, NULL)
> };
>
> -static const struct acpi_device_id bmc150_accel_acpi_match[] = {
> - {"BSBA0150", bmc150},
> - {"BMC150A", bmc150},
> - {"BMI055A", bmi055},
> - {"BMA0255", bma255},
> - {"BMA250E", bma250e},
> - {"BMA222E", bma222e},
> - {"BMA0280", bma280},
> - { },
> -};
> -MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
> -
> -static const struct i2c_device_id bmc150_accel_id[] = {
> - {"bmc150_accel", bmc150},
> - {"bmi055_accel", bmi055},
> - {"bma255", bma255},
> - {"bma250e", bma250e},
> - {"bma222e", bma222e},
> - {"bma280", bma280},
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
> -
> -static struct i2c_driver bmc150_accel_driver = {
> - .driver = {
> - .name = BMC150_ACCEL_DRV_NAME,
> - .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> - .pm = &bmc150_accel_pm_ops,
> - },
> - .probe = bmc150_accel_probe,
> - .remove = bmc150_accel_remove,
> - .id_table = bmc150_accel_id,
> -};
> -module_i2c_driver(bmc150_accel_driver);
> -
> MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
> MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("BMC150 accelerometer driver");
> diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
> new file mode 100644
> index 000000000000..b41404ba32fc
> --- /dev/null
> +++ b/drivers/iio/accel/bmc150-accel-i2c.c
> @@ -0,0 +1,102 @@
> +/*
> + * 3-axis accelerometer driver supporting following I2C Bosch-Sensortec chips:
> + * - BMC150
> + * - BMI055
> + * - BMA255
> + * - BMA250E
> + * - BMA222E
> + * - BMA280
> + *
> + * Copyright (c) 2014, Intel Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
> + * more details.
> + */
> +
> +#include <linux/device.h>
> +#include <linux/mod_devicetable.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/acpi.h>
> +#include <linux/regmap.h>
> +
> +#include "bmc150-accel.h"
> +
> +static const struct regmap_config bmc150_i2c_regmap_conf = {
> + .reg_bits = 8,
> + .val_bits = 8,
> +};
> +
> +static int bmc150_accel_probe(struct i2c_client *client,
> + const struct i2c_device_id *id)
> +{
> + struct regmap *regmap;
> + const char *name = NULL;
> + bool block_supported =
> + i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
> + i2c_check_functionality(client->adapter,
> + I2C_FUNC_SMBUS_READ_I2C_BLOCK);
> +
> + regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
> + if (IS_ERR(regmap)) {
> + dev_err(&client->dev, "Failed to initialize i2c regmap\n");
> + return PTR_ERR(regmap);
> + }
> +
> + if (id)
> + name = id->name;
> +
> + return bmc150_accel_core_probe(&client->dev, regmap, client->irq, name,
> + block_supported);
> +}
> +
> +static int bmc150_accel_remove(struct i2c_client *client)
> +{
> + return bmc150_accel_core_remove(&client->dev);
> +}
> +
> +static const struct acpi_device_id bmc150_accel_acpi_match[] = {
> + {"BSBA0150", bmc150},
> + {"BMC150A", bmc150},
> + {"BMI055A", bmi055},
> + {"BMA0255", bma255},
> + {"BMA250E", bma250e},
> + {"BMA222E", bma222e},
> + {"BMA0280", bma280},
> + { },
> +};
> +MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
> +
> +static const struct i2c_device_id bmc150_accel_id[] = {
> + {"bmc150_accel", bmc150},
> + {"bmi055_accel", bmi055},
> + {"bma255", bma255},
> + {"bma250e", bma250e},
> + {"bma222e", bma222e},
> + {"bma280", bma280},
> + {}
> +};
> +
> +MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
> +
> +static struct i2c_driver bmc150_accel_driver = {
> + .driver = {
> + .name = "bmc150_accel_i2c",
> + .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> + .pm = &bmc150_accel_pm_ops,
> + },
> + .probe = bmc150_accel_probe,
> + .remove = bmc150_accel_remove,
> + .id_table = bmc150_accel_id,
> +};
> +module_i2c_driver(bmc150_accel_driver);
> +
> +MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
> +MODULE_LICENSE("GPL v2");
> +MODULE_DESCRIPTION("BMC150 I2C accelerometer driver");
> diff --git a/drivers/iio/accel/bmc150-accel.h b/drivers/iio/accel/bmc150-accel.h
> new file mode 100644
> index 000000000000..ba0335987f94
> --- /dev/null
> +++ b/drivers/iio/accel/bmc150-accel.h
> @@ -0,0 +1,20 @@
> +#ifndef _BMC150_ACCEL_H_
> +#define _BMC150_ACCEL_H_
> +
> +struct regmap;
> +
> +enum {
> + bmc150,
> + bmi055,
> + bma255,
> + bma250e,
> + bma222e,
> + bma280,
> +};
> +
> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
> + const char *name, bool block_supported);
> +int bmc150_accel_core_remove(struct device *dev);
> +extern const struct dev_pm_ops bmc150_accel_pm_ops;
> +
> +#endif /* _BMC150_ACCEL_H_ */
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 1/4] iio: bmc150: Use i2c regmap
2015-09-23 12:47 ` Tirdea, Irina
@ 2015-10-03 11:08 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:08 UTC (permalink / raw)
To: Tirdea, Irina, Markus Pargmann
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
On 23/09/15 13:47, Tirdea, Irina wrote:
>
>
>> -----Original Message-----
>> From: Markus Pargmann [mailto:mpa@pengutronix.de]
>> Sent: 21 September, 2015 13:55
>> To: Jonathan Cameron
>> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
>> kernel@pengutronix.de; Markus Pargmann
>> Subject: [PATCH v3 1/4] iio: bmc150: Use i2c regmap
>>
>> This replaces all usage of direct i2c accesses with regmap accesses.
>>
>> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
>
> Tested-by: Irina Tirdea <irina.tirdea@intel.com>
Applied to the togreg branch of iio.git - initially pushed out as
testing for the autobuilders to play with it.
Thanks,
Jonathan
>
>> ---
>> drivers/iio/accel/Kconfig | 2 +
>> drivers/iio/accel/bmc150-accel.c | 225 +++++++++++++++++----------------------
>> 2 files changed, 99 insertions(+), 128 deletions(-)
>>
>> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
>> index a59047d7657e..3ff2c83f7492 100644
>> --- a/drivers/iio/accel/Kconfig
>> +++ b/drivers/iio/accel/Kconfig
>> @@ -22,6 +22,8 @@ config BMC150_ACCEL
>> depends on I2C
>> select IIO_BUFFER
>> select IIO_TRIGGERED_BUFFER
>> + select REGMAP
>> + select REGMAP_I2C
>> help
>> Say yes here to build support for the following Bosch accelerometers:
>> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
>> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
>> index 0104cdef8709..a17034fd53fb 100644
>> --- a/drivers/iio/accel/bmc150-accel.c
>> +++ b/drivers/iio/accel/bmc150-accel.c
>> @@ -35,6 +35,7 @@
>> #include <linux/iio/trigger.h>
>> #include <linux/iio/trigger_consumer.h>
>> #include <linux/iio/triggered_buffer.h>
>> +#include <linux/regmap.h>
>>
>> #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
>> #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
>> @@ -186,6 +187,8 @@ enum bmc150_accel_trigger_id {
>>
>> struct bmc150_accel_data {
>> struct i2c_client *client;
>> + struct regmap *regmap;
>> + struct device *dev;
>> struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
>> atomic_t active_intr;
>> struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
>> @@ -242,6 +245,12 @@ static const struct {
>> {500000, BMC150_ACCEL_SLEEP_500_MS},
>> {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,
>> enum bmc150_power_modes mode,
>> int dur_us)
>> @@ -271,8 +280,7 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
>>
>> dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
>>
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
>> return ret;
>> @@ -290,8 +298,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) {
>> if (bmc150_accel_samp_freq_table[i].val == val &&
>> bmc150_accel_samp_freq_table[i].val2 == val2) {
>> - ret = i2c_smbus_write_byte_data(
>> - data->client,
>> + ret = regmap_write(data->regmap,
>> BMC150_ACCEL_REG_PMU_BW,
>> bmc150_accel_samp_freq_table[i].bw_bits);
>> if (ret < 0)
>> @@ -308,26 +315,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)
>> {
>> - 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);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error writing reg_int_6\n");
>> 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,
>> + BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
>> if (ret < 0) {
>> - 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) {
>> - dev_err(&data->client->dev, "Error write reg_int_5\n");
>> + dev_err(&data->client->dev, "Error updating reg_int_5\n");
>> return ret;
>> }
>>
>> @@ -470,38 +470,18 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
>> return ret;
>>
>> /* map the interrupt to the appropriate pins */
>> - ret = i2c_smbus_read_byte_data(data->client, info->map_reg);
>> - if (ret < 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);
>> + ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
>> + (state ? info->map_bitmask : 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;
>> }
>>
>> /* 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,
>> + (state ? info->en_bitmask : 0));
>> if (ret < 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) {
>> - 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;
>> }
>>
>> @@ -523,8 +503,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) {
>> if (data->chip_info->scale_table[i].scale == val) {
>> - ret = i2c_smbus_write_byte_data(
>> - data->client,
>> + ret = regmap_write(data->regmap,
>> BMC150_ACCEL_REG_PMU_RANGE,
>> data->chip_info->scale_table[i].reg_range);
>> if (ret < 0) {
>> @@ -544,16 +523,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)
>> {
>> int ret;
>> + unsigned int value;
>>
>> 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) {
>> dev_err(&data->client->dev, "Error reading reg_temp\n");
>> mutex_unlock(&data->mutex);
>> return ret;
>> }
>> - *val = sign_extend32(ret, 7);
>> + *val = sign_extend32(value, 7);
>>
>> mutex_unlock(&data->mutex);
>>
>> @@ -566,6 +546,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
>> {
>> int ret;
>> int axis = chan->scan_index;
>> + unsigned int raw_val;
>>
>> mutex_lock(&data->mutex);
>> ret = bmc150_accel_set_power_state(data, true);
>> @@ -574,15 +555,15 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
>> return ret;
>> }
>>
>> - ret = i2c_smbus_read_word_data(data->client,
>> - BMC150_ACCEL_AXIS_TO_REG(axis));
>> + ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
>> + &raw_val, 2);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error reading axis %d\n", axis);
>> bmc150_accel_set_power_state(data, false);
>> mutex_unlock(&data->mutex);
>> return ret;
>> }
>> - *val = sign_extend32(ret >> chan->scan_type.shift,
>> + *val = sign_extend32(raw_val >> chan->scan_type.shift,
>> chan->scan_type.realbits - 1);
>> ret = bmc150_accel_set_power_state(data, false);
>> mutex_unlock(&data->mutex);
>> @@ -846,52 +827,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
>> * 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)
>> {
>> int sample_length = 3 * 2;
>> - u8 reg_fifo_data = BMC150_ACCEL_REG_FIFO_DATA;
>> - int ret = -EIO;
>> -
>> - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C)) {
>> - struct i2c_msg msg[2] = {
>> - {
>> - .addr = client->addr,
>> - .flags = 0,
>> - .buf = ®_fifo_data,
>> - .len = sizeof(reg_fifo_data),
>> - },
>> - {
>> - .addr = client->addr,
>> - .flags = I2C_M_RD,
>> - .buf = (u8 *)buffer,
>> - .len = samples * sample_length,
>> - }
>> - };
>> + int ret;
>> + int total_length = samples * sample_length;
>> + int i;
>> + size_t step = regmap_get_raw_read_max(data->regmap);
>>
>> - ret = i2c_transfer(client->adapter, msg, 2);
>> - if (ret != 2)
>> - ret = -EIO;
>> - else
>> - ret = 0;
>> - } else {
>> - int i, step = I2C_SMBUS_BLOCK_MAX / sample_length;
>> -
>> - 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;
>> - }
>> + if (!step || step > total_length)
>> + step = total_length;
>> + else if (step < total_length)
>> + step = sample_length;
>>
>> - ret = 0;
>> - }
>> + /*
>> + * Seems we have a bus with size limitation so we have to execute
>> + * multiple reads
>> + */
>> + for (i = 0; i < total_length; i += step) {
>> + ret = regmap_raw_read(data->regmap, BMC150_ACCEL_REG_FIFO_DATA,
>> + &buffer[i], step);
>> + if (ret)
>> + break;
>> }
>>
>> 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;
>> }
>> @@ -905,15 +868,15 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
>> u16 buffer[BMC150_ACCEL_FIFO_LENGTH * 3];
>> int64_t tstamp;
>> uint64_t sample_period;
>> + unsigned int val;
>>
>> - ret = i2c_smbus_read_byte_data(data->client,
>> - BMC150_ACCEL_REG_FIFO_STATUS);
>> + ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
>> return ret;
>> }
>>
>> - count = ret & 0x7F;
>> + count = val & 0x7F;
>>
>> if (!count)
>> return 0;
>> @@ -952,7 +915,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
>> if (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)
>> return ret;
>>
>> @@ -1155,17 +1118,19 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p)
>> struct iio_dev *indio_dev = pf->indio_dev;
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>> int bit, ret, i = 0;
>> + unsigned int raw_val;
>>
>> mutex_lock(&data->mutex);
>> for_each_set_bit(bit, indio_dev->active_scan_mask,
>> indio_dev->masklength) {
>> - ret = i2c_smbus_read_word_data(data->client,
>> - BMC150_ACCEL_AXIS_TO_REG(bit));
>> + ret = regmap_bulk_read(data->regmap,
>> + BMC150_ACCEL_AXIS_TO_REG(bit), &raw_val,
>> + 2);
>> if (ret < 0) {
>> mutex_unlock(&data->mutex);
>> goto err_read;
>> }
>> - data->buffer[i++] = ret;
>> + data->buffer[i++] = raw_val;
>> }
>> mutex_unlock(&data->mutex);
>>
>> @@ -1189,10 +1154,9 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
>>
>> mutex_lock(&data->mutex);
>> /* clear any latched interrupt */
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_INT_RST_LATCH,
>> - BMC150_ACCEL_INT_MODE_LATCH_INT |
>> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
>> + BMC150_ACCEL_INT_MODE_LATCH_INT |
>> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> mutex_unlock(&data->mutex);
>> if (ret < 0) {
>> dev_err(&data->client->dev,
>> @@ -1249,20 +1213,20 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>> int dir;
>> int ret;
>> + unsigned int val;
>>
>> - ret = i2c_smbus_read_byte_data(data->client,
>> - BMC150_ACCEL_REG_INT_STATUS_2);
>> + ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
>> return ret;
>> }
>>
>> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
>> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_SIGN)
>> dir = IIO_EV_DIR_FALLING;
>> else
>> 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_MOD_EVENT_CODE(IIO_ACCEL,
>> 0,
>> @@ -1271,7 +1235,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
>> dir),
>> data->timestamp);
>>
>> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Y)
>> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_Y)
>> iio_push_event(indio_dev,
>> IIO_MOD_EVENT_CODE(IIO_ACCEL,
>> 0,
>> @@ -1280,7 +1244,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
>> dir),
>> data->timestamp);
>>
>> - if (ret & BMC150_ACCEL_ANY_MOTION_BIT_Z)
>> + if (val & BMC150_ACCEL_ANY_MOTION_BIT_Z)
>> iio_push_event(indio_dev,
>> IIO_MOD_EVENT_CODE(IIO_ACCEL,
>> 0,
>> @@ -1315,10 +1279,9 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
>> }
>>
>> if (ack) {
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_INT_RST_LATCH,
>> - BMC150_ACCEL_INT_MODE_LATCH_INT |
>> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
>> + BMC150_ACCEL_INT_MODE_LATCH_INT |
>> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret)
>> dev_err(&data->client->dev,
>> "Error writing reg_int_rst_latch\n");
>> @@ -1459,7 +1422,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
>> u8 reg = BMC150_ACCEL_REG_FIFO_CONFIG1;
>> 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) {
>> dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
>> return ret;
>> @@ -1468,9 +1431,8 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
>> if (!data->fifo_mode)
>> return 0;
>>
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_FIFO_CONFIG0,
>> - data->watermark);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
>> + data->watermark);
>> if (ret < 0)
>> dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
>>
>> @@ -1557,23 +1519,25 @@ static const struct iio_buffer_setup_ops bmc150_accel_buffer_ops = {
>> static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> {
>> 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) {
>> - dev_err(&data->client->dev, "Error: Reading chip id\n");
>> + dev_err(&data->client->dev,
>> + "Error: Reading chip id\n");
>> 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++) {
>> - 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];
>> break;
>> }
>> }
>>
>> 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;
>> }
>>
>> @@ -1587,11 +1551,11 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> return ret;
>>
>> /* Set Default Range */
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_PMU_RANGE,
>> - BMC150_ACCEL_DEF_RANGE_4G);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
>> + BMC150_ACCEL_DEF_RANGE_4G);
>> 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;
>> }
>>
>> @@ -1605,10 +1569,9 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> return ret;
>>
>> /* Set default as latched interrupts */
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_INT_RST_LATCH,
>> - BMC150_ACCEL_INT_MODE_LATCH_INT |
>> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
>> + BMC150_ACCEL_INT_MODE_LATCH_INT |
>> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret < 0) {
>> dev_err(&data->client->dev,
>> "Error writing reg_int_rst_latch\n");
>> @@ -1633,6 +1596,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> data = iio_priv(indio_dev);
>> i2c_set_clientdata(client, indio_dev);
>> 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)
>> name = id->name;
>> @@ -1679,9 +1649,8 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> * want to use latch mode when we can to prevent interrupt
>> * flooding.
>> */
>> - ret = i2c_smbus_write_byte_data(data->client,
>> - BMC150_ACCEL_REG_INT_RST_LATCH,
>> - BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> + ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
>> + BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret < 0) {
>> dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
>> goto err_buffer_cleanup;
>> --
>> 2.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data
2015-09-23 12:47 ` Tirdea, Irina
@ 2015-10-03 11:09 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:09 UTC (permalink / raw)
To: Tirdea, Irina, Markus Pargmann
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
On 23/09/15 13:47, Tirdea, Irina wrote:
>
>
>> -----Original Message-----
>> From: Markus Pargmann [mailto:mpa@pengutronix.de]
>> Sent: 21 September, 2015 13:55
>> To: Jonathan Cameron
>> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
>> kernel@pengutronix.de; Markus Pargmann
>> Subject: [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data
>>
>> i2c_client struct is now only used for debugging output. We can use the
>> device struct as well so we can remove all struct i2c_client usage.
>>
>> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
>> Acked-by: Jonathan Cameron <jic23@kernel.org>
>
> Tested-by: Irina Tirdea <irina.tirdea@intel.com>
The gpio probe acpi function went away in the meantime so this ended up a bit
shorter than here, but the merge was straight forward.
Please do check however that I didn't mess it up!
Applied to the togreg branch of iio.git - initially pushed out as
testing for the autobuilders to play with it.
>
>> ---
>> drivers/iio/accel/bmc150-accel.c | 116 +++++++++++++++++++--------------------
>> 1 file changed, 56 insertions(+), 60 deletions(-)
>>
>> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel.c
>> index a17034fd53fb..425885dc6800 100644
>> --- a/drivers/iio/accel/bmc150-accel.c
>> +++ b/drivers/iio/accel/bmc150-accel.c
>> @@ -186,9 +186,9 @@ enum bmc150_accel_trigger_id {
>> };
>>
>> struct bmc150_accel_data {
>> - struct i2c_client *client;
>> struct regmap *regmap;
>> struct device *dev;
>> + int irq;
>> struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];
>> atomic_t active_intr;
>> struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];
>> @@ -278,11 +278,11 @@ static int bmc150_accel_set_mode(struct bmc150_accel_data *data,
>> lpw_bits = mode << BMC150_ACCEL_PMU_MODE_SHIFT;
>> lpw_bits |= (dur_val << BMC150_ACCEL_PMU_BIT_SLEEP_DUR_SHIFT);
>>
>> - dev_dbg(&data->client->dev, "Set Mode bits %x\n", lpw_bits);
>> + dev_dbg(data->dev, "Set Mode bits %x\n", lpw_bits);
>>
>> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_LPW, lpw_bits);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error writing reg_pmu_lpw\n");
>> + dev_err(data->dev, "Error writing reg_pmu_lpw\n");
>> return ret;
>> }
>>
>> @@ -320,18 +320,18 @@ static int bmc150_accel_update_slope(struct bmc150_accel_data *data)
>> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_6,
>> data->slope_thres);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error writing reg_int_6\n");
>> + dev_err(data->dev, "Error writing reg_int_6\n");
>> return ret;
>> }
>>
>> ret = regmap_update_bits(data->regmap, BMC150_ACCEL_REG_INT_5,
>> BMC150_ACCEL_SLOPE_DUR_MASK, data->slope_dur);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error updating reg_int_5\n");
>> + dev_err(data->dev, "Error updating reg_int_5\n");
>> return ret;
>> }
>>
>> - dev_dbg(&data->client->dev, "%s: %x %x\n", __func__, data->slope_thres,
>> + dev_dbg(data->dev, "%s: %x %x\n", __func__, data->slope_thres,
>> data->slope_dur);
>>
>> return ret;
>> @@ -380,17 +380,17 @@ static int bmc150_accel_set_power_state(struct bmc150_accel_data *data, bool on)
>> int ret;
>>
>> if (on) {
>> - ret = pm_runtime_get_sync(&data->client->dev);
>> + ret = pm_runtime_get_sync(data->dev);
>> } else {
>> - pm_runtime_mark_last_busy(&data->client->dev);
>> - ret = pm_runtime_put_autosuspend(&data->client->dev);
>> + pm_runtime_mark_last_busy(data->dev);
>> + ret = pm_runtime_put_autosuspend(data->dev);
>> }
>>
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Failed: bmc150_accel_set_power_state for %d\n", on);
>> if (on)
>> - pm_runtime_put_noidle(&data->client->dev);
>> + pm_runtime_put_noidle(data->dev);
>>
>> return ret;
>> }
>> @@ -473,7 +473,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
>> ret = regmap_update_bits(data->regmap, info->map_reg, info->map_bitmask,
>> (state ? info->map_bitmask : 0));
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error updating reg_int_map\n");
>> + dev_err(data->dev, "Error updating reg_int_map\n");
>> goto out_fix_power_state;
>> }
>>
>> @@ -481,7 +481,7 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i,
>> ret = regmap_update_bits(data->regmap, info->en_reg, info->en_bitmask,
>> (state ? info->en_bitmask : 0));
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error updating reg_int_en\n");
>> + dev_err(data->dev, "Error updating reg_int_en\n");
>> goto out_fix_power_state;
>> }
>>
>> @@ -507,7 +507,7 @@ static int bmc150_accel_set_scale(struct bmc150_accel_data *data, int val)
>> BMC150_ACCEL_REG_PMU_RANGE,
>> data->chip_info->scale_table[i].reg_range);
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Error writing pmu_range\n");
>> return ret;
>> }
>> @@ -529,7 +529,7 @@ static int bmc150_accel_get_temp(struct bmc150_accel_data *data, int *val)
>>
>> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_TEMP, &value);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error reading reg_temp\n");
>> + dev_err(data->dev, "Error reading reg_temp\n");
>> mutex_unlock(&data->mutex);
>> return ret;
>> }
>> @@ -558,7 +558,7 @@ static int bmc150_accel_get_axis(struct bmc150_accel_data *data,
>> ret = regmap_bulk_read(data->regmap, BMC150_ACCEL_AXIS_TO_REG(axis),
>> &raw_val, 2);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error reading axis %d\n", axis);
>> + dev_err(data->dev, "Error reading axis %d\n", axis);
>> bmc150_accel_set_power_state(data, false);
>> mutex_unlock(&data->mutex);
>> return ret;
>> @@ -872,7 +872,7 @@ static int __bmc150_accel_fifo_flush(struct iio_dev *indio_dev,
>>
>> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_FIFO_STATUS, &val);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error reading reg_fifo_status\n");
>> + dev_err(data->dev, "Error reading reg_fifo_status\n");
>> return ret;
>> }
>>
>> @@ -1159,7 +1159,7 @@ static int bmc150_accel_trig_try_reen(struct iio_trigger *trig)
>> BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> mutex_unlock(&data->mutex);
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Error writing reg_int_rst_latch\n");
>> return ret;
>> }
>> @@ -1217,7 +1217,7 @@ static int bmc150_accel_handle_roc_event(struct iio_dev *indio_dev)
>>
>> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_INT_STATUS_2, &val);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error reading reg_int_status_2\n");
>> + dev_err(data->dev, "Error reading reg_int_status_2\n");
>> return ret;
>> }
>>
>> @@ -1283,8 +1283,7 @@ static irqreturn_t bmc150_accel_irq_thread_handler(int irq, void *private)
>> BMC150_ACCEL_INT_MODE_LATCH_INT |
>> BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret)
>> - dev_err(&data->client->dev,
>> - "Error writing reg_int_rst_latch\n");
>> + dev_err(data->dev, "Error writing reg_int_rst_latch\n");
>>
>> ret = IRQ_HANDLED;
>> } else {
>> @@ -1323,17 +1322,13 @@ static irqreturn_t bmc150_accel_irq_handler(int irq, void *private)
>> return IRQ_NONE;
>> }
>>
>> -static int bmc150_accel_gpio_probe(struct i2c_client *client,
>> - struct bmc150_accel_data *data)
>> +static int bmc150_accel_gpio_probe(struct bmc150_accel_data *data)
>> {
>> struct device *dev;
>> struct gpio_desc *gpio;
>> int ret;
>>
>> - if (!client)
>> - return -EINVAL;
>> -
>> - dev = &client->dev;
>> + dev = data->dev;
>>
>> /* data ready gpio interrupt pin */
>> gpio = devm_gpiod_get_index(dev, BMC150_ACCEL_GPIO_NAME, 0, GPIOD_IN);
>> @@ -1386,7 +1381,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
>> for (i = 0; i < BMC150_ACCEL_TRIGGERS; i++) {
>> struct bmc150_accel_trigger *t = &data->triggers[i];
>>
>> - t->indio_trig = devm_iio_trigger_alloc(&data->client->dev,
>> + t->indio_trig = devm_iio_trigger_alloc(data->dev,
>> bmc150_accel_triggers[i].name,
>> indio_dev->name,
>> indio_dev->id);
>> @@ -1395,7 +1390,7 @@ static int bmc150_accel_triggers_setup(struct iio_dev *indio_dev,
>> break;
>> }
>>
>> - t->indio_trig->dev.parent = &data->client->dev;
>> + t->indio_trig->dev.parent = data->dev;
>> t->indio_trig->ops = &bmc150_accel_trigger_ops;
>> t->intr = bmc150_accel_triggers[i].intr;
>> t->data = data;
>> @@ -1424,7 +1419,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
>>
>> ret = regmap_write(data->regmap, reg, data->fifo_mode);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error writing reg_fifo_config1\n");
>> + dev_err(data->dev, "Error writing reg_fifo_config1\n");
>> return ret;
>> }
>>
>> @@ -1434,7 +1429,7 @@ static int bmc150_accel_fifo_set_mode(struct bmc150_accel_data *data)
>> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_FIFO_CONFIG0,
>> data->watermark);
>> if (ret < 0)
>> - dev_err(&data->client->dev, "Error writing reg_fifo_config0\n");
>> + dev_err(data->dev, "Error writing reg_fifo_config0\n");
>>
>> return ret;
>> }
>> @@ -1523,12 +1518,12 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>>
>> ret = regmap_read(data->regmap, BMC150_ACCEL_REG_CHIP_ID, &val);
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Error: Reading chip id\n");
>> return ret;
>> }
>>
>> - dev_dbg(&data->client->dev, "Chip Id %x\n", val);
>> + dev_dbg(data->dev, "Chip Id %x\n", val);
>> for (i = 0; i < ARRAY_SIZE(bmc150_accel_chip_info_tbl); i++) {
>> if (bmc150_accel_chip_info_tbl[i].chip_id == val) {
>> data->chip_info = &bmc150_accel_chip_info_tbl[i];
>> @@ -1537,7 +1532,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> }
>>
>> if (!data->chip_info) {
>> - dev_err(&data->client->dev, "Invalid chip %x\n", val);
>> + dev_err(data->dev, "Invalid chip %x\n", val);
>> return -ENODEV;
>> }
>>
>> @@ -1554,7 +1549,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_PMU_RANGE,
>> BMC150_ACCEL_DEF_RANGE_4G);
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Error writing reg_pmu_range\n");
>> return ret;
>> }
>> @@ -1573,7 +1568,7 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> BMC150_ACCEL_INT_MODE_LATCH_INT |
>> BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret < 0) {
>> - dev_err(&data->client->dev,
>> + dev_err(data->dev,
>> "Error writing reg_int_rst_latch\n");
>> return ret;
>> }
>> @@ -1588,6 +1583,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> struct iio_dev *indio_dev;
>> int ret;
>> const char *name = NULL;
>> + struct device *dev;
>>
>> indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
>> if (!indio_dev)
>> @@ -1595,12 +1591,13 @@ static int bmc150_accel_probe(struct i2c_client *client,
>>
>> data = iio_priv(indio_dev);
>> i2c_set_clientdata(client, indio_dev);
>> - data->client = client;
>> data->dev = &client->dev;
>> + dev = &client->dev;
>> + data->irq = client->irq;
>>
>> 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");
>> + dev_err(dev, "Failed to initialize i2c regmap\n");
>> return PTR_ERR(data->regmap);
>> }
>>
>> @@ -1613,7 +1610,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>>
>> mutex_init(&data->mutex);
>>
>> - indio_dev->dev.parent = &client->dev;
>> + 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;
>> @@ -1625,16 +1622,16 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> bmc150_accel_trigger_handler,
>> &bmc150_accel_buffer_ops);
>> if (ret < 0) {
>> - dev_err(&client->dev, "Failed: iio triggered buffer setup\n");
>> + dev_err(data->dev, "Failed: iio triggered buffer setup\n");
>> return ret;
>> }
>>
>> - if (client->irq < 0)
>> - client->irq = bmc150_accel_gpio_probe(client, data);
>> + if (data->irq <= 0)
>> + data->irq = bmc150_accel_gpio_probe(data);
>>
>> - if (client->irq > 0) {
>> + if (data->irq > 0) {
>> ret = devm_request_threaded_irq(
>> - &client->dev, client->irq,
>> + data->dev, data->irq,
>> bmc150_accel_irq_handler,
>> bmc150_accel_irq_thread_handler,
>> IRQF_TRIGGER_RISING,
>> @@ -1652,7 +1649,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> ret = regmap_write(data->regmap, BMC150_ACCEL_REG_INT_RST_LATCH,
>> BMC150_ACCEL_INT_MODE_LATCH_RESET);
>> if (ret < 0) {
>> - dev_err(&data->client->dev, "Error writing reg_int_rst_latch\n");
>> + dev_err(data->dev, "Error writing reg_int_rst_latch\n");
>> goto err_buffer_cleanup;
>> }
>>
>> @@ -1673,18 +1670,17 @@ static int bmc150_accel_probe(struct i2c_client *client,
>>
>> ret = iio_device_register(indio_dev);
>> if (ret < 0) {
>> - dev_err(&client->dev, "Unable to register iio device\n");
>> + dev_err(data->dev, "Unable to register iio device\n");
>> goto err_trigger_unregister;
>> }
>>
>> - ret = pm_runtime_set_active(&client->dev);
>> + ret = pm_runtime_set_active(dev);
>> if (ret)
>> goto err_iio_unregister;
>>
>> - pm_runtime_enable(&client->dev);
>> - pm_runtime_set_autosuspend_delay(&client->dev,
>> - BMC150_AUTO_SUSPEND_DELAY_MS);
>> - pm_runtime_use_autosuspend(&client->dev);
>> + pm_runtime_enable(dev);
>> + pm_runtime_set_autosuspend_delay(dev, BMC150_AUTO_SUSPEND_DELAY_MS);
>> + pm_runtime_use_autosuspend(dev);
>>
>> return 0;
>>
>> @@ -1703,9 +1699,9 @@ static int bmc150_accel_remove(struct i2c_client *client)
>> struct iio_dev *indio_dev = i2c_get_clientdata(client);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>>
>> - pm_runtime_disable(&client->dev);
>> - pm_runtime_set_suspended(&client->dev);
>> - pm_runtime_put_noidle(&client->dev);
>> + pm_runtime_disable(data->dev);
>> + pm_runtime_set_suspended(data->dev);
>> + pm_runtime_put_noidle(data->dev);
>>
>> iio_device_unregister(indio_dev);
>>
>> @@ -1723,7 +1719,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
>> #ifdef CONFIG_PM_SLEEP
>> static int bmc150_accel_suspend(struct device *dev)
>> {
>> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
>> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>>
>> mutex_lock(&data->mutex);
>> @@ -1735,7 +1731,7 @@ static int bmc150_accel_suspend(struct device *dev)
>>
>> static int bmc150_accel_resume(struct device *dev)
>> {
>> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
>> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>>
>> mutex_lock(&data->mutex);
>> @@ -1751,11 +1747,11 @@ static int bmc150_accel_resume(struct device *dev)
>> #ifdef CONFIG_PM
>> static int bmc150_accel_runtime_suspend(struct device *dev)
>> {
>> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
>> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>> int ret;
>>
>> - dev_dbg(&data->client->dev, __func__);
>> + dev_dbg(data->dev, __func__);
>> ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_SUSPEND, 0);
>> if (ret < 0)
>> return -EAGAIN;
>> @@ -1765,12 +1761,12 @@ static int bmc150_accel_runtime_suspend(struct device *dev)
>>
>> static int bmc150_accel_runtime_resume(struct device *dev)
>> {
>> - struct iio_dev *indio_dev = i2c_get_clientdata(to_i2c_client(dev));
>> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>> int ret;
>> int sleep_val;
>>
>> - dev_dbg(&data->client->dev, __func__);
>> + dev_dbg(data->dev, __func__);
>>
>> ret = bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);
>> if (ret < 0)
>> --
>> 2.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
2015-09-23 12:51 ` Tirdea, Irina
@ 2015-10-03 11:10 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:10 UTC (permalink / raw)
To: Tirdea, Irina, Markus Pargmann
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
On 23/09/15 13:51, Tirdea, Irina wrote:
>
>
>> -----Original Message-----
>> From: Markus Pargmann [mailto:mpa@pengutronix.de]
>> Sent: 21 September, 2015 13:55
>> To: Jonathan Cameron
>> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
>> kernel@pengutronix.de; Markus Pargmann
>> Subject: [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c
>>
>> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
>
> Tested-by: Irina Tirdea <irina.tirdea@intel.com>
Applied with the minor modes described in my other email in response to it.
Will be in the testing branch for the autobuilders shortly.
Jonathan
>
>> ---
>> drivers/iio/accel/Kconfig | 9 +-
>> drivers/iio/accel/Makefile | 3 +-
>> .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 85 ++++-------------
>> drivers/iio/accel/bmc150-accel-i2c.c | 102 +++++++++++++++++++++
>> drivers/iio/accel/bmc150-accel.h | 20 ++++
>> 5 files changed, 145 insertions(+), 74 deletions(-)
>> rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (96%)
>> create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
>> create mode 100644 drivers/iio/accel/bmc150-accel.h
>>
>> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
>> index 3ff2c83f7492..280635545240 100644
>> --- a/drivers/iio/accel/Kconfig
>> +++ b/drivers/iio/accel/Kconfig
>> @@ -19,21 +19,22 @@ config BMA180
>>
>> config BMC150_ACCEL
>> tristate "Bosch BMC150 Accelerometer Driver"
>> - depends on I2C
>> select IIO_BUFFER
>> select IIO_TRIGGERED_BUFFER
>> select REGMAP
>> - select REGMAP_I2C
>> + select BMC150_ACCEL_I2C if I2C
>> help
>> Say yes here to build support for the following Bosch accelerometers:
>> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
>>
>> - Currently this only supports the device via an i2c interface.
>> -
>> This is a combo module with both accelerometer and magnetometer.
>> This driver is only implementing accelerometer part, which has
>> its own address and register map.
>>
>> +config BMC150_ACCEL_I2C
>> + tristate
>> + select REGMAP_I2C
>> +
>> config HID_SENSOR_ACCEL_3D
>> depends on HID_SENSOR_HUB
>> select IIO_BUFFER
>> diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
>> index ebd2675b2a02..5ef8bdbad092 100644
>> --- a/drivers/iio/accel/Makefile
>> +++ b/drivers/iio/accel/Makefile
>> @@ -4,7 +4,8 @@
>>
>> # When adding new entries keep the list in alphabetical order
>> obj-$(CONFIG_BMA180) += bma180.o
>> -obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel.o
>> +obj-$(CONFIG_BMC150_ACCEL) += bmc150-accel-core.o
>> +obj-$(CONFIG_BMC150_ACCEL_I2C) += bmc150-accel-i2c.o
>> obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
>> obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
>> obj-$(CONFIG_KXSD9) += kxsd9.o
>> diff --git a/drivers/iio/accel/bmc150-accel.c b/drivers/iio/accel/bmc150-accel-core.c
>> similarity index 96%
>> rename from drivers/iio/accel/bmc150-accel.c
>> rename to drivers/iio/accel/bmc150-accel-core.c
>> index 425885dc6800..f492d2a4bce5 100644
>> --- a/drivers/iio/accel/bmc150-accel.c
>> +++ b/drivers/iio/accel/bmc150-accel-core.c
>> @@ -37,6 +37,8 @@
>> #include <linux/iio/triggered_buffer.h>
>> #include <linux/regmap.h>
>>
>> +#include "bmc150-accel.h"
>> +
>> #define BMC150_ACCEL_DRV_NAME "bmc150_accel"
>> #define BMC150_ACCEL_IRQ_NAME "bmc150_accel_event"
>> #define BMC150_ACCEL_GPIO_NAME "bmc150_accel_int"
>> @@ -1015,15 +1017,6 @@ static const struct iio_chan_spec bmc150_accel_channels[] =
>> static const struct iio_chan_spec bma280_accel_channels[] =
>> BMC150_ACCEL_CHANNELS(14);
>>
>> -enum {
>> - bmc150,
>> - bmi055,
>> - bma255,
>> - bma250e,
>> - bma222e,
>> - bma280,
>> -};
>> -
>> static const struct bmc150_accel_chip_info bmc150_accel_chip_info_tbl[] = {
>> [bmc150] = {
>> .name = "BMC150A",
>> @@ -1576,33 +1569,23 @@ static int bmc150_accel_chip_init(struct bmc150_accel_data *data)
>> return 0;
>> }
>>
>> -static int bmc150_accel_probe(struct i2c_client *client,
>> - const struct i2c_device_id *id)
>> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
>> + const char *name, bool block_supported)
>> {
>> struct bmc150_accel_data *data;
>> struct iio_dev *indio_dev;
>> int ret;
>> - const char *name = NULL;
>> - struct device *dev;
>>
>> - indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*data));
>> + indio_dev = devm_iio_device_alloc(dev, sizeof(*data));
>> if (!indio_dev)
>> return -ENOMEM;
>>
>> data = iio_priv(indio_dev);
>> - i2c_set_clientdata(client, indio_dev);
>> - data->dev = &client->dev;
>> - dev = &client->dev;
>> - data->irq = client->irq;
>> -
>> - data->regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
>> - if (IS_ERR(data->regmap)) {
>> - dev_err(dev, "Failed to initialize i2c regmap\n");
>> - return PTR_ERR(data->regmap);
>> - }
>> + dev_set_drvdata(dev, indio_dev);
>> + data->dev = dev;
>> + data->irq = irq;
>>
>> - if (id)
>> - name = id->name;
>> + data->regmap = regmap;
>>
>> ret = bmc150_accel_chip_init(data);
>> if (ret < 0)
>> @@ -1659,9 +1642,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>> if (ret)
>> goto err_buffer_cleanup;
>>
>> - if (i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
>> - i2c_check_functionality(client->adapter,
>> - I2C_FUNC_SMBUS_READ_I2C_BLOCK)) {
>> + if (block_supported) {
>> indio_dev->modes |= INDIO_BUFFER_SOFTWARE;
>> indio_dev->info = &bmc150_accel_info_fifo;
>> indio_dev->buffer->attrs = bmc150_accel_fifo_attributes;
>> @@ -1670,7 +1651,7 @@ static int bmc150_accel_probe(struct i2c_client *client,
>>
>> ret = iio_device_register(indio_dev);
>> if (ret < 0) {
>> - dev_err(data->dev, "Unable to register iio device\n");
>> + dev_err(dev, "Unable to register iio device\n");
>> goto err_trigger_unregister;
>> }
>>
>> @@ -1693,10 +1674,11 @@ err_buffer_cleanup:
>>
>> return ret;
>> }
>> +EXPORT_SYMBOL_GPL(bmc150_accel_core_probe);
>>
>> -static int bmc150_accel_remove(struct i2c_client *client)
>> +int bmc150_accel_core_remove(struct device *dev)
>> {
>> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
>> + struct iio_dev *indio_dev = dev_get_drvdata(dev);
>> struct bmc150_accel_data *data = iio_priv(indio_dev);
>>
>> pm_runtime_disable(data->dev);
>> @@ -1715,6 +1697,7 @@ static int bmc150_accel_remove(struct i2c_client *client)
>>
>> return 0;
>> }
>> +EXPORT_SYMBOL_GPL(bmc150_accel_core_remove);
>>
>> #ifdef CONFIG_PM_SLEEP
>> static int bmc150_accel_suspend(struct device *dev)
>> @@ -1785,48 +1768,12 @@ static int bmc150_accel_runtime_resume(struct device *dev)
>> }
>> #endif
>>
>> -static const struct dev_pm_ops bmc150_accel_pm_ops = {
>> +const struct dev_pm_ops bmc150_accel_pm_ops = {
>> SET_SYSTEM_SLEEP_PM_OPS(bmc150_accel_suspend, bmc150_accel_resume)
>> SET_RUNTIME_PM_OPS(bmc150_accel_runtime_suspend,
>> bmc150_accel_runtime_resume, NULL)
>> };
>>
>> -static const struct acpi_device_id bmc150_accel_acpi_match[] = {
>> - {"BSBA0150", bmc150},
>> - {"BMC150A", bmc150},
>> - {"BMI055A", bmi055},
>> - {"BMA0255", bma255},
>> - {"BMA250E", bma250e},
>> - {"BMA222E", bma222e},
>> - {"BMA0280", bma280},
>> - { },
>> -};
>> -MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
>> -
>> -static const struct i2c_device_id bmc150_accel_id[] = {
>> - {"bmc150_accel", bmc150},
>> - {"bmi055_accel", bmi055},
>> - {"bma255", bma255},
>> - {"bma250e", bma250e},
>> - {"bma222e", bma222e},
>> - {"bma280", bma280},
>> - {}
>> -};
>> -
>> -MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
>> -
>> -static struct i2c_driver bmc150_accel_driver = {
>> - .driver = {
>> - .name = BMC150_ACCEL_DRV_NAME,
>> - .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
>> - .pm = &bmc150_accel_pm_ops,
>> - },
>> - .probe = bmc150_accel_probe,
>> - .remove = bmc150_accel_remove,
>> - .id_table = bmc150_accel_id,
>> -};
>> -module_i2c_driver(bmc150_accel_driver);
>> -
>> MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
>> MODULE_LICENSE("GPL v2");
>> MODULE_DESCRIPTION("BMC150 accelerometer driver");
>> diff --git a/drivers/iio/accel/bmc150-accel-i2c.c b/drivers/iio/accel/bmc150-accel-i2c.c
>> new file mode 100644
>> index 000000000000..b41404ba32fc
>> --- /dev/null
>> +++ b/drivers/iio/accel/bmc150-accel-i2c.c
>> @@ -0,0 +1,102 @@
>> +/*
>> + * 3-axis accelerometer driver supporting following I2C Bosch-Sensortec chips:
>> + * - BMC150
>> + * - BMI055
>> + * - BMA255
>> + * - BMA250E
>> + * - BMA222E
>> + * - BMA280
>> + *
>> + * Copyright (c) 2014, Intel Corporation.
>> + *
>> + * This program is free software; you can redistribute it and/or modify it
>> + * under the terms and conditions of the GNU General Public License,
>> + * version 2, as published by the Free Software Foundation.
>> + *
>> + * This program is distributed in the hope it will be useful, but WITHOUT
>> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
>> + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
>> + * more details.
>> + */
>> +
>> +#include <linux/device.h>
>> +#include <linux/mod_devicetable.h>
>> +#include <linux/i2c.h>
>> +#include <linux/module.h>
>> +#include <linux/acpi.h>
>> +#include <linux/regmap.h>
>> +
>> +#include "bmc150-accel.h"
>> +
>> +static const struct regmap_config bmc150_i2c_regmap_conf = {
>> + .reg_bits = 8,
>> + .val_bits = 8,
>> +};
>
> Just one minor comment here. You forgot to remove the definition
> for bmc150_i2c_regmap_conf from bmc150-accel-core.c. The
> definition from bmc150-accel-core.c also sets max_register, so
> you might want to add it here as well.
>
> You can keep my Tested-by tag if you only make this change.
>
> Thanks,
> Irina
>
>> +
>> +static int bmc150_accel_probe(struct i2c_client *client,
>> + const struct i2c_device_id *id)
>> +{
>> + struct regmap *regmap;
>> + const char *name = NULL;
>> + bool block_supported =
>> + i2c_check_functionality(client->adapter, I2C_FUNC_I2C) ||
>> + i2c_check_functionality(client->adapter,
>> + I2C_FUNC_SMBUS_READ_I2C_BLOCK);
>> +
>> + regmap = devm_regmap_init_i2c(client, &bmc150_i2c_regmap_conf);
>> + if (IS_ERR(regmap)) {
>> + dev_err(&client->dev, "Failed to initialize i2c regmap\n");
>> + return PTR_ERR(regmap);
>> + }
>> +
>> + if (id)
>> + name = id->name;
>> +
>> + return bmc150_accel_core_probe(&client->dev, regmap, client->irq, name,
>> + block_supported);
>> +}
>> +
>> +static int bmc150_accel_remove(struct i2c_client *client)
>> +{
>> + return bmc150_accel_core_remove(&client->dev);
>> +}
>> +
>> +static const struct acpi_device_id bmc150_accel_acpi_match[] = {
>> + {"BSBA0150", bmc150},
>> + {"BMC150A", bmc150},
>> + {"BMI055A", bmi055},
>> + {"BMA0255", bma255},
>> + {"BMA250E", bma250e},
>> + {"BMA222E", bma222e},
>> + {"BMA0280", bma280},
>> + { },
>> +};
>> +MODULE_DEVICE_TABLE(acpi, bmc150_accel_acpi_match);
>> +
>> +static const struct i2c_device_id bmc150_accel_id[] = {
>> + {"bmc150_accel", bmc150},
>> + {"bmi055_accel", bmi055},
>> + {"bma255", bma255},
>> + {"bma250e", bma250e},
>> + {"bma222e", bma222e},
>> + {"bma280", bma280},
>> + {}
>> +};
>> +
>> +MODULE_DEVICE_TABLE(i2c, bmc150_accel_id);
>> +
>> +static struct i2c_driver bmc150_accel_driver = {
>> + .driver = {
>> + .name = "bmc150_accel_i2c",
>> + .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
>> + .pm = &bmc150_accel_pm_ops,
>> + },
>> + .probe = bmc150_accel_probe,
>> + .remove = bmc150_accel_remove,
>> + .id_table = bmc150_accel_id,
>> +};
>> +module_i2c_driver(bmc150_accel_driver);
>> +
>> +MODULE_AUTHOR("Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>");
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_DESCRIPTION("BMC150 I2C accelerometer driver");
>> diff --git a/drivers/iio/accel/bmc150-accel.h b/drivers/iio/accel/bmc150-accel.h
>> new file mode 100644
>> index 000000000000..ba0335987f94
>> --- /dev/null
>> +++ b/drivers/iio/accel/bmc150-accel.h
>> @@ -0,0 +1,20 @@
>> +#ifndef _BMC150_ACCEL_H_
>> +#define _BMC150_ACCEL_H_
>> +
>> +struct regmap;
>> +
>> +enum {
>> + bmc150,
>> + bmi055,
>> + bma255,
>> + bma250e,
>> + bma222e,
>> + bma280,
>> +};
>> +
>> +int bmc150_accel_core_probe(struct device *dev, struct regmap *regmap, int irq,
>> + const char *name, bool block_supported);
>> +int bmc150_accel_core_remove(struct device *dev);
>> +extern const struct dev_pm_ops bmc150_accel_pm_ops;
>> +
>> +#endif /* _BMC150_ACCEL_H_ */
>> --
>> 2.5.1
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 4/4] iio: bmc150: Add SPI driver
2015-10-03 11:04 ` Jonathan Cameron
@ 2015-10-03 11:11 ` Jonathan Cameron
0 siblings, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:11 UTC (permalink / raw)
To: Markus Pargmann
Cc: Srinivas Pandruvada, Irina Tirdea, Lars-Peter Clausen, linux-iio,
linux-kernel, kernel
On 03/10/15 12:04, Jonathan Cameron wrote:
> On 21/09/15 11:55, Markus Pargmann wrote:
>> Add a simple SPI driver which initializes the spi regmap for the bmc150
>> core driver.
>>
>> Signed-off-by: Markus Pargmann <mpa@pengutronix.de>
> After applying this one to latest togreg I get:
> drivers/iio/accel/bmc150-accel-spi.c:69:37: error: undefined identifier 'bmc150_accel_acpi_match'
> CC [M] drivers/iio/accel/bmc150-accel-spi.o
> In file included from drivers/iio/accel/bmc150-accel-spi.c:22:0:
> drivers/iio/accel/bmc150-accel-spi.c:69:32: error: ‘bmc150_accel_acpi_match’ undeclared here (not in a function)
> .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
> ^
> include/linux/acpi.h:446:25: note: in definition of macro ‘ACPI_PTR’
> #define ACPI_PTR(_ptr) (_ptr)
> ^
> As per the other table I cut and paste it across from the i2c driver and
> all now looks good.
>
> It might make sense to do a follow up patch moving both the match tables into
> the core driver. However, we may end up with a divergence in them if ST ever
> release an i2c or SPI only part...
> Up to you.
Forgot to say - applied to the togreg branch of iio.git - initially pushed out
as testing for the autobuilders to play with it.
Let me know if I messed anything up in the merge.
Thanks,
Jonathan
>
> Jonathan
>
>> ---
>> drivers/iio/accel/Kconfig | 5 +++
>> drivers/iio/accel/Makefile | 1 +
>> drivers/iio/accel/bmc150-accel-spi.c | 80 ++++++++++++++++++++++++++++++++++++
>> 3 files changed, 86 insertions(+)
>> create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
>>
>> diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig
>> index 280635545240..a010329f7d06 100644
>> --- a/drivers/iio/accel/Kconfig
>> +++ b/drivers/iio/accel/Kconfig
>> @@ -23,6 +23,7 @@ config BMC150_ACCEL
>> select IIO_TRIGGERED_BUFFER
>> select REGMAP
>> select BMC150_ACCEL_I2C if I2C
>> + select BMC150_ACCEL_SPI if SPI
>> help
>> Say yes here to build support for the following Bosch accelerometers:
>> BMC150, BMI055, BMA250E, BMA222E, BMA255, BMA280.
>> @@ -35,6 +36,10 @@ config BMC150_ACCEL_I2C
>> tristate
>> select REGMAP_I2C
>>
>> +config BMC150_ACCEL_SPI
>> + tristate
>> + select REGMAP_SPI
>> +
>> config HID_SENSOR_ACCEL_3D
>> depends on HID_SENSOR_HUB
>> select IIO_BUFFER
>> diff --git a/drivers/iio/accel/Makefile b/drivers/iio/accel/Makefile
>> index 5ef8bdbad092..e579e93bf022 100644
>> --- a/drivers/iio/accel/Makefile
>> +++ b/drivers/iio/accel/Makefile
>> @@ -6,6 +6,7 @@
>> obj-$(CONFIG_BMA180) += bma180.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_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o
>> obj-$(CONFIG_KXCJK1013) += kxcjk-1013.o
>> obj-$(CONFIG_KXSD9) += kxsd9.o
>> diff --git a/drivers/iio/accel/bmc150-accel-spi.c b/drivers/iio/accel/bmc150-accel-spi.c
>> new file mode 100644
>> index 000000000000..41dd842996b0
>> --- /dev/null
>> +++ b/drivers/iio/accel/bmc150-accel-spi.c
>> @@ -0,0 +1,80 @@
>> +/*
>> + * 3-axis accelerometer driver supporting SPI Bosch-Sensortec accelerometer chip
>> + * Copyright © 2015 Pengutronix, Markus Pargmann <mpa@pengutronix.de>
>> + *
>> + * This program is free software; you can redistribute it and/or modify
>> + * it under the terms of the GNU General Public License as published by
>> + * the Free Software Foundation; either version 2 of the License, or
>> + * (at your option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>> + * GNU General Public License for more details.
>> + *
>> + * You should have received a copy of the GNU General Public License
>> + * along with this program; if not, see <http://www.gnu.org/licenses/>.
>> + */
>> +
>> +#include <linux/device.h>
>> +#include <linux/mod_devicetable.h>
>> +#include <linux/module.h>
>> +#include <linux/acpi.h>
>> +#include <linux/regmap.h>
>> +#include <linux/spi/spi.h>
>> +
>> +#include "bmc150-accel.h"
>> +
>> +static const struct regmap_config bmc150_spi_regmap_conf = {
>> + .reg_bits = 8,
>> + .val_bits = 8,
>> + .max_register = 0x3f,
>> +};
>> +
>> +static int bmc150_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(spi, &bmc150_spi_regmap_conf);
>> + if (IS_ERR(regmap)) {
>> + dev_err(&spi->dev, "Failed to initialize spi regmap\n");
>> + return PTR_ERR(regmap);
>> + }
>> +
>> + return bmc150_accel_core_probe(&spi->dev, regmap, spi->irq, id->name,
>> + true);
>> +}
>> +
>> +static int bmc150_accel_remove(struct spi_device *spi)
>> +{
>> + return bmc150_accel_core_remove(&spi->dev);
>> +}
>> +
>> +static const struct spi_device_id bmc150_accel_id[] = {
>> + {"bmc150_accel", bmc150},
>> + {"bmi055_accel", bmi055},
>> + {"bma255", bma255},
>> + {"bma250e", bma250e},
>> + {"bma222e", bma222e},
>> + {"bma280", bma280},
>> + {}
>> +};
>> +
>> +MODULE_DEVICE_TABLE(spi, bmc150_accel_id);
>> +
>> +static struct spi_driver bmc150_accel_driver = {
>> + .driver = {
>> + .name = "bmc150_accel_spi",
>> + .acpi_match_table = ACPI_PTR(bmc150_accel_acpi_match),
>> + .pm = &bmc150_accel_pm_ops,
>> + },
>> + .probe = bmc150_accel_probe,
>> + .remove = bmc150_accel_remove,
>> + .id_table = bmc150_accel_id,
>> +};
>> +module_spi_driver(bmc150_accel_driver);
>> +
>> +MODULE_AUTHOR("Markus Pargmann <mpa@pengutronix.de>");
>> +MODULE_LICENSE("GPL v2");
>> +MODULE_DESCRIPTION("BMC150 SPI accelerometer driver");
>>
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH v3 0/4] iio: bmc150 regmap and SPI
2015-09-24 7:11 ` Markus Pargmann
2015-09-24 11:30 ` Jonathan Cameron
@ 2015-10-03 11:12 ` Jonathan Cameron
1 sibling, 0 replies; 18+ messages in thread
From: Jonathan Cameron @ 2015-10-03 11:12 UTC (permalink / raw)
To: Markus Pargmann, Tirdea, Irina
Cc: Srinivas Pandruvada, Lars-Peter Clausen, linux-iio, linux-kernel, kernel
On 24/09/15 08:11, Markus Pargmann wrote:
> Hi Irina,
>
> On Wed, Sep 23, 2015 at 12:46:04PM +0000, Tirdea, Irina wrote:
>>
>>
>>> -----Original Message-----
>>> From: Markus Pargmann [mailto:mpa@pengutronix.de]
>>> Sent: 21 September, 2015 13:55
>>> To: Jonathan Cameron
>>> Cc: Srinivas Pandruvada; Tirdea, Irina; Lars-Peter Clausen; linux-iio@vger.kernel.org; linux-kernel@vger.kernel.org;
>>> kernel@pengutronix.de; Markus Pargmann
>>> Subject: [PATCH v3 0/4] iio: bmc150 regmap and SPI
>>>
>>> Hi,
>>>
>>
>> Hi Markus,
>>
>> I tested the new version of you patches and everything works fine.
>>
>> I used a BMA250E chip connected on the i2c bus.
>> The tests included the iio buffer code path and the i2c code path
>> (including using the fifo and forcing the i2c bus to use
>> the regmap_i2c_smbus_i2c_block calls you added to regmap).
>>
>>> this series converts the bmc150 driver to use regmap and adds an SPI interface.
>>>
>>> Thanks for testing and review so far. I rebased the series onto v4.3-rc2 now
>>> (the togreg branch seems to be on v4.2).
>>> It still works for me but there were some differences regarding the chip id.
>>>
>>
>> I actually used the togreg branch (to get the latest bmc150 driver changes) and
>> cherry-picked the regmap patches. Everything applied without any conflicts.
>
> Thank you.
>
> It is probably best if I rebase this onto togreg then as soon as it is
> based on v4.3 to have the necessary regmap dependencies.
As Irina said it went on fairly clean I applied it from these
(before making my v4.3 tree available publicly - it is now).
Anyhow, was fairly straight forward (I think) as such things
go.
Thanks Irina for testing and Markus for your hard work getting
this in.
Jonathan
>
> Best Regards,
>
> Markus
>
>>
>> Thanks,
>> Irina
>>
>>> Changes in v3:
>>> - Fixed type of variable 'step' which lead to compile warnings. Type is now
>>> size_t.
>>> - Fixed patch that moved irq variable without reason
>>> - Readded MODULE_* to the core driver
>>> - Reintroduced check id NULL check
>>>
>>> Changes in v2:
>>> - Removed default values for regmap_config fields.
>>> - Redesigned the fifo_transfer function to avoid running in errors first.
>>> - Dropped irq checks patch as it is already mainline
>>> - Core can now be built as module with autoselection of i2c and spi parts
>>>
>>> As my hardware is missing an interrupt line from the SPI connected bmc150 I am
>>> not able to test the iio buffer code path and the i2c code path. Tests would be
>>> appreciated.
>>>
>>> @Srinivas:
>>> As there were some rebase conflicts on the first patch, I removed your
>>> reviewed-by tag again for the moment.
>>>
>>> Best regards,
>>>
>>> Markus
>>>
>>>
>>> Markus Pargmann (4):
>>> iio: bmc150: Use i2c regmap
>>> iio: bcm150: Remove i2c_client from private data
>>> iio: bmc150: Split the driver into core and i2c
>>> iio: bmc150: Add SPI driver
>>>
>>> drivers/iio/accel/Kconfig | 14 +-
>>> drivers/iio/accel/Makefile | 4 +-
>>> .../accel/{bmc150-accel.c => bmc150-accel-core.c} | 388 ++++++++-------------
>>> drivers/iio/accel/bmc150-accel-i2c.c | 102 ++++++
>>> drivers/iio/accel/bmc150-accel-spi.c | 80 +++++
>>> drivers/iio/accel/bmc150-accel.h | 20 ++
>>> 6 files changed, 366 insertions(+), 242 deletions(-)
>>> rename drivers/iio/accel/{bmc150-accel.c => bmc150-accel-core.c} (82%)
>>> create mode 100644 drivers/iio/accel/bmc150-accel-i2c.c
>>> create mode 100644 drivers/iio/accel/bmc150-accel-spi.c
>>> create mode 100644 drivers/iio/accel/bmc150-accel.h
>>>
>>> --
>>> 2.5.1
>>
>>
>
^ permalink raw reply [flat|nested] 18+ messages in thread
end of thread, other threads:[~2015-10-03 11:12 UTC | newest]
Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-09-21 10:55 [PATCH v3 0/4] iio: bmc150 regmap and SPI Markus Pargmann
2015-09-21 10:55 ` [PATCH v3 1/4] iio: bmc150: Use i2c regmap Markus Pargmann
2015-09-23 12:47 ` Tirdea, Irina
2015-10-03 11:08 ` Jonathan Cameron
2015-09-21 10:55 ` [PATCH v3 2/4] iio: bcm150: Remove i2c_client from private data Markus Pargmann
2015-09-23 12:47 ` Tirdea, Irina
2015-10-03 11:09 ` Jonathan Cameron
2015-09-21 10:55 ` [PATCH v3 3/4] iio: bmc150: Split the driver into core and i2c Markus Pargmann
2015-09-23 12:51 ` Tirdea, Irina
2015-10-03 11:10 ` Jonathan Cameron
2015-10-03 11:07 ` Jonathan Cameron
2015-09-21 10:55 ` [PATCH v3 4/4] iio: bmc150: Add SPI driver Markus Pargmann
2015-10-03 11:04 ` Jonathan Cameron
2015-10-03 11:11 ` Jonathan Cameron
2015-09-23 12:46 ` [PATCH v3 0/4] iio: bmc150 regmap and SPI Tirdea, Irina
2015-09-24 7:11 ` Markus Pargmann
2015-09-24 11:30 ` Jonathan Cameron
2015-10-03 11:12 ` Jonathan Cameron
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).