iio: bmg160: Add SPI connection
cover iio: bmg160: Add SPI connection
Hi,
bmg160 and bmi055 can be used via I2C and SPI. This series converts the driver to regmap and splits core driver and I2C/SPI.
I only have a board which has a bmi055 connected via SPI. I am not able to test the I2C part. Would be great if someone could test that the I2C driver is still working.
Best regards,
Markus
Markus Pargmann (7):
iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
iio: bmg160: Use i2c regmap instead of direct i2c access
iio: bmg160: Remove i2c_client from data struct
iio: bmg160: Use generic dev_drvdata
iio: bmg160: Remove remaining uses of i2c_client
iio: bmg160: Separate i2c and core driver
iio: bmg160: Add SPI driver
drivers/iio/gyro/Kconfig | 32 ++-
drivers/iio/gyro/Makefile | 4 +-
drivers/iio/gyro/bmg160.h | 10 +
drivers/iio/gyro/{bmg160.c => bmg160_core.c} | 356 +++++++++++----------------
drivers/iio/gyro/bmg160_i2c.c | 73 ++++++
drivers/iio/gyro/bmg160_spi.c | 59 +++++
6 files changed, 312 insertions(+), 222 deletions(-)
create mode 100644 drivers/iio/gyro/bmg160.h
rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (74%)
create mode 100644 drivers/iio/gyro/bmg160_i2c.c
create mode 100644 drivers/iio/gyro/bmg160_spi.cSignature · 1 line
2.1.4
PATCH 1/7 iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
This patch adds selects for IIO_BUFFER and IIO_TRIGGERED_BUFFER. Without IIO_BUFFER, the driver does not compile.
--- drivers/iio/gyro/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/iio/gyro/Kconfig +2 -1
@@ -53,7 +53,8 @@ config ADXRS450 config BMG160 tristate "BOSCH BMG160 Gyro Sensor" depends on I2C - select IIO_TRIGGERED_BUFFER if IIO_BUFFER + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor driver. This driver also supports BMI055 gyroscope.
Signature · 1 line
2.1.4
Re: [PATCH 1/7] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
Quoted 4 lines · Markus Pargmann
This patch adds selects for
IIO_BUFFERandIIO_TRIGGERED_BUFFER. WithoutIIO_BUFFER, the driver does not compile.Signed-off-by Markus Pargmann <[email protected]>
Quoted 18 lines
--- drivers/iio/gyro/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/gyro/Kconfig +2
-1@@ -53,7 +53,8 @@ config ADXRS450 config BMG160 tristate "BOSCH BMG160 Gyro Sensor" depends on I2C - select IIO_TRIGGERED_BUFFER if IIO_BUFFER + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor driver. This driver also supports BMI055 gyroscope.
Re: [PATCH 1/7] iio: bmg160: IIO_BUFFER and IIO_TRIGGERED_BUFFER are required
Quoted 6 lines · Srinivas Pandruvada
Quoted 4 lines · Markus Pargmann
This patch adds selects for
IIO_BUFFERandIIO_TRIGGERED_BUFFER. WithoutIIO_BUFFER, the driver does not compile.Signed-off-by Markus Pargmann <[email protected]>Reviewed-by Srinivas Pandruvada <[email protected]>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,
Jonathan
Quoted 25 lines
Quoted 9 lines
--- drivers/iio/gyro/Kconfig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/iio/gyro/Kconfig +0
-0drivers/iio/gyro/Kconfig config ADXRS450 · line 60
Quoted 9 lines
drivers/iio/gyro/Kconfig +2
-1@@ -53,7 +53,8 @@ config ADXRS450 config BMG160 tristate "BOSCH BMG160 Gyro Sensor" depends on I2C - select IIO_TRIGGERED_BUFFER if IIO_BUFFER + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER help Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor driver. This driver also supports BMI055 gyroscope.--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
PATCH 2/7 iio: bmg160: Use i2c regmap instead of direct i2c access
In reply to Markus PargmannThis patch introduces regmap usage into the driver. This is done to later easily support the SPI interface of this chip.
--- drivers/iio/gyro/bmg160.c | 200 +++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 111 deletions(-)
drivers/iio/gyro/bmg160.c +89 -111
@@ -28,6 +28,7 @@#include <linux/iio/events.h> #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> #define BMG160_DRV_NAME "bmg160"#define BMG160_IRQ_NAME "bmg160_event"
@@ -98,6 +99,7 @@struct bmg160_data {struct i2c_client *client; +struct regmap *regmap;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex;
@@ -134,12 +136,19 @@ static const struct { { 133, BMG160_RANGE_250DPS}, { 66, BMG160_RANGE_125DPS} }; +struct regmap_config bmg160_regmap_i2c_conf = { + .reg_bits =8 , + .val_bits =8 , + + .use_single_rw = true, + .cache_type =REGCACHE_NONE , +}; +static int bmg160_set_mode (struct bmg160_data *data,u8 mode) {int ret; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_PMU_LPW , mode); + ret =regmap_write (data->regmap,BMG160_REG_PMU_LPW , mode);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_lpw\n" );return ret;
@@ -169,8 +178,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)if (bw_bits <0 )return bw_bits; - ret =i2c_smbus_write_byte_data (data->client,BMG160_REG_PMU_BW , - bw_bits); + ret =regmap_write (data->regmap,BMG160_REG_PMU_BW , bw_bits);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_bw\n" );return ret;
@@ -184,16 +192,17 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)static int bmg160_chip_init (struct bmg160_data *data) {int ret; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_CHIP_ID ); + ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_chip_id\n" );return ret; } -dev_dbg (&data->client->dev,"Chip Id %x\n" , ret); -if (ret !=BMG160_CHIP_ID_VAL ) { -dev_err (&data->client->dev,"invalid chip %x\n" , ret); +dev_dbg (&data->client->dev,"Chip Id %x\n" , val); +if (val !=BMG160_CHIP_ID_VAL ) { +dev_err (&data->client->dev,"invalid chip %x\n" , val);return -ENODEV ; }
@@ -210,40 +219,31 @@ static int bmg160_chip_init(struct bmg160_data *data)return ret;/* Set Default Range */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_RANGE , -BMG160_RANGE_500DPS ); + ret =regmap_write (data->regmap,BMG160_REG_RANGE ,BMG160_RANGE_500DPS );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );return ret; } data->dps_range =BMG160_RANGE_500DPS ; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_SLOPE_THRES ); + ret =regmap_read (data->regmap,BMG160_REG_SLOPE_THRES , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_slope_thres\n" );return ret; } - data->slope_thres = ret; + data->slope_thres = val;/* Set default interrupt mode */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_EN_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_en_1\n" ); -return ret; - } - ret &= ~BMG160_INT1_BIT_OD ; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_1 , ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_EN_1 , +BMG160_INT1_BIT_OD ,0 );if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en_1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_en_1\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );
@@ -284,41 +284,28 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP0 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_0 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map0\n" ); -return ret; - } -if (status) - ret |=BMG160_INT_MAP_0_BIT_ANY ; -else - ret &= ~BMG160_INT_MAP_0_BIT_ANY ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_0 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_0 , +BMG160_INT_MAP_0_BIT_ANY , + (status ?BMG160_INT_MAP_0_BIT_ANY :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map0\n" ); +dev_err (&data->client->dev,"Error updating bits reg_int_map0\n" );return ret; }/* Enable/Disable slope interrupts */ if (status) {/* Update slope thres */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_SLOPE_THRES , - data->slope_thres); + ret =regmap_write (data->regmap,BMG160_REG_SLOPE_THRES , + data->slope_thres);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_slope_thres\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_MOTION_INTR , -BMG160_INT_MOTION_X | -BMG160_INT_MOTION_Y | -BMG160_INT_MOTION_Z ); + ret =regmap_write (data->regmap,BMG160_REG_MOTION_INTR , +BMG160_INT_MOTION_X |BMG160_INT_MOTION_Y | +BMG160_INT_MOTION_Z );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );
@@ -331,10 +318,10 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,* to set latched mode, we will be flooded anyway with INTR */ if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap, +BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );
@@ -342,14 +329,12 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, } } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); - }else - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + }else { + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); + }if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_int_en0\n" );
@@ -365,55 +350,39 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP1 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map1\n" ); -return ret; - } - -if (status) - ret |=BMG160_INT_MAP_1_BIT_NEW_DATA ; -else - ret &= ~BMG160_INT_MAP_1_BIT_NEW_DATA ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_1 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_1 , +BMG160_INT_MAP_1_BIT_NEW_DATA , + (status ?BMG160_INT_MAP_1_BIT_NEW_DATA :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_map1\n" );return ret; }if (status) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_NON_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_NON_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); }else {/* Restore interrupt mode */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); }if (ret <0 ) {
@@ -444,10 +413,8 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)for (i =0 ; i <ARRAY_SIZE (bmg160_scale_table); ++i) {if (bmg160_scale_table[i].scale == val) { - ret =i2c_smbus_write_byte_data ( - data->client, -BMG160_REG_RANGE , - bmg160_scale_table[i].dps_range); + ret =regmap_write (data->regmap,BMG160_REG_RANGE , + bmg160_scale_table[i].dps_range);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );
@@ -464,6 +431,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)static int bmg160_get_temp (struct bmg160_data *data,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);
@@ -472,7 +440,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_TEMP ); + ret =regmap_read (data->regmap,BMG160_REG_TEMP , &raw_val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_temp\n" );bmg160_set_power_state (data, false);
@@ -480,7 +448,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - *val =sign_extend32 (ret,7 ); + *val =sign_extend32 (raw_val,7 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )
@@ -492,6 +460,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)static int bmg160_get_axis (struct bmg160_data *data,int axis,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);
@@ -500,7 +469,8 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - ret =i2c_smbus_read_word_data (data->client,BMG160_AXIS_TO_REG (axis)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (axis), &raw_val, +2 );if (ret <0 ) {dev_err (&data->client->dev,"Error reading axis %d\n" , axis);bmg160_set_power_state (data, false);
@@ -508,7 +478,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - *val =sign_extend32 (ret,15 ); + *val =sign_extend32 (raw_val,15 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )
@@ -807,12 +777,13 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)struct iio_dev *indio_dev = pf->indio_dev;struct bmg160_data *data =iio_priv (indio_dev);int bit, ret, i =0 ; +unsigned int 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, -BMG160_AXIS_TO_REG (bit)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (bit), + &val,2 );if (ret <0 ) {mutex_unlock (&data->mutex); goto err;
@@ -840,10 +811,9 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)return 0 ;/* Set latched mode interrupt and clear any latched interrupt */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret;
@@ -907,33 +877,34 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)struct bmg160_data *data =iio_priv (indio_dev);int ret;int dir; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_STATUS_2 ); + ret =regmap_read (data->regmap,BMG160_REG_INT_STATUS_2 , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_int_status2\n" ); goto ack_intr_status; } -if (ret &0x08 ) +if (val &0x08 ) dir =IIO_EV_DIR_RISING ;else dir =IIO_EV_DIR_FALLING ; -if (ret &BMG160_ANY_MOTION_BIT_X ) +if (val &BMG160_ANY_MOTION_BIT_X )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_X ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Y ) +if (val &BMG160_ANY_MOTION_BIT_Y )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_Y ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Z ) +if (val &BMG160_ANY_MOTION_BIT_Z ) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL, 0, IIO_MOD_Z,
@@ -943,10 +914,9 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ack_intr_status:if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 )dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );
@@ -1038,6 +1008,14 @@ static int bmg160_probe(struct i2c_client *client,struct iio_dev *indio_dev;int ret;const char *name =NULL ; +struct regmap *regmap; + + regmap =devm_regmap_init_i2c (client, &bmg160_regmap_i2c_conf); +if (IS_ERR (regmap)) { +dev_err (&client->dev,"Failed to register i2c regmap %d\n" , + (int )PTR_ERR (regmap)); +return PTR_ERR (regmap); + } indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data));if (!indio_dev)
Signature · 1 line
2.1.4
Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access
Quoted 29 lines · Markus Pargmann
This patch introduces regmap usage into the driver. This is done to later easily support the SPI interface of this chip.
Signed-off-by Markus Pargmann <[email protected]>--- drivers/iio/gyro/bmg160.c | 200 +++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 111 deletions(-)drivers/iio/gyro/bmg160.c +2
-0@@ -28,6 +28,7 @@#include <linux/iio/events.h> #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> #define BMG160_DRV_NAME "bmg160"#define BMG160_IRQ_NAME "bmg160_event"@@ -98,6 +99,7 @@struct bmg160_data {struct i2c_client *client; +struct regmap *regmap;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex;
drivers/iio/gyro/bmg160.c static const struct { · line 139
Quoted 4 lines
drivers/iio/gyro/bmg160.c +1
-0@@ -134,12 +136,19 @@ static const struct { { 133, BMG160_RANGE_250DPS}, { 66, BMG160_RANGE_125DPS} }; +struct regmap_config bmg160_regmap_i2c_conf = {
This should probably be static const ...
Best regards,
Markus
Quoted 423 lines
drivers/iio/gyro/bmg160.c +86
-111+ .reg_bits = 8, + .val_bits = 8, + + .use_single_rw = true, + .cache_type = REGCACHE_NONE, +}; +static int bmg160_set_mode (struct bmg160_data *data,u8 mode) {int ret; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_PMU_LPW , mode); + ret =regmap_write (data->regmap,BMG160_REG_PMU_LPW , mode);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_lpw\n" );return ret;@@ -169,8 +178,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)if (bw_bits <0 )return bw_bits; - ret =i2c_smbus_write_byte_data (data->client,BMG160_REG_PMU_BW , - bw_bits); + ret =regmap_write (data->regmap,BMG160_REG_PMU_BW , bw_bits);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_bw\n" );return ret;@@ -184,16 +192,17 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)static int bmg160_chip_init (struct bmg160_data *data) {int ret; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_CHIP_ID ); + ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_chip_id\n" );return ret; } -dev_dbg (&data->client->dev,"Chip Id %x\n" , ret); -if (ret !=BMG160_CHIP_ID_VAL ) { -dev_err (&data->client->dev,"invalid chip %x\n" , ret); +dev_dbg (&data->client->dev,"Chip Id %x\n" , val); +if (val !=BMG160_CHIP_ID_VAL ) { +dev_err (&data->client->dev,"invalid chip %x\n" , val);return -ENODEV ; }@@ -210,40 +219,31 @@ static int bmg160_chip_init(struct bmg160_data *data)return ret;/* Set Default Range */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_RANGE , -BMG160_RANGE_500DPS ); + ret =regmap_write (data->regmap,BMG160_REG_RANGE ,BMG160_RANGE_500DPS );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );return ret; } data->dps_range =BMG160_RANGE_500DPS ; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_SLOPE_THRES ); + ret =regmap_read (data->regmap,BMG160_REG_SLOPE_THRES , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_slope_thres\n" );return ret; } - data->slope_thres = ret; + data->slope_thres = val;/* Set default interrupt mode */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_EN_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_en_1\n" ); -return ret; - } - ret &= ~BMG160_INT1_BIT_OD ; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_1 , ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_EN_1 , +BMG160_INT1_BIT_OD ,0 );if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en_1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_en_1\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -284,41 +284,28 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP0 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_0 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map0\n" ); -return ret; - } -if (status) - ret |=BMG160_INT_MAP_0_BIT_ANY ; -else - ret &= ~BMG160_INT_MAP_0_BIT_ANY ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_0 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_0 , +BMG160_INT_MAP_0_BIT_ANY , + (status ?BMG160_INT_MAP_0_BIT_ANY :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map0\n" ); +dev_err (&data->client->dev,"Error updating bits reg_int_map0\n" );return ret; }/* Enable/Disable slope interrupts */ if (status) {/* Update slope thres */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_SLOPE_THRES , - data->slope_thres); + ret =regmap_write (data->regmap,BMG160_REG_SLOPE_THRES , + data->slope_thres);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_slope_thres\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_MOTION_INTR , -BMG160_INT_MOTION_X | -BMG160_INT_MOTION_Y | -BMG160_INT_MOTION_Z ); + ret =regmap_write (data->regmap,BMG160_REG_MOTION_INTR , +BMG160_INT_MOTION_X |BMG160_INT_MOTION_Y | +BMG160_INT_MOTION_Z );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -331,10 +318,10 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,* to set latched mode, we will be flooded anyway with INTR */ if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap, +BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -342,14 +329,12 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, } } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); - }else - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + }else { + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); + }if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_int_en0\n" );@@ -365,55 +350,39 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP1 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map1\n" ); -return ret; - } - -if (status) - ret |=BMG160_INT_MAP_1_BIT_NEW_DATA ; -else - ret &= ~BMG160_INT_MAP_1_BIT_NEW_DATA ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_1 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_1 , +BMG160_INT_MAP_1_BIT_NEW_DATA , + (status ?BMG160_INT_MAP_1_BIT_NEW_DATA :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_map1\n" );return ret; }if (status) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_NON_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_NON_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); }else {/* Restore interrupt mode */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); }if (ret <0 ) {@@ -444,10 +413,8 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)for (i =0 ; i <ARRAY_SIZE (bmg160_scale_table); ++i) {if (bmg160_scale_table[i].scale == val) { - ret =i2c_smbus_write_byte_data ( - data->client, -BMG160_REG_RANGE , - bmg160_scale_table[i].dps_range); + ret =regmap_write (data->regmap,BMG160_REG_RANGE , + bmg160_scale_table[i].dps_range);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );@@ -464,6 +431,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)static int bmg160_get_temp (struct bmg160_data *data,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -472,7 +440,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_TEMP ); + ret =regmap_read (data->regmap,BMG160_REG_TEMP , &raw_val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_temp\n" );bmg160_set_power_state (data, false);@@ -480,7 +448,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - *val =sign_extend32 (ret,7 ); + *val =sign_extend32 (raw_val,7 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -492,6 +460,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)static int bmg160_get_axis (struct bmg160_data *data,int axis,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -500,7 +469,8 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - ret =i2c_smbus_read_word_data (data->client,BMG160_AXIS_TO_REG (axis)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (axis), &raw_val, +2 );if (ret <0 ) {dev_err (&data->client->dev,"Error reading axis %d\n" , axis);bmg160_set_power_state (data, false);@@ -508,7 +478,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - *val =sign_extend32 (ret,15 ); + *val =sign_extend32 (raw_val,15 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -807,12 +777,13 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)struct iio_dev *indio_dev = pf->indio_dev;struct bmg160_data *data =iio_priv (indio_dev);int bit, ret, i =0 ; +unsigned int 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, -BMG160_AXIS_TO_REG (bit)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (bit), + &val,2 );if (ret <0 ) {mutex_unlock (&data->mutex); goto err;@@ -840,10 +811,9 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)return 0 ;/* Set latched mode interrupt and clear any latched interrupt */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret;@@ -907,33 +877,34 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)struct bmg160_data *data =iio_priv (indio_dev);int ret;int dir; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_STATUS_2 ); + ret =regmap_read (data->regmap,BMG160_REG_INT_STATUS_2 , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_int_status2\n" ); goto ack_intr_status; } -if (ret &0x08 ) +if (val &0x08 ) dir =IIO_EV_DIR_RISING ;else dir =IIO_EV_DIR_FALLING ; -if (ret &BMG160_ANY_MOTION_BIT_X ) +if (val &BMG160_ANY_MOTION_BIT_X )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_X ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Y ) +if (val &BMG160_ANY_MOTION_BIT_Y )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_Y ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Z ) +if (val &BMG160_ANY_MOTION_BIT_Z ) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL, 0, IIO_MOD_Z,@@ -943,10 +914,9 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ack_intr_status:if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 )dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -1038,6 +1008,14 @@ static int bmg160_probe(struct i2c_client *client,struct iio_dev *indio_dev;int ret;const char *name =NULL ; +struct regmap *regmap; + + regmap =devm_regmap_init_i2c (client, &bmg160_regmap_i2c_conf); +if (IS_ERR (regmap)) { +dev_err (&client->dev,"Failed to register i2c regmap %d\n" , + (int )PTR_ERR (regmap)); +return PTR_ERR (regmap); + } indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data));if (!indio_dev)Signature · 1 line
2.1.4
Signature · 4 lines
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 |
Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access
Quoted 4 lines · Markus Pargmann
Quoted 1 line · Markus Pargmann
+struct
regmap_configbmg160_regmap_i2c_conf= {This should probably be static const ...
Likewise for "bmg160_regmap_conf", which you add in 7/7, right?
Thanks,
Paul Bolle
Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access
Quoted 7 lines · Paul Bolle
Quoted 4 lines · Markus Pargmann
Quoted 1 line · Markus Pargmann
+struct
regmap_configbmg160_regmap_i2c_conf= {This should probably be static const ...
Likewise for "
bmg160_regmap_conf", which you add in 7/7, right?
Yes, thanks.
Best regards,
Markus
Signature · 4 lines
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 |
Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access
In reply to Markus PargmannQuoted 13 lines · Markus Pargmann
This patch introduces regmap usage into the driver. This is done to later easily support the SPI interface of this chip.
Signed-off-by Markus Pargmann <[email protected]>--- drivers/iio/gyro/bmg160.c | 200 +++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 111 deletions(-)drivers/iio/gyro/bmg160.c +0
-0
drivers/iio/gyro/bmg160.c line 31
Quoted 4 lines
drivers/iio/gyro/bmg160.c +1
-0@@ -28,6 +28,7 @@#include <linux/iio/events.h> #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h>
Don't we need "select REGMAP_I2C" in Kconfig?
Changes looks fine. But there are many changes, so we need to test this on i2c before taking this patch.
Thanks,
Srinivas
Quoted 435 lines
drivers/iio/gyro/bmg160.c +88
-111#define BMG160_DRV_NAME "bmg160"#define BMG160_IRQ_NAME "bmg160_event"@@ -98,6 +99,7 @@struct bmg160_data {struct i2c_client *client; +struct regmap *regmap;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex;@@ -134,12 +136,19 @@ static const struct { { 133, BMG160_RANGE_250DPS}, { 66, BMG160_RANGE_125DPS} }; +struct regmap_config bmg160_regmap_i2c_conf = { + .reg_bits =8 , + .val_bits =8 , + + .use_single_rw = true, + .cache_type =REGCACHE_NONE , +}; +static int bmg160_set_mode (struct bmg160_data *data,u8 mode) {int ret; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_PMU_LPW , mode); + ret =regmap_write (data->regmap,BMG160_REG_PMU_LPW , mode);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_lpw\n" );return ret;@@ -169,8 +178,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)if (bw_bits <0 )return bw_bits; - ret =i2c_smbus_write_byte_data (data->client,BMG160_REG_PMU_BW , - bw_bits); + ret =regmap_write (data->regmap,BMG160_REG_PMU_BW , bw_bits);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_bw\n" );return ret;@@ -184,16 +192,17 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)static int bmg160_chip_init (struct bmg160_data *data) {int ret; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_CHIP_ID ); + ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_chip_id\n" );return ret; } -dev_dbg (&data->client->dev,"Chip Id %x\n" , ret); -if (ret !=BMG160_CHIP_ID_VAL ) { -dev_err (&data->client->dev,"invalid chip %x\n" , ret); +dev_dbg (&data->client->dev,"Chip Id %x\n" , val); +if (val !=BMG160_CHIP_ID_VAL ) { +dev_err (&data->client->dev,"invalid chip %x\n" , val);return -ENODEV ; }@@ -210,40 +219,31 @@ static int bmg160_chip_init(struct bmg160_data *data)return ret;/* Set Default Range */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_RANGE , -BMG160_RANGE_500DPS ); + ret =regmap_write (data->regmap,BMG160_REG_RANGE ,BMG160_RANGE_500DPS );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );return ret; } data->dps_range =BMG160_RANGE_500DPS ; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_SLOPE_THRES ); + ret =regmap_read (data->regmap,BMG160_REG_SLOPE_THRES , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_slope_thres\n" );return ret; } - data->slope_thres = ret; + data->slope_thres = val;/* Set default interrupt mode */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_EN_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_en_1\n" ); -return ret; - } - ret &= ~BMG160_INT1_BIT_OD ; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_1 , ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_EN_1 , +BMG160_INT1_BIT_OD ,0 );if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en_1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_en_1\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -284,41 +284,28 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP0 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_0 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map0\n" ); -return ret; - } -if (status) - ret |=BMG160_INT_MAP_0_BIT_ANY ; -else - ret &= ~BMG160_INT_MAP_0_BIT_ANY ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_0 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_0 , +BMG160_INT_MAP_0_BIT_ANY , + (status ?BMG160_INT_MAP_0_BIT_ANY :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map0\n" ); +dev_err (&data->client->dev,"Error updating bits reg_int_map0\n" );return ret; }/* Enable/Disable slope interrupts */ if (status) {/* Update slope thres */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_SLOPE_THRES , - data->slope_thres); + ret =regmap_write (data->regmap,BMG160_REG_SLOPE_THRES , + data->slope_thres);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_slope_thres\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_MOTION_INTR , -BMG160_INT_MOTION_X | -BMG160_INT_MOTION_Y | -BMG160_INT_MOTION_Z ); + ret =regmap_write (data->regmap,BMG160_REG_MOTION_INTR , +BMG160_INT_MOTION_X |BMG160_INT_MOTION_Y | +BMG160_INT_MOTION_Z );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -331,10 +318,10 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,* to set latched mode, we will be flooded anyway with INTR */ if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap, +BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -342,14 +329,12 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, } } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); - }else - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + }else { + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); + }if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_int_en0\n" );@@ -365,55 +350,39 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP1 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map1\n" ); -return ret; - } - -if (status) - ret |=BMG160_INT_MAP_1_BIT_NEW_DATA ; -else - ret &= ~BMG160_INT_MAP_1_BIT_NEW_DATA ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_1 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_1 , +BMG160_INT_MAP_1_BIT_NEW_DATA , + (status ?BMG160_INT_MAP_1_BIT_NEW_DATA :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_map1\n" );return ret; }if (status) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_NON_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_NON_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); }else {/* Restore interrupt mode */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); }if (ret <0 ) {@@ -444,10 +413,8 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)for (i =0 ; i <ARRAY_SIZE (bmg160_scale_table); ++i) {if (bmg160_scale_table[i].scale == val) { - ret =i2c_smbus_write_byte_data ( - data->client, -BMG160_REG_RANGE , - bmg160_scale_table[i].dps_range); + ret =regmap_write (data->regmap,BMG160_REG_RANGE , + bmg160_scale_table[i].dps_range);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );@@ -464,6 +431,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)static int bmg160_get_temp (struct bmg160_data *data,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -472,7 +440,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_TEMP ); + ret =regmap_read (data->regmap,BMG160_REG_TEMP , &raw_val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_temp\n" );bmg160_set_power_state (data, false);@@ -480,7 +448,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - *val =sign_extend32 (ret,7 ); + *val =sign_extend32 (raw_val,7 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -492,6 +460,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)static int bmg160_get_axis (struct bmg160_data *data,int axis,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -500,7 +469,8 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - ret =i2c_smbus_read_word_data (data->client,BMG160_AXIS_TO_REG (axis)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (axis), &raw_val, +2 );if (ret <0 ) {dev_err (&data->client->dev,"Error reading axis %d\n" , axis);bmg160_set_power_state (data, false);@@ -508,7 +478,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - *val =sign_extend32 (ret,15 ); + *val =sign_extend32 (raw_val,15 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -807,12 +777,13 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)struct iio_dev *indio_dev = pf->indio_dev;struct bmg160_data *data =iio_priv (indio_dev);int bit, ret, i =0 ; +unsigned int 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, -BMG160_AXIS_TO_REG (bit)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (bit), + &val,2 );if (ret <0 ) {mutex_unlock (&data->mutex); goto err;@@ -840,10 +811,9 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)return 0 ;/* Set latched mode interrupt and clear any latched interrupt */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret;@@ -907,33 +877,34 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)struct bmg160_data *data =iio_priv (indio_dev);int ret;int dir; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_STATUS_2 ); + ret =regmap_read (data->regmap,BMG160_REG_INT_STATUS_2 , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_int_status2\n" );gCONFIG_oto ack_intr_status; } -if (ret &0x08 ) +if (val &0x08 ) dir =IIO_EV_DIR_RISING ;else dir =IIO_EV_DIR_FALLING ; -if (ret &BMG160_ANY_MOTION_BIT_X ) +if (val &BMG160_ANY_MOTION_BIT_X )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_X ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Y ) +if (val &BMG160_ANY_MOTION_BIT_Y )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_Y ,IIO_EV_TYPE_ROC , CONFIG_ dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Z ) +if (val &BMG160_ANY_MOTION_BIT_Z ) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL, 0, IIO_MOD_Z,@@ -943,10 +914,9 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ack_intr_status:if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 )dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -1038,6 +1008,14 @@ static int bmg160_probe(struct i2c_client *client,struct iio_dev *indio_dev;int ret;const char *name =NULL ; +struct regmap *regmap; + + regmap =devm_regmap_init_i2c (client, &bmg160_regmap_i2c_conf); +if (IS_ERR (regmap)) { +dev_err (&client->dev,"Failed to register i2c regmap %d\n" , + (int )PTR_ERR (regmap)); +return PTR_ERR (regmap); + } indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data));if (!indio_dev)
Re: [PATCH 2/7] iio: bmg160: Use i2c regmap instead of direct i2c access
Hi,
Quoted 9 lines · Srinivas Pandruvada
Quoted 8 lines · Markus Pargmann
This patch introduces regmap usage into the driver. This is done to later easily support the SPI interface of this chip.
Signed-off-by Markus Pargmann <[email protected]>--- drivers/iio/gyro/bmg160.c | 200 +++++++++++++++++++++------------------------- 1 file changed, 89 insertions(+), 111 deletions(-)
Quoted 10 lines
drivers/iio/gyro/bmg160.c line 31
Quoted 9 lines
drivers/iio/gyro/bmg160.c +1
-0@@ -28,6 +28,7 @@#include <linux/iio/events.h> #include <linux/iio/trigger_consumer.h> #include <linux/iio/triggered_buffer.h> +#include <linux/regmap.h> Don't we need "select
REGMAP_I2C" inKconfig?
Oh yes. This is wrongly introduced in Patch 6/7. But it should really be in this one.
Thanks,
Markus
Quoted 444 lines
Changes looks fine. But there are many changes, so we need to test this on i2c before taking this patch.
Thanks,
SrinivasQuoted 435 lines
drivers/iio/gyro/bmg160.c +88
-111#define BMG160_DRV_NAME "bmg160"#define BMG160_IRQ_NAME "bmg160_event"@@ -98,6 +99,7 @@struct bmg160_data {struct i2c_client *client; +struct regmap *regmap;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;struct mutex mutex;@@ -134,12 +136,19 @@ static const struct { { 133, BMG160_RANGE_250DPS}, { 66, BMG160_RANGE_125DPS} }; +struct regmap_config bmg160_regmap_i2c_conf = { + .reg_bits =8 , + .val_bits =8 , + + .use_single_rw = true, + .cache_type =REGCACHE_NONE , +}; +static int bmg160_set_mode (struct bmg160_data *data,u8 mode) {int ret; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_PMU_LPW , mode); + ret =regmap_write (data->regmap,BMG160_REG_PMU_LPW , mode);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_lpw\n" );return ret;@@ -169,8 +178,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)if (bw_bits <0 )return bw_bits; - ret =i2c_smbus_write_byte_data (data->client,BMG160_REG_PMU_BW , - bw_bits); + ret =regmap_write (data->regmap,BMG160_REG_PMU_BW , bw_bits);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_pmu_bw\n" );return ret;@@ -184,16 +192,17 @@ static int bmg160_set_bw(struct bmg160_data *data, int val)static int bmg160_chip_init (struct bmg160_data *data) {int ret; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_CHIP_ID ); + ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_chip_id\n" );return ret; } -dev_dbg (&data->client->dev,"Chip Id %x\n" , ret); -if (ret !=BMG160_CHIP_ID_VAL ) { -dev_err (&data->client->dev,"invalid chip %x\n" , ret); +dev_dbg (&data->client->dev,"Chip Id %x\n" , val); +if (val !=BMG160_CHIP_ID_VAL ) { +dev_err (&data->client->dev,"invalid chip %x\n" , val);return -ENODEV ; }@@ -210,40 +219,31 @@ static int bmg160_chip_init(struct bmg160_data *data)return ret;/* Set Default Range */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_RANGE , -BMG160_RANGE_500DPS ); + ret =regmap_write (data->regmap,BMG160_REG_RANGE ,BMG160_RANGE_500DPS );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );return ret; } data->dps_range =BMG160_RANGE_500DPS ; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_SLOPE_THRES ); + ret =regmap_read (data->regmap,BMG160_REG_SLOPE_THRES , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_slope_thres\n" );return ret; } - data->slope_thres = ret; + data->slope_thres = val;/* Set default interrupt mode */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_EN_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_en_1\n" ); -return ret; - } - ret &= ~BMG160_INT1_BIT_OD ; - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_1 , ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_EN_1 , +BMG160_INT1_BIT_OD ,0 );if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en_1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_en_1\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -284,41 +284,28 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP0 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_0 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map0\n" ); -return ret; - } -if (status) - ret |=BMG160_INT_MAP_0_BIT_ANY ; -else - ret &= ~BMG160_INT_MAP_0_BIT_ANY ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_0 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_0 , +BMG160_INT_MAP_0_BIT_ANY , + (status ?BMG160_INT_MAP_0_BIT_ANY :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map0\n" ); +dev_err (&data->client->dev,"Error updating bits reg_int_map0\n" );return ret; }/* Enable/Disable slope interrupts */ if (status) {/* Update slope thres */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_SLOPE_THRES , - data->slope_thres); + ret =regmap_write (data->regmap,BMG160_REG_SLOPE_THRES , + data->slope_thres);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_slope_thres\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_MOTION_INTR , -BMG160_INT_MOTION_X | -BMG160_INT_MOTION_Y | -BMG160_INT_MOTION_Z ); + ret =regmap_write (data->regmap,BMG160_REG_MOTION_INTR , +BMG160_INT_MOTION_X |BMG160_INT_MOTION_Y | +BMG160_INT_MOTION_Z );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_motion_intr\n" );@@ -331,10 +318,10 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,* to set latched mode, we will be flooded anyway with INTR */ if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap, +BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -342,14 +329,12 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, } } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); - }else - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + }else { + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); + }if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_int_en0\n" );@@ -365,55 +350,39 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,int ret;/* Enable/Disable INT_MAP1 mapping */ - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_MAP_1 ); -if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_map1\n" ); -return ret; - } - -if (status) - ret |=BMG160_INT_MAP_1_BIT_NEW_DATA ; -else - ret &= ~BMG160_INT_MAP_1_BIT_NEW_DATA ; - - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_MAP_1 , - ret); + ret =regmap_update_bits (data->regmap,BMG160_REG_INT_MAP_1 , +BMG160_INT_MAP_1_BIT_NEW_DATA , + (status ?BMG160_INT_MAP_1_BIT_NEW_DATA :0 ));if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_map1\n" ); +dev_err (&data->client->dev,"Error updating bits in reg_int_map1\n" );return ret; }if (status) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_NON_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_NON_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -BMG160_DATA_ENABLE_INT ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 , +BMG160_DATA_ENABLE_INT ); }else {/* Restore interrupt mode */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret; } - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_EN_0 , -0 ); + ret =regmap_write (data->regmap,BMG160_REG_INT_EN_0 ,0 ); }if (ret <0 ) {@@ -444,10 +413,8 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)for (i =0 ; i <ARRAY_SIZE (bmg160_scale_table); ++i) {if (bmg160_scale_table[i].scale == val) { - ret =i2c_smbus_write_byte_data ( - data->client, -BMG160_REG_RANGE , - bmg160_scale_table[i].dps_range); + ret =regmap_write (data->regmap,BMG160_REG_RANGE , + bmg160_scale_table[i].dps_range);if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_range\n" );@@ -464,6 +431,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val)static int bmg160_get_temp (struct bmg160_data *data,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -472,7 +440,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_TEMP ); + ret =regmap_read (data->regmap,BMG160_REG_TEMP , &raw_val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_temp\n" );bmg160_set_power_state (data, false);@@ -480,7 +448,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)return ret; } - *val =sign_extend32 (ret,7 ); + *val =sign_extend32 (raw_val,7 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -492,6 +460,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val)static int bmg160_get_axis (struct bmg160_data *data,int axis,int *val) {int ret; +unsigned int raw_val;mutex_lock (&data->mutex); ret =bmg160_set_power_state (data, true);@@ -500,7 +469,8 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - ret =i2c_smbus_read_word_data (data->client,BMG160_AXIS_TO_REG (axis)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (axis), &raw_val, +2 );if (ret <0 ) {dev_err (&data->client->dev,"Error reading axis %d\n" , axis);bmg160_set_power_state (data, false);@@ -508,7 +478,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val)return ret; } - *val =sign_extend32 (ret,15 ); + *val =sign_extend32 (raw_val,15 ); ret =bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);if (ret <0 )@@ -807,12 +777,13 @@ static irqreturn_t bmg160_trigger_handler(int irq, void *p)struct iio_dev *indio_dev = pf->indio_dev;struct bmg160_data *data =iio_priv (indio_dev);int bit, ret, i =0 ; +unsigned int 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, -BMG160_AXIS_TO_REG (bit)); + ret =regmap_bulk_read (data->regmap,BMG160_AXIS_TO_REG (bit), + &val,2 );if (ret <0 ) {mutex_unlock (&data->mutex); goto err;@@ -840,10 +811,9 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)return 0 ;/* Set latched mode interrupt and clear any latched interrupt */ - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 ) {dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );return ret;@@ -907,33 +877,34 @@ static irqreturn_t bmg160_event_handler(int irq, void *private)struct bmg160_data *data =iio_priv (indio_dev);int ret;int dir; +unsigned int val; - ret =i2c_smbus_read_byte_data (data->client,BMG160_REG_INT_STATUS_2 ); + ret =regmap_read (data->regmap,BMG160_REG_INT_STATUS_2 , &val);if (ret <0 ) {dev_err (&data->client->dev,"Error reading reg_int_status2\n" );gCONFIG_oto ack_intr_status; } -if (ret &0x08 ) +if (val &0x08 ) dir =IIO_EV_DIR_RISING ;else dir =IIO_EV_DIR_FALLING ; -if (ret &BMG160_ANY_MOTION_BIT_X ) +if (val &BMG160_ANY_MOTION_BIT_X )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_X ,IIO_EV_TYPE_ROC , dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Y ) +if (val &BMG160_ANY_MOTION_BIT_Y )iio_push_event (indio_dev,IIO_MOD_EVENT_CODE (IIO_ANGL_VEL ,0 ,IIO_MOD_Y ,IIO_EV_TYPE_ROC , CONFIG_ dir),iio_get_time_ns ()); -if (ret &BMG160_ANY_MOTION_BIT_Z ) +if (val &BMG160_ANY_MOTION_BIT_Z ) iio_push_event(indio_dev, IIO_MOD_EVENT_CODE(IIO_ANGL_VEL, 0, IIO_MOD_Z,@@ -943,10 +914,9 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ack_intr_status:if (!data->dready_trigger_on) { - ret =i2c_smbus_write_byte_data (data->client, -BMG160_REG_INT_RST_LATCH , -BMG160_INT_MODE_LATCH_INT | -BMG160_INT_MODE_LATCH_RESET ); + ret =regmap_write (data->regmap,BMG160_REG_INT_RST_LATCH , +BMG160_INT_MODE_LATCH_INT | +BMG160_INT_MODE_LATCH_RESET );if (ret <0 )dev_err (&data->client->dev,"Error writing reg_rst_latch\n" );@@ -1038,6 +1008,14 @@ static int bmg160_probe(struct i2c_client *client,struct iio_dev *indio_dev;int ret;const char *name =NULL ; +struct regmap *regmap; + + regmap =devm_regmap_init_i2c (client, &bmg160_regmap_i2c_conf); +if (IS_ERR (regmap)) { +dev_err (&client->dev,"Failed to register i2c regmap %d\n" , + (int )PTR_ERR (regmap)); +return PTR_ERR (regmap); + } indio_dev =devm_iio_device_alloc (&client->dev,sizeof (*data));if (!indio_dev)
Signature · 4 lines
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 |
PATCH 3/7 iio: bmg160: Remove i2c_client from data struct
In reply to Markus Pargmanni2c_client variable is not really used anymore in the core driver. It is only used to get the device to make proper outputs.
This patch replaces all i2c_client usage through direct usage of the device pointer.
--- drivers/iio/gyro/bmg160.c | 64 +++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 32 deletions(-)
drivers/iio/gyro/bmg160.c +32 -32
@@ -98,7 +98,7 @@#define BMG160_AUTO_SUSPEND_DELAY_MS 2000struct bmg160_data { -struct i2c_client *client; +struct device *dev;struct regmap *regmap;struct iio_trigger *dready_trig;struct iio_trigger *motion_trig;
@@ -150,7 +150,7 @@ static int bmg160_set_mode(struct bmg160_data *data, u8 mode) ret =regmap_write (data->regmap,BMG160_REG_PMU_LPW , mode);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; }
@@ -180,7 +180,7 @@ static int bmg160_set_bw(struct bmg160_data *data, int val) ret =regmap_write (data->regmap,BMG160_REG_PMU_BW , bw_bits);if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_pmu_bw\n" ); +dev_err (data->dev,"Error writing reg_pmu_bw\n" );return ret; }
@@ -196,13 +196,13 @@ static int bmg160_chip_init(struct bmg160_data *data) ret =regmap_read (data->regmap,BMG160_REG_CHIP_ID , &val);if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_chip_id\n" ); +dev_err (data->dev,"Error reading reg_chip_id\n" );return ret; } -dev_dbg (&data->client->dev,"Chip Id %x\n" , val); +dev_dbg (data->dev,"Chip Id %x\n" , val);if (val !=BMG160_CHIP_ID_VAL ) { -dev_err (&data->client->dev,"invalid chip %x\n" , val); +dev_err (data->dev,"invalid chip %x\n" , val);return -ENODEV ; }
@@ -221,14 +221,14 @@ static int bmg160_chip_init(struct bmg160_data *data)/* Set Default Range */ ret =regmap_write (data->regmap,BMG160_REG_RANGE ,BMG160_RANGE_500DPS );if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_range\n" ); +dev_err (data->dev,"Error writing reg_range\n" );return ret; } data->dps_range =BMG160_RANGE_500DPS ; ret =regmap_read (data->regmap,BMG160_REG_SLOPE_THRES , &val);if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_slope_thres\n" ); +dev_err (data->dev,"Error reading reg_slope_thres\n" );return ret; } data->slope_thres = val;
@@ -237,7 +237,7 @@ static int bmg160_chip_init(struct bmg160_data *data) ret =regmap_update_bits (data->regmap,BMG160_REG_INT_EN_1 ,BMG160_INT1_BIT_OD ,0 );if (ret <0 ) { -dev_err (&data->client->dev,"Error updating bits in reg_int_en_1\n" ); +dev_err (data->dev,"Error updating bits in reg_int_en_1\n" );return ret; }
@@ -245,7 +245,7 @@ static int bmg160_chip_init(struct bmg160_data *data)BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_motion_intr\n" );return ret; }
@@ -259,17 +259,17 @@ static int bmg160_set_power_state(struct bmg160_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: bmg160_set_power_state for %d\n" , on);if (on) -pm_runtime_put_noidle (&data->client->dev); +pm_runtime_put_noidle (data->dev);return ret; }
@@ -288,7 +288,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,BMG160_INT_MAP_0_BIT_ANY , (status ? BMG160_INT_MAP_0_BIT_ANY : 0));if (ret <0 ) { -dev_err (&data->client->dev,"Error updating bits reg_int_map0\n" ); +dev_err (data->dev,"Error updating bits reg_int_map0\n" );return ret; }
@@ -298,7 +298,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, ret =regmap_write (data->regmap,BMG160_REG_SLOPE_THRES , data->slope_thres);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_slope_thres\n" );return ret; }
@@ -307,7 +307,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,BMG160_INT_MOTION_X |BMG160_INT_MOTION_Y | BMG160_INT_MOTION_Z);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_motion_intr\n" );return ret; }
@@ -323,7 +323,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data,BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_rst_latch\n" );return ret; }
@@ -337,7 +337,7 @@ static int bmg160_setup_any_motion_interrupt(struct bmg160_data *data, }if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en0\n" ); +dev_err (data->dev,"Error writing reg_int_en0\n" );return ret; }
@@ -354,7 +354,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,BMG160_INT_MAP_1_BIT_NEW_DATA , (status ? BMG160_INT_MAP_1_BIT_NEW_DATA : 0));if (ret <0 ) { -dev_err (&data->client->dev,"Error updating bits in reg_int_map1\n" ); +dev_err (data->dev,"Error updating bits in reg_int_map1\n" );return ret; }
@@ -363,7 +363,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,BMG160_INT_MODE_NON_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_rst_latch\n" );return ret; }
@@ -377,7 +377,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data,BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_rst_latch\n" );return ret; }
@@ -386,7 +386,7 @@ static int bmg160_setup_new_data_interrupt(struct bmg160_data *data, }if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_int_en0\n" ); +dev_err (data->dev,"Error writing reg_int_en0\n" );return ret; }
@@ -416,7 +416,7 @@ static int bmg160_set_scale(struct bmg160_data *data, int val) ret =regmap_write (data->regmap,BMG160_REG_RANGE , bmg160_scale_table[i].dps_range);if (ret <0 ) { -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_range\n" );return ret; }
@@ -442,7 +442,7 @@ static int bmg160_get_temp(struct bmg160_data *data, int *val) ret =regmap_read (data->regmap,BMG160_REG_TEMP , &raw_val);if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_temp\n" ); +dev_err (data->dev,"Error reading reg_temp\n" );bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);return ret;
@@ -472,7 +472,7 @@ static int bmg160_get_axis(struct bmg160_data *data, int axis, int *val) ret =regmap_bulk_read (data->regmap,BMG160_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);bmg160_set_power_state (data, false);mutex_unlock (&data->mutex);return ret;
@@ -815,7 +815,7 @@ static int bmg160_trig_try_reen(struct iio_trigger *trig)BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) { -dev_err (&data->client->dev,"Error writing reg_rst_latch\n" ); +dev_err (data->dev,"Error writing reg_rst_latch\n" );return ret; }
@@ -881,7 +881,7 @@ static irqreturn_t bmg160_event_handler(int irq, void *private) ret =regmap_read (data->regmap,BMG160_REG_INT_STATUS_2 , &val);if (ret <0 ) { -dev_err (&data->client->dev,"Error reading reg_int_status2\n" ); +dev_err (data->dev,"Error reading reg_int_status2\n" ); goto ack_intr_status; }
@@ -918,7 +918,7 @@ ack_intr_status:BMG160_INT_MODE_LATCH_INT | BMG160_INT_MODE_LATCH_RESET);if (ret <0 ) -dev_err (&data->client->dev, +dev_err (data->dev,"Error writing reg_rst_latch\n" ); }
@@ -1023,7 +1023,7 @@ static int bmg160_probe(struct i2c_client *client, data =iio_priv (indio_dev);i2c_set_clientdata (client, indio_dev); - data->client = client; + data->dev = &client->dev; ret =bmg160_chip_init (data);if (ret <0 )
@@ -1190,7 +1190,7 @@ static int bmg160_runtime_suspend(struct device *dev) ret =bmg160_set_mode (data,BMG160_MODE_SUSPEND );if (ret <0 ) { -dev_err (&data->client->dev,"set mode failed\n" ); +dev_err (data->dev,"set mode failed\n" );return -EAGAIN ; }
Signature · 1 line
2.1.4
PATCH 4/7 iio: bmg160: Use generic dev_drvdata
In reply to Markus Pargmanni2c_get_clientdata() is specifically for i2c. Replace it with the generic dev_get/set_drvdata() to support different protocols.
--- drivers/iio/gyro/bmg160.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/iio/gyro/bmg160.c +5 -5
@@ -1022,7 +1022,7 @@ static int bmg160_probe(struct i2c_client *client,return -ENOMEM ; data =iio_priv (indio_dev); -i2c_set_clientdata (client, indio_dev); +dev_set_drvdata (&client->dev, indio_dev); data->dev = &client->dev; ret =bmg160_chip_init (data);
@@ -1156,7 +1156,7 @@ static int bmg160_remove(struct i2c_client *client)#ifdef CONFIG_PM_SLEEP static int bmg160_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 bmg160_data *data =iio_priv (indio_dev);mutex_lock (&data->mutex);
@@ -1168,7 +1168,7 @@ static int bmg160_suspend(struct device *dev)static int bmg160_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 bmg160_data *data =iio_priv (indio_dev);mutex_lock (&data->mutex);
@@ -1184,7 +1184,7 @@ static int bmg160_resume(struct device *dev)#ifdef CONFIG_PM static int bmg160_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 bmg160_data *data =iio_priv (indio_dev);int ret;
@@ -1199,7 +1199,7 @@ static int bmg160_runtime_suspend(struct device *dev)static int bmg160_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 bmg160_data *data =iio_priv (indio_dev);int ret;
Signature · 1 line
2.1.4
PATCH 5/7 iio: bmg160: Remove remaining uses of i2c_client
In reply to Markus Pargmann--- drivers/iio/gyro/bmg160.c | 55 +++++++++++++++++++++++------------------------ 1 file changed, 27 insertions(+), 28 deletions(-)
drivers/iio/gyro/bmg160.c +27 -28
@@ -110,6 +110,7 @@ struct bmg160_data {int slope_thres;bool dready_trigger_on;bool motion_trigger_on; +int irq; };enum bmg160_axis {
@@ -963,18 +964,14 @@ static const struct iio_buffer_setup_ops bmg160_buffer_setup_ops = { .postdisable = bmg160_buffer_postdisable, }; -static int bmg160_gpio_probe (struct i2c_client *client, -struct bmg160_data *data) +static int bmg160_gpio_probe (struct bmg160_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,BMG160_GPIO_NAME ,0 ,GPIOD_IN );
@@ -983,11 +980,11 @@ static int bmg160_gpio_probe(struct i2c_client *client,return PTR_ERR (gpio); } - ret =gpiod_to_irq (gpio); + data->irq =gpiod_to_irq (gpio);dev_dbg (dev,"GPIO resource, no:%d irq:%d\n" ,desc_to_gpio (gpio), ret); -return ret; +return 0 ; }static const char *bmg160_match_acpi_device (struct device *dev)
@@ -1009,6 +1006,7 @@ static int bmg160_probe(struct i2c_client *client,int ret;const char *name =NULL ;struct regmap *regmap; +struct device *dev = &client->dev; regmap =devm_regmap_init_i2c (client, &bmg160_regmap_i2c_conf);if (IS_ERR (regmap)) {
@@ -1022,8 +1020,9 @@ static int bmg160_probe(struct i2c_client *client,return -ENOMEM ; data =iio_priv (indio_dev); -dev_set_drvdata (&client->dev, indio_dev); - data->dev = &client->dev; +dev_set_drvdata (dev, indio_dev); + data->dev = dev; + data->irq = client->irq; ret =bmg160_chip_init (data);if (ret <0 )
@@ -1034,22 +1033,22 @@ static int bmg160_probe(struct i2c_client *client,if (id) name = id->name; -if (ACPI_HANDLE (&client->dev)) - name =bmg160_match_acpi_device (&client->dev); +if (ACPI_HANDLE (dev)) + name =bmg160_match_acpi_device (dev); - indio_dev->dev.parent = &client->dev; + indio_dev->dev.parent = dev; indio_dev->channels = bmg160_channels; indio_dev->num_channels =ARRAY_SIZE (bmg160_channels); indio_dev->name = name; indio_dev->modes =INDIO_DIRECT_MODE ; indio_dev->info = &bmg160_info; -if (client->irq <=0 ) - client->irq =bmg160_gpio_probe (client, data); +if (data->irq <=0 ) +bmg160_gpio_probe (data); -if (client->irq >0 ) { - ret = devm_request_threaded_irq(&client->dev, - client->irq, +if (data->irq >0 ) { + ret = devm_request_threaded_irq(dev, + data->irq, bmg160_data_rdy_trig_poll, bmg160_event_handler, IRQF_TRIGGER_RISING,
@@ -1058,28 +1057,28 @@ static int bmg160_probe(struct i2c_client *client,if (ret)return ret; - data->dready_trig =devm_iio_trigger_alloc (&client->dev, + data->dready_trig =devm_iio_trigger_alloc (dev,"%s-dev%d" , indio_dev->name, indio_dev->id);if (!data->dready_trig)return -ENOMEM ; - data->motion_trig =devm_iio_trigger_alloc (&client->dev, + data->motion_trig =devm_iio_trigger_alloc (dev,"%s-any-motion-dev%d" , indio_dev->name, indio_dev->id);if (!data->motion_trig)return -ENOMEM ; - data->dready_trig->dev.parent = &client->dev; + data->dready_trig->dev.parent = dev; data->dready_trig->ops = &bmg160_trigger_ops;iio_trigger_set_drvdata (data->dready_trig, indio_dev); ret =iio_trigger_register (data->dready_trig);if (ret)return ret; - data->motion_trig->dev.parent = &client->dev; + data->motion_trig->dev.parent = dev; data->motion_trig->ops = &bmg160_trigger_ops;iio_trigger_set_drvdata (data->motion_trig, indio_dev); ret =iio_trigger_register (data->motion_trig);
@@ -1094,25 +1093,25 @@ static int bmg160_probe(struct i2c_client *client, bmg160_trigger_handler, &bmg160_buffer_setup_ops);if (ret <0 ) { -dev_err (&client->dev, +dev_err (dev,"iio triggered buffer setup failed\n" ); goto err_trigger_unregister; } ret =iio_device_register (indio_dev);if (ret <0 ) { -dev_err (&client->dev,"unable to register iio device\n" ); +dev_err (dev,"unable to register iio device\n" ); goto err_buffer_cleanup; } - 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, +pm_runtime_enable (dev); +pm_runtime_set_autosuspend_delay (dev,BMG160_AUTO_SUSPEND_DELAY_MS ); -pm_runtime_use_autosuspend (&client->dev); +pm_runtime_use_autosuspend (dev);return 0 ;
Signature · 1 line
2.1.4
PATCH 6/7 iio: bmg160: Separate i2c and core driver
In reply to Markus PargmannThis patch separates the core driver using regmap and the i2c driver which creates the i2c regmap. Also in the Kconfig file BMG160 and BMG160_I2C are separate now.
---
drivers/iio/gyro/Kconfig | 18 +++++--
drivers/iio/gyro/Makefile | 3 +-
drivers/iio/gyro/bmg160.h | 10 ++++
drivers/iio/gyro/{bmg160.c => bmg160_core.c} | 77 ++++------------------------
drivers/iio/gyro/bmg160_i2c.c | 73 ++++++++++++++++++++++++++
5 files changed, 111 insertions(+), 70 deletions(-)
create mode 100644 drivers/iio/gyro/bmg160.h
rename drivers/iio/gyro/{bmg160.c => bmg160_core.c} (94%)
create mode 100644 drivers/iio/gyro/bmg160_i2c.cdrivers/iio/gyro/Kconfig +15 -3
@@ -51,16 +51,28 @@ config ADXRS450 will be called adxrs450. config BMG160 - tristate "BOSCH BMG160 Gyro Sensor" - depends on I2C + bool "BOSCH BMG160 Gyro Sensor" select IIO_BUFFER select IIO_TRIGGERED_BUFFER + select REGMAP help Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor driver. This driver also supports BMI055 gyroscope. +if BMG160 + +config BMG160_I2C + tristate "Driver for connection via I2C" + depends on I2C + select REGMAP_I2C + help + Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor + driver connected via I2C. This driver also supports BMI055 gyroscope. + This driver can also be built as a module. If so, the module - will be called bmg160. + will be called bmg160_i2c. + +endif config HID_SENSOR_GYRO_3D depends on HID_SENSOR_HUB
drivers/iio/gyro/Makefile +2 -1
@@ -8,7 +8,8 @@ obj-$(CONFIG_ADIS16130) += adis16130.o obj-$(CONFIG_ADIS16136) += adis16136.o obj-$(CONFIG_ADIS16260) += adis16260.o obj-$(CONFIG_ADXRS450) += adxrs450.o -obj-$(CONFIG_BMG160) += bmg160.o +obj-$(CONFIG_BMG160) += bmg160_core.o +obj-$(CONFIG_BMG160_I2C) += bmg160_i2c.o obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
drivers/iio/gyro/bmg160.h new file +10 -0
@@ -0,0 +1,10 @@ +#ifndef BMG160_H_ +#define BMG160_H_ + +extern const struct dev_pm_ops bmg160_pm_ops; + +int bmg160_core_probe (struct device *dev,struct regmap *regmap,int irq, +const char *name); +void bmg160_core_remove (struct device *dev); + +#endif /* BMG160_H_ */
drivers/iio/gyro/bmg160_core.c renamed from drivers/iio/gyro/bmg160.c +11 -66
141 lines not on this page · raw message
drivers/iio/gyro/bmg160_i2c.c new file +73 -0
73 lines not on this page · raw message
Signature · 1 line
2.1.4
PATCH 7/7 iio: bmg160: Add SPI driver
In reply to Markus Pargmann--- drivers/iio/gyro/Kconfig | 11 ++++++++ drivers/iio/gyro/Makefile | 1 + drivers/iio/gyro/bmg160_spi.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 drivers/iio/gyro/bmg160_spi.c
drivers/iio/gyro/Kconfig +11 -0
@@ -72,6 +72,17 @@ config BMG160_I2C This driver can also be built as a module. If so, the module will be called bmg160_i2c. +config BMG160_SPI + tristate "Driver for connection via SPI" + depends on SPI + select REGMAP_SPI + help + Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor + driver connected via SPI. This driver also supports BMI055 gyroscope. + + This driver can also be built as a module. If so, the module + will be called bmg160_spi. + endif config HID_SENSOR_GYRO_3D
drivers/iio/gyro/Makefile +1 -0
@@ -10,6 +10,7 @@ obj-$(CONFIG_ADIS16260) += adis16260.o obj-$(CONFIG_ADXRS450) += adxrs450.o obj-$(CONFIG_BMG160) += bmg160_core.o obj-$(CONFIG_BMG160_I2C) += bmg160_i2c.o +obj-$(CONFIG_BMG160_SPI) += bmg160_spi.o obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.o
drivers/iio/gyro/bmg160_spi.c new file +59 -0
59 lines not on this page · raw message
Signature · 1 line
2.1.4
Re: [PATCH 7/7] iio: bmg160: Add SPI driver
Quoted 66 lines · Markus Pargmann
Signed-off-by Markus Pargmann <[email protected]>--- drivers/iio/gyro/Kconfig | 11 ++++++++ drivers/iio/gyro/Makefile | 1 + drivers/iio/gyro/bmg160_spi.c | 59 +++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 drivers/iio/gyro/bmg160_spi.cdrivers/iio/gyro/Kconfig +11
-0@@ -72,6 +72,17 @@ config BMG160_I2C This driver can also be built as a module. If so, the module will be called bmg160_i2c. +config BMG160_SPI + tristate "Driver for connection via SPI" + depends on SPI + select REGMAP_SPI + help + Say yes here to build support for Bosch BMG160 Tri-axis Gyro Sensor + driver connected via SPI. This driver also supports BMI055 gyroscope. + + This driver can also be built as a module. If so, the module + will be called bmg160_spi. + endif config HID_SENSOR_GYRO_3Ddrivers/iio/gyro/Makefile +1
-0@@ -10,6 +10,7 @@ obj-$(CONFIG_ADIS16260) += adis16260.o obj-$(CONFIG_ADXRS450) += adxrs450.o obj-$(CONFIG_BMG160) += bmg160_core.o obj-$(CONFIG_BMG160_I2C) += bmg160_i2c.o +obj-$(CONFIG_BMG160_SPI) += bmg160_spi.o obj-$(CONFIG_HID_SENSOR_GYRO_3D) += hid-sensor-gyro-3d.odrivers/iio/gyro/bmg160_spi.c new file +18
-0@@ -0,0 +1,59 @@ +#include <linux/spi/spi.h> +#include <linux/regmap.h> +#include <linux/iio/iio.h> +#include <linux/module.h> + +#include <bmg160.h> + +struct regmap_config bmg160_regmap_conf = { + .reg_bits =8 , + .val_bits =8 , + .read_flag_mask =0x80 , + + .use_single_rw = true, + .cache_type =REGCACHE_NONE , +}; + +static int bmg160_spi_probe (struct spi_device *spi) +{
drivers/iio/gyro/bmg160_spi.c line 28
Quoted 10 lines
drivers/iio/gyro/bmg160_spi.c new file +10
-0+struct regmap *regmap; + + regmap =devm_regmap_init_spi (spi, &bmg160_regmap_conf); +if (IS_ERR (regmap)) { +dev_err (&spi->dev,"Failed to register spi regmap %d\n" , + (int )PTR_ERR (regmap)); +return PTR_ERR (regmap); + } + +return bmg160_core_probe (&spi->dev, regmap, spi->irq,NULL );
This call should use spi_id->name instead of NULL. Will fix it.
Best regards,
Markus
Quoted 35 lines
drivers/iio/gyro/bmg160_spi.c new file +31
-0+} + +static int bmg160_spi_remove (struct spi_device *spi) +{ +bmg160_core_remove (&spi->dev); + +return 0 ; +} + +static const struct spi_device_id bmg160_spi_id[] = { + {"bmg160" ,0 }, + {"bmi055_gyro" ,0 }, + {} +}; + +MODULE_DEVICE_TABLE (spi, bmg160_spi_id); + +static struct spi_driver bmg160_spi_driver = { + .driver = { + .name ="bmg160_spi" , + .pm = &bmg160_pm_ops, + }, + .probe = bmg160_spi_probe, + .remove = bmg160_spi_remove, + .id_table = bmg160_spi_id, +}; +module_spi_driver (bmg160_spi_driver); + +MODULE_AUTHOR ("Markus Pargmann <[email protected]>" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_DESCRIPTION ("BMG160 SPI Gyro driver" );Signature · 1 line
2.1.4
Signature · 4 lines
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 |