Skip to content

L
linux
Commit 7e906103 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Jonathan Cameron
Browse files
Options

iio: imu: st_lsm6dsx: move irq related definitions in irq_config 

Group irq related definition in irq_config structure in
st_lsm6dsx_settings. This is a preliminary patch to move
OpenDrain/Active low registers in st_lsm6dsx_settings.
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Tested-by: default avatarSean Nyekjaer <sean@geanix.com>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent a912ee4c
Show whitespace changes
Inline Side-by-side
Showing with 179 additions and 108 deletions
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
View file @ 7e906103
...@@ -238,29 +238,21 @@ struct st_lsm6dsx_ext_dev_settings { ...@@ -238,29 +238,21 @@ struct st_lsm6dsx_ext_dev_settings {
/** /**
* struct st_lsm6dsx_settings - ST IMU sensor settings * struct st_lsm6dsx_settings - ST IMU sensor settings
* @wai: Sensor WhoAmI default value. * @wai: Sensor WhoAmI default value.
* @int1_addr: Control Register address for INT1
* @int2_addr: Control Register address for INT2
* @reset_addr: register address for reset/reboot * @reset_addr: register address for reset/reboot
* @max_fifo_size: Sensor max fifo length in FIFO words. * @max_fifo_size: Sensor max fifo length in FIFO words.
* @id: List of hw id/device name supported by the driver configuration. * @id: List of hw id/device name supported by the driver configuration.
* @channels: IIO channels supported by the device. * @channels: IIO channels supported by the device.
* @irq_config: interrupts related registers.
* @odr_table: Hw sensors odr table (Hz + val). * @odr_table: Hw sensors odr table (Hz + val).
* @fs_table: Hw sensors gain table (gain + val). * @fs_table: Hw sensors gain table (gain + val).
* @decimator: List of decimator register info (addr + mask). * @decimator: List of decimator register info (addr + mask).
* @batch: List of FIFO batching register info (addr + mask). * @batch: List of FIFO batching register info (addr + mask).
* @lir: Latched interrupt register info (addr + mask).
* @clear_on_read: Clear on read register info (addr + mask).
* @fifo_ops: Sensor hw FIFO parameters. * @fifo_ops: Sensor hw FIFO parameters.
* @ts_settings: Hw timer related settings. * @ts_settings: Hw timer related settings.
* @shub_settings: i2c controller related settings. * @shub_settings: i2c controller related settings.
*/ */
struct st_lsm6dsx_settings { struct st_lsm6dsx_settings {
u8 wai; u8 wai;
u8 int1_addr;
u8 int2_addr;
u8 int1_func_addr;
u8 int2_func_addr;
u8 int_func_mask;
u8 reset_addr; u8 reset_addr;
u16 max_fifo_size; u16 max_fifo_size;
struct { struct {
...@@ -271,12 +263,18 @@ struct st_lsm6dsx_settings { ...@@ -271,12 +263,18 @@ struct st_lsm6dsx_settings {
const struct iio_chan_spec *chan; const struct iio_chan_spec *chan;
int len; int len;
} channels[2]; } channels[2];
struct {
struct st_lsm6dsx_reg irq1;
struct st_lsm6dsx_reg irq2;
struct st_lsm6dsx_reg irq1_func;
struct st_lsm6dsx_reg irq2_func;
struct st_lsm6dsx_reg lir;
struct st_lsm6dsx_reg clear_on_read;
} irq_config;
struct st_lsm6dsx_odr_table_entry odr_table[2]; struct st_lsm6dsx_odr_table_entry odr_table[2];
struct st_lsm6dsx_fs_table_entry fs_table[2]; struct st_lsm6dsx_fs_table_entry fs_table[2];
struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID]; struct st_lsm6dsx_reg decimator[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID]; struct st_lsm6dsx_reg batch[ST_LSM6DSX_MAX_ID];
struct st_lsm6dsx_reg lir;
struct st_lsm6dsx_reg clear_on_read;
struct st_lsm6dsx_fifo_ops fifo_ops; struct st_lsm6dsx_fifo_ops fifo_ops;
struct st_lsm6dsx_hw_ts_settings ts_settings; struct st_lsm6dsx_hw_ts_settings ts_settings;
struct st_lsm6dsx_shub_settings shub_settings; struct st_lsm6dsx_shub_settings shub_settings;
...@@ -361,9 +359,9 @@ struct st_lsm6dsx_hw { ...@@ -361,9 +359,9 @@ struct st_lsm6dsx_hw {
u8 ts_sip; u8 ts_sip;
u8 sip; u8 sip;
const struct st_lsm6dsx_reg *irq_routing;
u8 event_threshold; u8 event_threshold;
u8 enable_event; u8 enable_event;
struct st_lsm6dsx_reg irq_routing;
u8 *buff; u8 *buff;
......
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
View file @ 7e906103
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
#include "st_lsm6dsx.h" #include "st_lsm6dsx.h"
#define ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK BIT(3)
#define ST_LSM6DSX_REG_WHOAMI_ADDR 0x0f #define ST_LSM6DSX_REG_WHOAMI_ADDR 0x0f
#define ST_LSM6DSX_REG_RESET_MASK BIT(0) #define ST_LSM6DSX_REG_RESET_MASK BIT(0)
#define ST_LSM6DSX_REG_BOOT_MASK BIT(7) #define ST_LSM6DSX_REG_BOOT_MASK BIT(7)
...@@ -97,8 +96,6 @@ static const struct iio_chan_spec st_lsm6ds0_gyro_channels[] = { ...@@ -97,8 +96,6 @@ static const struct iio_chan_spec st_lsm6ds0_gyro_channels[] = {
static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
{ {
.wai = 0x68, .wai = 0x68,
.int1_addr = 0x0c,
.int2_addr = 0x0d,
.reset_addr = 0x22, .reset_addr = 0x22,
.max_fifo_size = 32, .max_fifo_size = 32,
.id = { .id = {
...@@ -166,14 +163,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -166,14 +163,19 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 3, .fs_len = 3,
}, },
}, },
.irq_config = {
.irq1 = {
.addr = 0x0c,
.mask = BIT(3),
},
.irq2 = {
.addr = 0x0d,
.mask = BIT(3),
},
},
}, },
{ {
.wai = 0x69, .wai = 0x69,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.int1_func_addr = 0x5e,
.int2_func_addr = 0x5f,
.int_func_mask = BIT(5),
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 1365, .max_fifo_size = 1365,
.id = { .id = {
...@@ -242,6 +244,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -242,6 +244,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.irq_config = {
.irq1 = {
.addr = 0x0d,
.mask = BIT(3),
},
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
},
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.irq1_func = {
.addr = 0x5e,
.mask = BIT(5),
},
.irq2_func = {
.addr = 0x5f,
.mask = BIT(5),
},
},
.decimator = { .decimator = {
[ST_LSM6DSX_ID_ACC] = { [ST_LSM6DSX_ID_ACC] = {
.addr = 0x08, .addr = 0x08,
...@@ -252,10 +276,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -252,10 +276,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.mask = GENMASK(5, 3), .mask = GENMASK(5, 3),
}, },
}, },
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_fifo, .read_fifo = st_lsm6dsx_read_fifo,
...@@ -301,11 +321,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -301,11 +321,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
}, },
{ {
.wai = 0x69, .wai = 0x69,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.int1_func_addr = 0x5e,
.int2_func_addr = 0x5f,
.int_func_mask = BIT(5),
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 682, .max_fifo_size = 682,
.id = { .id = {
...@@ -374,6 +389,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -374,6 +389,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.irq_config = {
.irq1 = {
.addr = 0x0d,
.mask = BIT(3),
},
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
},
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.irq1_func = {
.addr = 0x5e,
.mask = BIT(5),
},
.irq2_func = {
.addr = 0x5f,
.mask = BIT(5),
},
},
.decimator = { .decimator = {
[ST_LSM6DSX_ID_ACC] = { [ST_LSM6DSX_ID_ACC] = {
.addr = 0x08, .addr = 0x08,
...@@ -384,10 +421,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -384,10 +421,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.mask = GENMASK(5, 3), .mask = GENMASK(5, 3),
}, },
}, },
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_fifo, .read_fifo = st_lsm6dsx_read_fifo,
...@@ -433,11 +466,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -433,11 +466,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
}, },
{ {
.wai = 0x6a, .wai = 0x6a,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.int1_func_addr = 0x5e,
.int2_func_addr = 0x5f,
.int_func_mask = BIT(5),
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 682, .max_fifo_size = 682,
.id = { .id = {
...@@ -515,6 +543,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -515,6 +543,28 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.irq_config = {
.irq1 = {
.addr = 0x0d,
.mask = BIT(3),
},
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
},
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.irq1_func = {
.addr = 0x5e,
.mask = BIT(5),
},
.irq2_func = {
.addr = 0x5f,
.mask = BIT(5),
},
},
.decimator = { .decimator = {
[ST_LSM6DSX_ID_ACC] = { [ST_LSM6DSX_ID_ACC] = {
.addr = 0x08, .addr = 0x08,
...@@ -525,10 +575,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -525,10 +575,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.mask = GENMASK(5, 3), .mask = GENMASK(5, 3),
}, },
}, },
.lir = {
.addr = 0x58,
.mask = BIT(0),
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_fifo, .read_fifo = st_lsm6dsx_read_fifo,
...@@ -578,8 +624,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -578,8 +624,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
}, },
{ {
.wai = 0x6c, .wai = 0x6c,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 512, .max_fifo_size = 512,
.id = { .id = {
...@@ -651,15 +695,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -651,15 +695,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.batch = { .irq_config = {
[ST_LSM6DSX_ID_ACC] = { .irq1 = {
.addr = 0x09, .addr = 0x0d,
.mask = GENMASK(3, 0), .mask = BIT(3),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
}, },
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
}, },
.lir = { .lir = {
.addr = 0x56, .addr = 0x56,
...@@ -669,6 +712,17 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -669,6 +712,17 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x56, .addr = 0x56,
.mask = BIT(6), .mask = BIT(6),
}, },
},
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
.mask = GENMASK(3, 0),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
},
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_tagged_fifo, .read_fifo = st_lsm6dsx_read_tagged_fifo,
...@@ -721,11 +775,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -721,11 +775,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
}, },
{ {
.wai = 0x6b, .wai = 0x6b,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.int1_func_addr = 0x5e,
.int2_func_addr = 0x5f,
.int_func_mask = BIT(5),
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 512, .max_fifo_size = 512,
.id = { .id = {
...@@ -794,15 +843,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -794,15 +843,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.batch = { .irq_config = {
[ST_LSM6DSX_ID_ACC] = { .irq1 = {
.addr = 0x09, .addr = 0x0d,
.mask = GENMASK(3, 0), .mask = BIT(3),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
}, },
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
}, },
.lir = { .lir = {
.addr = 0x56, .addr = 0x56,
...@@ -812,6 +860,25 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -812,6 +860,25 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x56, .addr = 0x56,
.mask = BIT(6), .mask = BIT(6),
}, },
.irq1_func = {
.addr = 0x5e,
.mask = BIT(5),
},
.irq2_func = {
.addr = 0x5f,
.mask = BIT(5),
},
},
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
.mask = GENMASK(3, 0),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
},
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_tagged_fifo, .read_fifo = st_lsm6dsx_read_tagged_fifo,
...@@ -853,11 +920,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -853,11 +920,6 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
}, },
{ {
.wai = 0x6b, .wai = 0x6b,
.int1_addr = 0x0d,
.int2_addr = 0x0e,
.int1_func_addr = 0x5e,
.int2_func_addr = 0x5f,
.int_func_mask = BIT(5),
.reset_addr = 0x12, .reset_addr = 0x12,
.max_fifo_size = 512, .max_fifo_size = 512,
.id = { .id = {
...@@ -929,15 +991,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -929,15 +991,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.fs_len = 4, .fs_len = 4,
}, },
}, },
.batch = { .irq_config = {
[ST_LSM6DSX_ID_ACC] = { .irq1 = {
.addr = 0x09, .addr = 0x0d,
.mask = GENMASK(3, 0), .mask = BIT(3),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
}, },
.irq2 = {
.addr = 0x0e,
.mask = BIT(3),
}, },
.lir = { .lir = {
.addr = 0x56, .addr = 0x56,
...@@ -947,6 +1008,25 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = { ...@@ -947,6 +1008,25 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
.addr = 0x56, .addr = 0x56,
.mask = BIT(6), .mask = BIT(6),
}, },
.irq1_func = {
.addr = 0x5e,
.mask = BIT(5),
},
.irq2_func = {
.addr = 0x5f,
.mask = BIT(5),
},
},
.batch = {
[ST_LSM6DSX_ID_ACC] = {
.addr = 0x09,
.mask = GENMASK(3, 0),
},
[ST_LSM6DSX_ID_GYRO] = {
.addr = 0x09,
.mask = GENMASK(7, 4),
},
},
.fifo_ops = { .fifo_ops = {
.update_fifo = st_lsm6dsx_update_fifo, .update_fifo = st_lsm6dsx_update_fifo,
.read_fifo = st_lsm6dsx_read_tagged_fifo, .read_fifo = st_lsm6dsx_read_tagged_fifo,
...@@ -1296,7 +1376,7 @@ static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, int state) ...@@ -1296,7 +1376,7 @@ static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, int state)
int err; int err;
u8 enable = 0; u8 enable = 0;
if (!hw->settings->int1_func_addr) if (!hw->settings->irq_config.irq1_func.addr)
return -ENOTSUPP; return -ENOTSUPP;
enable = state ? hw->settings->event_settings.enable_reg.mask : 0; enable = state ? hw->settings->event_settings.enable_reg.mask : 0;
...@@ -1308,12 +1388,11 @@ static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, int state) ...@@ -1308,12 +1388,11 @@ static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, int state)
if (err < 0) if (err < 0)
return err; return err;
enable = state ? hw->irq_routing.mask : 0; enable = state ? hw->irq_routing->mask : 0;
/* Enable wakeup interrupt */ /* Enable wakeup interrupt */
return regmap_update_bits(hw->regmap, hw->irq_routing.addr, return regmap_update_bits(hw->regmap, hw->irq_routing->addr,
hw->irq_routing.mask, hw->irq_routing->mask, enable);
enable);
} }
static int st_lsm6dsx_read_event(struct iio_dev *iio_dev, static int st_lsm6dsx_read_event(struct iio_dev *iio_dev,
...@@ -1537,7 +1616,9 @@ static int st_lsm6dsx_of_get_drdy_pin(struct st_lsm6dsx_hw *hw, int *drdy_pin) ...@@ -1537,7 +1616,9 @@ static int st_lsm6dsx_of_get_drdy_pin(struct st_lsm6dsx_hw *hw, int *drdy_pin)
return of_property_read_u32(np, "st,drdy-int-pin", drdy_pin); return of_property_read_u32(np, "st,drdy-int-pin", drdy_pin);
} }
static int st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw, u8 *drdy_reg) static int
st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw,
const struct st_lsm6dsx_reg **drdy_reg)
{ {
int err = 0, drdy_pin; int err = 0, drdy_pin;
...@@ -1551,14 +1632,12 @@ static int st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw, u8 *drdy_reg) ...@@ -1551,14 +1632,12 @@ static int st_lsm6dsx_get_drdy_reg(struct st_lsm6dsx_hw *hw, u8 *drdy_reg)
switch (drdy_pin) { switch (drdy_pin) {
case 1: case 1:
*drdy_reg = hw->settings->int1_addr; hw->irq_routing = &hw->settings->irq_config.irq1_func;
hw->irq_routing.addr = hw->settings->int1_func_addr; *drdy_reg = &hw->settings->irq_config.irq1;
hw->irq_routing.mask = hw->settings->int_func_mask;
break; break;
case 2: case 2:
*drdy_reg = hw->settings->int2_addr; hw->irq_routing = &hw->settings->irq_config.irq2_func;
hw->irq_routing.addr = hw->settings->int2_func_addr; *drdy_reg = &hw->settings->irq_config.irq2;
hw->irq_routing.mask = hw->settings->int_func_mask;
break; break;
default: default:
dev_err(hw->dev, "unsupported data ready pin\n"); dev_err(hw->dev, "unsupported data ready pin\n");
...@@ -1654,7 +1733,7 @@ static int st_lsm6dsx_init_hw_timer(struct st_lsm6dsx_hw *hw) ...@@ -1654,7 +1733,7 @@ static int st_lsm6dsx_init_hw_timer(struct st_lsm6dsx_hw *hw)
static int st_lsm6dsx_init_device(struct st_lsm6dsx_hw *hw) static int st_lsm6dsx_init_device(struct st_lsm6dsx_hw *hw)
{ {
u8 drdy_int_reg; const struct st_lsm6dsx_reg *reg;
int err; int err;
/* device sw reset */ /* device sw reset */
...@@ -1683,35 +1762,29 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_hw *hw) ...@@ -1683,35 +1762,29 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_hw *hw)
return err; return err;
/* enable FIFO watermak interrupt */ /* enable FIFO watermak interrupt */
err = st_lsm6dsx_get_drdy_reg(hw, &drdy_int_reg); err = st_lsm6dsx_get_drdy_reg(hw, &reg);
if (err < 0) if (err < 0)
return err; return err;
err = regmap_update_bits(hw->regmap, drdy_int_reg, err = regmap_update_bits(hw->regmap, reg->addr, reg->mask,
ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK, ST_LSM6DSX_SHIFT_VAL(1, reg->mask));
FIELD_PREP(ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK,
1));
if (err < 0) if (err < 0)
return err; return err;
/* enable Latched interrupts for device events */ /* enable Latched interrupts for device events */
if (hw->settings->lir.addr) { if (hw->settings->irq_config.lir.addr) {
unsigned int data; reg = &hw->settings->irq_config.lir;
err = regmap_update_bits(hw->regmap, reg->addr, reg->mask,
data = ST_LSM6DSX_SHIFT_VAL(1, hw->settings->lir.mask); ST_LSM6DSX_SHIFT_VAL(1, reg->mask));
err = regmap_update_bits(hw->regmap, hw->settings->lir.addr,
hw->settings->lir.mask, data);
if (err < 0) if (err < 0)
return err; return err;
/* enable clear on read for latched interrupts */ /* enable clear on read for latched interrupts */
if (hw->settings->clear_on_read.addr) { if (hw->settings->irq_config.clear_on_read.addr) {
data = ST_LSM6DSX_SHIFT_VAL(1, reg = &hw->settings->irq_config.clear_on_read;
hw->settings->clear_on_read.mask);
err = regmap_update_bits(hw->regmap, err = regmap_update_bits(hw->regmap,
hw->settings->clear_on_read.addr, reg->addr, reg->mask,
hw->settings->clear_on_read.mask, ST_LSM6DSX_SHIFT_VAL(1, reg->mask));
data);
if (err < 0) if (err < 0)
return err; return err;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7