From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F06FBC76191 for ; Mon, 15 Jul 2019 21:10:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA8C721738 for ; Mon, 15 Jul 2019 21:10:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563225040; bh=40JJiUweQFOeMZDBxx7FG3uP5jQxn9tup+JwjBm+hOs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=uhEctSL5tJ9faTO5nnIArlQXqcWLUVHoSfwZsYTcioSi4Zl5rLTdSEBMlXq3j88rc 59kfy5szaZ2quV/Dp+QNjTwp3V7dcJg1345D3mkXo+q6XSXnjj5qHDT7c6aVMCfuw4 aBDkweuBMfImP34GqiuL9HdswjUUJOlVYXR5X3OA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731109AbfGOVKk (ORCPT ); Mon, 15 Jul 2019 17:10:40 -0400 Received: from mail.kernel.org ([198.145.29.99]:42166 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731086AbfGOVKk (ORCPT ); Mon, 15 Jul 2019 17:10:40 -0400 Received: from localhost.localdomain (unknown [151.66.36.246]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AA45220665; Mon, 15 Jul 2019 21:10:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563225039; bh=40JJiUweQFOeMZDBxx7FG3uP5jQxn9tup+JwjBm+hOs=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=WB4omZOKb67esl0ptkrd/csCpistQspeJL/2lBP9vQDHUEl8eYubtNGREwO5o28u0 S9v//QPxn42CpBUBEVm9B834fWOMqe0TB44xd9APr8sNAxpEjECjL3O2+4Juj34nUz AnZgH8OgdDREo224HE+8a0abtRnASm9qznipTO7c= Date: Mon, 15 Jul 2019 23:10:33 +0200 From: Lorenzo Bianconi To: Martin Kepplinger Cc: lorenzo.bianconi83@gmail.com, jic23@kernel.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-iio@vger.kernel.org, devicetree@vger.kernel.org Subject: Re: [PATCH 1/3] iio: imu: st_lsm6sdx: move some register definitions to sensor_settings struct Message-ID: <20190715211033.GA23126@localhost.localdomain> References: <20190715131919.31938-1-martin.kepplinger@puri.sm> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="XsQoSWH+UP9D9v3l" Content-Disposition: inline In-Reply-To: <20190715131919.31938-1-martin.kepplinger@puri.sm> User-Agent: Mutt/1.12.0 (2019-05-25) Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org --XsQoSWH+UP9D9v3l Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable > Move some register definitions to the per-device array of struct > st_lsm6dsx_sensor_settings in order to simplify adding new sensor > devices to the driver. >=20 > Also, remove completely unused register definitions. >=20 Hi Martin, just few comments inline Regards, Lorenzo > Signed-off-by: Martin Kepplinger > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 6 ++++ > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 31 ++++++++++++++------ > 2 files changed, 28 insertions(+), 9 deletions(-) >=20 > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h b/drivers/iio/imu/st= _lsm6dsx/st_lsm6dsx.h > index c14bf533b66b..f072ac14f213 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h > @@ -196,6 +196,9 @@ struct st_lsm6dsx_ext_dev_settings { > /** > * struct st_lsm6dsx_settings - ST IMU sensor settings > * @wai: Sensor WhoAmI default value. > + * @reg_int1_addr: Control Register address for INT1 > + * @reg_int2_addr: Control Register address for INT2 > + * @reg_reset_addr: register address for reset/reboot > * @max_fifo_size: Sensor max fifo length in FIFO words. > * @id: List of hw id/device name supported by the driver configuration. > * @decimator: List of decimator register info (addr + mask). > @@ -206,6 +209,9 @@ struct st_lsm6dsx_ext_dev_settings { > */ > struct st_lsm6dsx_settings { > u8 wai; > + u8 reg_int1_addr; > + u8 reg_int2_addr; > + u8 reg_reset_addr; could you please rename them in int1_addr, int2_addr and reset_addr in orde= r to be inline with other st_lsm6dsx_settings fields? > u16 max_fifo_size; > struct { > enum st_lsm6dsx_hw_id hw_id; > diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c b/drivers/iio/i= mu/st_lsm6dsx/st_lsm6dsx_core.c > index a6702a74570e..7a4fe70a8f20 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c > @@ -49,17 +49,12 @@ > =20 > #include "st_lsm6dsx.h" > =20 > -#define ST_LSM6DSX_REG_INT1_ADDR 0x0d > -#define ST_LSM6DSX_REG_INT2_ADDR 0x0e > #define ST_LSM6DSX_REG_FIFO_FTH_IRQ_MASK BIT(3) > #define ST_LSM6DSX_REG_WHOAMI_ADDR 0x0f > -#define ST_LSM6DSX_REG_RESET_ADDR 0x12 > #define ST_LSM6DSX_REG_RESET_MASK BIT(0) > #define ST_LSM6DSX_REG_BOOT_MASK BIT(7) > #define ST_LSM6DSX_REG_BDU_ADDR 0x12 > #define ST_LSM6DSX_REG_BDU_MASK BIT(6) > -#define ST_LSM6DSX_REG_INT2_ON_INT1_ADDR 0x13 > -#define ST_LSM6DSX_REG_INT2_ON_INT1_MASK BIT(5) > =20 > #define ST_LSM6DSX_REG_ACC_OUT_X_L_ADDR 0x28 > #define ST_LSM6DSX_REG_ACC_OUT_Y_L_ADDR 0x2a > @@ -122,6 +117,9 @@ static const struct st_lsm6dsx_fs_table_entry st_lsm6= dsx_fs_table[] =3D { > static const struct st_lsm6dsx_settings st_lsm6dsx_sensor_settings[] =3D= { > { > .wai =3D 0x69, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 1365, > .id =3D { > { > @@ -172,6 +170,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > }, > { > .wai =3D 0x69, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 682, > .id =3D { > { > @@ -222,6 +223,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > }, > { > .wai =3D 0x6a, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 682, > .id =3D { > { > @@ -278,6 +282,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > }, > { > .wai =3D 0x6c, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 512, > .id =3D { > { > @@ -349,6 +356,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > }, > { > .wai =3D 0x6b, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 512, > .id =3D { > { > @@ -391,6 +401,9 @@ static const struct st_lsm6dsx_settings st_lsm6dsx_se= nsor_settings[] =3D { > }, > { > .wai =3D 0x6b, > + .reg_int1_addr =3D 0x0d, > + .reg_int2_addr =3D 0x0e, > + .reg_reset_addr =3D 0x12, > .max_fifo_size =3D 512, > .id =3D { > { > @@ -873,10 +886,10 @@ static int st_lsm6dsx_get_drdy_reg(struct st_lsm6ds= x_hw *hw, u8 *drdy_reg) > =20 > switch (drdy_pin) { > case 1: > - *drdy_reg =3D ST_LSM6DSX_REG_INT1_ADDR; > + *drdy_reg =3D hw->settings->reg_int1_addr; > break; > case 2: > - *drdy_reg =3D ST_LSM6DSX_REG_INT2_ADDR; > + *drdy_reg =3D hw->settings->reg_int2_addr; > break; > default: > dev_err(hw->dev, "unsupported data ready pin\n"); > @@ -976,7 +989,7 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_h= w *hw) > int err; > =20 > /* device sw reset */ > - err =3D regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_RESET_ADDR, > + err =3D regmap_update_bits(hw->regmap, hw->settings->reg_reset_addr, > ST_LSM6DSX_REG_RESET_MASK, > FIELD_PREP(ST_LSM6DSX_REG_RESET_MASK, 1)); > if (err < 0) > @@ -985,7 +998,7 @@ static int st_lsm6dsx_init_device(struct st_lsm6dsx_h= w *hw) > msleep(50); > =20 > /* reload trimming parameter */ > - err =3D regmap_update_bits(hw->regmap, ST_LSM6DSX_REG_RESET_ADDR, > + err =3D regmap_update_bits(hw->regmap, hw->settings->reg_reset_addr, > ST_LSM6DSX_REG_BOOT_MASK, > FIELD_PREP(ST_LSM6DSX_REG_BOOT_MASK, 1)); > if (err < 0) > --=20 > 2.20.1 >=20 --XsQoSWH+UP9D9v3l Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iHUEABYIAB0WIQTquNwa3Txd3rGGn7Y6cBh0uS2trAUCXSzrxgAKCRA6cBh0uS2t rNs4AP9UHVjNZwyG6Wu4qCyOA8fMZ+EywxHf/SJRkN7D+ugvIAEAyNJYf5rK+G8B Do3CM/eJdpiEJXrrLGRCtOXJINrhbAE= =CqjW -----END PGP SIGNATURE----- --XsQoSWH+UP9D9v3l--