From: Jonathan Cameron <jic23@kernel.org>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: linux-iio@vger.kernel.org, sean@geanix.com, martin@geanix.com,
rjones@gateworks.com, lorenzo.bianconi@redhat.com,
devicetree@vger.kernel.org
Subject: Re: [PATCH 04/13] iio: imu: st_lsm6dsx: do not access active-low/open-drain regs if not supported
Date: Sat, 12 Oct 2019 13:14:54 +0100 [thread overview]
Message-ID: <20191012131454.0e0638de@archlinux> (raw)
In-Reply-To: <7db02b38f42c3ca784e463aac2df98cd0d15d21c.1570367532.git.lorenzo@kernel.org>
On Sun, 6 Oct 2019 15:21:58 +0200
Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> Move active low and open drain register definitions in hw_settings
> register map since not all supported sensors (e.g lsm9ds1) rely on the
> same definitions
>
> Fixes: 52f4b1f19679 ("iio: imu: st_lsm6dsx: add support for accel/gyro unit of lsm9ds1")
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Applied on the togreg branch of iio.git and pushed out as testing for
the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +
> drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 79 ++++++++++++++++----
> 2 files changed, 67 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> index 873ec3b8fd69..8e002a51595e 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h
> @@ -268,6 +268,8 @@ struct st_lsm6dsx_settings {
> struct st_lsm6dsx_reg irq2_func;
> struct st_lsm6dsx_reg lir;
> struct st_lsm6dsx_reg clear_on_read;
> + struct st_lsm6dsx_reg hla;
> + struct st_lsm6dsx_reg od;
> } irq_config;
> struct st_lsm6dsx_odr_table_entry odr_table[2];
> struct st_lsm6dsx_fs_table_entry fs_table[2];
> diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> index 23d67caa24ed..a598cc8e9343 100644
> --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
> @@ -67,11 +67,6 @@
> #define ST_LSM6DSX_REG_BDU_ADDR 0x12
> #define ST_LSM6DSX_REG_BDU_MASK BIT(6)
>
> -#define ST_LSM6DSX_REG_HLACTIVE_ADDR 0x12
> -#define ST_LSM6DSX_REG_HLACTIVE_MASK BIT(5)
> -#define ST_LSM6DSX_REG_PP_OD_ADDR 0x12
> -#define ST_LSM6DSX_REG_PP_OD_MASK BIT(4)
> -
> static const struct iio_chan_spec st_lsm6dsx_acc_channels[] = {
> ST_LSM6DSX_CHANNEL_ACC(IIO_ACCEL, 0x28, IIO_MOD_X, 0),
> ST_LSM6DSX_CHANNEL_ACC(IIO_ACCEL, 0x2a, IIO_MOD_Y, 1),
> @@ -170,6 +165,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x0d,
> .mask = BIT(3),
> },
> + .hla = {
> + .addr = 0x22,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x22,
> + .mask = BIT(4),
> + },
> },
> },
> {
> @@ -261,6 +264,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x5f,
> .mask = BIT(5),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -404,6 +415,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x5f,
> .mask = BIT(5),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -556,6 +575,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x5f,
> .mask = BIT(5),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .decimator = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -702,6 +729,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x56,
> .mask = BIT(6),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -856,6 +891,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x5f,
> .mask = BIT(5),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -1002,6 +1045,14 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] = {
> .addr = 0x5f,
> .mask = BIT(5),
> },
> + .hla = {
> + .addr = 0x12,
> + .mask = BIT(5),
> + },
> + .od = {
> + .addr = 0x12,
> + .mask = BIT(4),
> + },
> },
> .batch = {
> [ST_LSM6DSX_ID_ACC] = {
> @@ -1900,8 +1951,9 @@ static irqreturn_t st_lsm6dsx_handler_thread(int irq, void *private)
>
> static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)
> {
> - struct st_sensors_platform_data *pdata;
> struct device_node *np = hw->dev->of_node;
> + struct st_sensors_platform_data *pdata;
> + const struct st_lsm6dsx_reg *reg;
> unsigned long irq_type;
> bool irq_active_low;
> int err;
> @@ -1922,20 +1974,19 @@ static int st_lsm6dsx_irq_setup(struct st_lsm6dsx_hw *hw)
> return -EINVAL;
> }
>
> - err = regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_HLACTIVE_ADDR,
> - ST_LSM6DSX_REG_HLACTIVE_MASK,
> - FIELD_PREP(ST_LSM6DSX_REG_HLACTIVE_MASK,
> - irq_active_low));
> + reg = &hw->settings->irq_config.hla;
> + err = regmap_update_bits(hw->regmap, reg->addr, reg->mask,
> + ST_LSM6DSX_SHIFT_VAL(irq_active_low,
> + reg->mask));
> if (err < 0)
> return err;
>
> pdata = (struct st_sensors_platform_data *)hw->dev->platform_data;
> if ((np && of_property_read_bool(np, "drive-open-drain")) ||
> (pdata && pdata->open_drain)) {
> - err = regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_PP_OD_ADDR,
> - ST_LSM6DSX_REG_PP_OD_MASK,
> - FIELD_PREP(ST_LSM6DSX_REG_PP_OD_MASK,
> - 1));
> + reg = &hw->settings->irq_config.od;
> + err = regmap_update_bits(hw->regmap, reg->addr, reg->mask,
> + ST_LSM6DSX_SHIFT_VAL(1, reg->mask));
> if (err < 0)
> return err;
>
next prev parent reply other threads:[~2019-10-12 12:15 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-06 13:21 [PATCH 00/13] various st_lsm6dsx fixes and missing bits Lorenzo Bianconi
2019-10-06 13:21 ` [PATCH 01/13] iio: imu: st_lsm6dsx: use st_lsm6dsx_read_locked in st_lsm6dsx_report_motion_event Lorenzo Bianconi
2019-10-07 7:54 ` Sean Nyekjaer
2019-10-12 12:08 ` Jonathan Cameron
2019-10-06 13:21 ` [PATCH 02/13] iio: imu: st_lsm6dsx: add sanity check for read_fifo pointer Lorenzo Bianconi
2019-10-06 13:21 ` [PATCH 03/13] iio: imu: st_lsm6dsx: move irq related definitions in irq_config Lorenzo Bianconi
2019-10-07 7:54 ` Sean Nyekjaer
2019-10-12 12:13 ` Jonathan Cameron
2019-10-06 13:21 ` [PATCH 04/13] iio: imu: st_lsm6dsx: do not access active-low/open-drain regs if not supported Lorenzo Bianconi
2019-10-12 12:14 ` Jonathan Cameron [this message]
2019-10-06 13:21 ` [PATCH 05/13] iio: imu: st_lsm6dsx: move bdu/boot and reset register info in hw_settings Lorenzo Bianconi
2019-10-12 12:19 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 06/13] iio: imu: st_lsm6dsx: always check enable_reg in st_lsm6dsx_event_setup Lorenzo Bianconi
2019-10-07 7:55 ` Sean Nyekjaer
2019-10-12 12:21 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 07/13] iio: imu: st_lsm6dsx: rely on st_lsm6dsx_update_bits_locked configuring events Lorenzo Bianconi
2019-10-12 12:22 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 08/13] iio: imu: st_lsm6dsx: grab conf mutex in st_lsm6dsx_write_event_config Lorenzo Bianconi
2019-10-12 12:23 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 09/13] iio: imu: st_lsm6dsx: fix checkpatch warning Lorenzo Bianconi
2019-10-12 12:24 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 10/13] iio: imu: st_lsm6dsx: add wakeup_source in st_sensors_platform_data Lorenzo Bianconi
2019-10-12 12:25 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 11/13] iio: imu: st_lsm6dsx: add missing kernel documenation Lorenzo Bianconi
2019-10-07 7:56 ` Sean Nyekjaer
2019-10-12 12:26 ` Jonathan Cameron
2019-10-06 13:22 ` [PATCH 12/13] dt-bindings: iio: imu: st_lsm6dsx: document missing wakeup-source property Lorenzo Bianconi
2019-10-07 7:56 ` Sean Nyekjaer
2019-10-15 20:34 ` Rob Herring
2019-10-06 13:22 ` [PATCH 13/13] iio: imu: st_lsm6dsx: enable wake-up event for LSM6DSO Lorenzo Bianconi
2019-10-12 12:28 ` Jonathan Cameron
2019-10-12 12:20 ` [PATCH 00/13] various st_lsm6dsx fixes and missing bits Jonathan Cameron
2019-10-12 12:26 ` Lorenzo Bianconi
2019-10-12 13:26 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191012131454.0e0638de@archlinux \
--to=jic23@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=lorenzo@kernel.org \
--cc=martin@geanix.com \
--cc=rjones@gateworks.com \
--cc=sean@geanix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.