From nobody Sat Jun 20 00:55:05 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63854C433F5 for ; Sat, 26 Mar 2022 19:41:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234771AbiCZTne (ORCPT ); Sat, 26 Mar 2022 15:43:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46316 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232156AbiCZTna (ORCPT ); Sat, 26 Mar 2022 15:43:30 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8FB4B171EE9; Sat, 26 Mar 2022 12:41:53 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id m22so10494130pja.0; Sat, 26 Mar 2022 12:41:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2MUvttVDJrqfDquwKrENIil7MJ5lIrh0ddfHwkgcdCU=; b=OxUshMVF0J2GRicRE0VwXbMqn/Uv0RTovqyRQ7iZJ5ldXyDhXvk4kREeQZVXhL7iGT 9x8NT/sKke1qJo+Wdg27rWyZ3zpH+EvpFSLsgZrB9TcE9lHrfgRUiAvIkj6hSkUVqsjW dlOvQjrlwLcyZ48g3GPYOGtp7zi3zhPMyUL8KugrRxX89cFltDbaZIC3XP3AxQcdDys9 GU6pJmgZG6i+AnaUdCEM0ZBEhGcxyzdd+g2eHhagZr/aHQekjv3mjAgiG8wsYYMKWmCF bT2wqem6cQCtCJ73aDhKHkdzSsq9CEx+0o2WQX/rn0yfAn/uVSflFtyUaOMZccGoQ/lp YUBA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=2MUvttVDJrqfDquwKrENIil7MJ5lIrh0ddfHwkgcdCU=; b=jtZauhcxJdCIa6Mx5uBddGzr50rfVfcuvMKntvSM35Zb4t/RQTrpLQtMMmfAZAmvTX C3/2qGu0x3Dq0SjPszyfekA4PFDFWdnKsizkNMbInNKx0Aa1f4eWA579ZPDQYcBaC+hv DYYk0EkzSDZrhfHvX/jk02HdEjluhtP4tMHag+V+lJyXH1CcGCJNkiz1/akUe8+L0US0 6Mwco95klFFtDFepA2X1pQdwAomi14jtBUjHiMFonqUfwwFjQGwx0lYhAyLEDRgxAlbG EIdS3uJMX65hOWb4lOBYVL7FEBW8wuLM7CNCS4eW1SN34e0zAIbfdMMEMYuCmx4sWvoX JTfg== X-Gm-Message-State: AOAM530xrP0N28CXF77yKYPUC0sXhf+GF2++LhyQ2ANG5ft3nBTHyon6 ZQqHqei3POKnE8iVXaTTnpbfsAA0b1rrFnyH X-Google-Smtp-Source: ABdhPJzwL0aLG/LFozEXKZCpc3YUpTiwsoD/EkJPVyuYh88UkHScEPkkQ1AfnKQLe+wuZHkESct5ew== X-Received: by 2002:a17:902:b113:b0:153:1d99:9cc7 with SMTP id q19-20020a170902b11300b001531d999cc7mr18253683plr.6.1648323713024; Sat, 26 Mar 2022 12:41:53 -0700 (PDT) Received: from localhost.localdomain ([116.75.119.161]) by smtp.gmail.com with ESMTPSA id k185-20020a6384c2000000b003821dcd9020sm8778784pgd.27.2022.03.26.12.41.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 12:41:52 -0700 (PDT) From: Jagath Jog J To: dan@dlrobertson.com, jic23@kernel.org, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/5] iio: accel: bma400: Fix the scale min and max macro values Date: Sun, 27 Mar 2022 01:11:42 +0530 Message-Id: <20220326194146.15549-2-jagathjog1996@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220326194146.15549-1-jagathjog1996@gmail.com> References: <20220326194146.15549-1-jagathjog1996@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Changing the scale macro values to match the bma400 sensitivity for 1 LSB of all the available ranges. Signed-off-by: Jagath Jog J --- drivers/iio/accel/bma400.h | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h index c4c8d74155c2..190366debdb3 100644 --- a/drivers/iio/accel/bma400.h +++ b/drivers/iio/accel/bma400.h @@ -83,8 +83,26 @@ #define BMA400_ACC_ODR_MIN_WHOLE_HZ 25 #define BMA400_ACC_ODR_MIN_HZ 12 =20 -#define BMA400_SCALE_MIN 38357 -#define BMA400_SCALE_MAX 306864 +/* BMA400_SCALE_MIN macro value represents m/s^2 for 1 LSB before + * converting to micro values for +-2g range. + * + * For +-2g - 1 LSB =3D 0.976562 milli g =3D 0.009576 m/s^2 + * For +-4g - 1 LSB =3D 1.953125 milli g =3D 0.019153 m/s^2 + * For +-16g - 1 LSB =3D 7.8125 milli g =3D 0.076614 m/s^2 + * + * The raw value which is used to select the different ranges is determined + * by the first bit set position from the scale value, so BMA400_SCALE_MIN + * should be odd. + * + * Scale values for +-2g, +-4g, +-8g and +-16g is populated into bma400_sc= ales + * array by left shifting BMA400_SCALE_MIN. + * eg: + * To select +-2g =3D 9577 << 0 =3D raw value to write is 0. + * To select +-8g =3D 9577 << 2 =3D raw value to write is 2. + * To select +-16g =3D 9677 << 3 =3D raw value to write is 3. + */ +#define BMA400_SCALE_MIN 9577 +#define BMA400_SCALE_MAX 76617 =20 #define BMA400_NUM_REGULATORS 2 #define BMA400_VDD_REGULATOR 0 --=20 2.17.1 From nobody Sat Jun 20 00:55:05 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6A7ADC433EF for ; Sat, 26 Mar 2022 19:42:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232156AbiCZTnh (ORCPT ); Sat, 26 Mar 2022 15:43:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46446 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234760AbiCZTnc (ORCPT ); Sat, 26 Mar 2022 15:43:32 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A16C917336E; Sat, 26 Mar 2022 12:41:55 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id p8so9223955pfh.8; Sat, 26 Mar 2022 12:41:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=lOz/k81bGL8Tczu8yB5iox7Yf6MP1h89omrWGCtVvX8=; b=Oi63NIjN2kqyrrzFBZgWhZ+B2GhbEDum0QFZSBxysfKII2ofJpUxSgTf7WWgHKbQOC uXu3dAf6jXu6dhptb+2st2eCqGnvEzCcm2zEuP94tTCzVJKdtM/aa7eCfLx8oCqVeGQX 5QiAgnO/c3aXyG1boHCszhY9Va9zpIBxPjKLdT0ecj6AGYywRe9zulIjBUzjNDqEtcvK z5bz595mtkUCh2c4Z+pSdG/kgP93lO1CYC+gb1TMmuPFXTNZJCb1beuytCTqN0DB4k0D GTs2UVfULvWhvFrjV8MjsFX5YMMQEoPoRn4B4C8DOLakrwBfuPcigllOuo5fIqaDKj16 5vgw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=lOz/k81bGL8Tczu8yB5iox7Yf6MP1h89omrWGCtVvX8=; b=EC2N6RATKnSRTLLIVBfb5X2bTPDgzvNqJoe5jPxJotozY4KTuHIwxLz6g5JxiF/ZlK bvNfZR46w3XOnAk1JTrthVMBYBXbxxmZ+JDxnbYm3ugLRAxDxzirqcqP0sT2R27muOpS 5Q19VTTPLuOAk66QC7EbYhPqtyV67SCOCEspjbSBQmMwCai4I/7Ykt4eCEzy6mGmpS1/ IzwqVVBRLL9Cj2+Bc70tg9iMNDnJ7FpCVHhXMXGRhbbm8lCZZ1zsJOmYtKvzcuIAEt5p B3hNUFy0xfn58A9Tuegula9vyORPLPlxOE5MkSAaLgK3+69dR1mGLOarSS79CfoBOwNS GkdA== X-Gm-Message-State: AOAM531gvcg2/FLsrofFFu0k6IPPZmL5cNKigsDlSS/PCGjl3gCWcoEf YxB6z+DF1djSh0JhZpQ6/S8= X-Google-Smtp-Source: ABdhPJwOeshXqQ7cuoSzObMGcI8OCgz/z4eqOo9kYNCsv+95c4aVb2ignwez+i2TXzgUkXAD4NoOsA== X-Received: by 2002:a63:924e:0:b0:382:4fa8:e36d with SMTP id s14-20020a63924e000000b003824fa8e36dmr4416052pgn.426.1648323715040; Sat, 26 Mar 2022 12:41:55 -0700 (PDT) Received: from localhost.localdomain ([116.75.119.161]) by smtp.gmail.com with ESMTPSA id k185-20020a6384c2000000b003821dcd9020sm8778784pgd.27.2022.03.26.12.41.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 12:41:54 -0700 (PDT) From: Jagath Jog J To: dan@dlrobertson.com, jic23@kernel.org, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/5] iio: accel: bma400: conversion to device-managed function Date: Sun, 27 Mar 2022 01:11:43 +0530 Message-Id: <20220326194146.15549-3-jagathjog1996@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220326194146.15549-1-jagathjog1996@gmail.com> References: <20220326194146.15549-1-jagathjog1996@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" This is a conversion to device-managed by using devm_iio_device_register inside probe function, now disabling the regulator and putting bma400 to power down via a devm_add_action_or_reset() hook. The dev_set_drvdata() call, bma400_remove() function and hooks in the I2C and SPI driver struct is removed as devm_iio_device_register function is used to automatically unregister on driver detach. Signed-off-by: Jagath Jog J --- drivers/iio/accel/bma400.h | 2 - drivers/iio/accel/bma400_core.c | 77 ++++++++++++++++----------------- drivers/iio/accel/bma400_i2c.c | 8 ---- drivers/iio/accel/bma400_spi.c | 8 ---- 4 files changed, 38 insertions(+), 57 deletions(-) diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h index 190366debdb3..c1b3dbfbd98f 100644 --- a/drivers/iio/accel/bma400.h +++ b/drivers/iio/accel/bma400.h @@ -112,6 +112,4 @@ extern const struct regmap_config bma400_regmap_config; =20 int bma400_probe(struct device *dev, struct regmap *regmap, const char *na= me); =20 -void bma400_remove(struct device *dev); - #endif diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_cor= e.c index fd2647b728d3..dc273381a0a2 100644 --- a/drivers/iio/accel/bma400_core.c +++ b/drivers/iio/accel/bma400_core.c @@ -560,6 +560,26 @@ static void bma400_init_tables(void) } } =20 +static void bma400_regulators_disable(void *data_ptr) +{ + struct bma400_data *data =3D data_ptr; + + regulator_bulk_disable(ARRAY_SIZE(data->regulators), data->regulators); +} + +static void bma400_power_disable(void *data_ptr) +{ + struct bma400_data *data =3D data_ptr; + int ret; + + mutex_lock(&data->mutex); + ret =3D bma400_set_power_mode(data, POWER_MODE_SLEEP); + if (ret) + dev_warn(data->dev, "Failed to put device into sleep mode (%pe)\n", + ERR_PTR(ret)); + mutex_unlock(&data->mutex); +} + static int bma400_init(struct bma400_data *data) { unsigned int val; @@ -569,13 +589,12 @@ static int bma400_init(struct bma400_data *data) ret =3D regmap_read(data->regmap, BMA400_CHIP_ID_REG, &val); if (ret) { dev_err(data->dev, "Failed to read chip id register\n"); - goto out; + return ret; } =20 if (val !=3D BMA400_ID_REG_VAL) { dev_err(data->dev, "Chip ID mismatch\n"); - ret =3D -ENODEV; - goto out; + return -ENODEV; } =20 data->regulators[BMA400_VDD_REGULATOR].supply =3D "vdd"; @@ -589,27 +608,31 @@ static int bma400_init(struct bma400_data *data) "Failed to get regulators: %d\n", ret); =20 - goto out; + return ret; } ret =3D regulator_bulk_enable(ARRAY_SIZE(data->regulators), data->regulators); if (ret) { dev_err(data->dev, "Failed to enable regulators: %d\n", ret); - goto out; + return ret; } =20 + ret =3D devm_add_action_or_reset(data->dev, bma400_regulators_disable, da= ta); + if (ret) + return ret; + ret =3D bma400_get_power_mode(data); if (ret) { dev_err(data->dev, "Failed to get the initial power-mode\n"); - goto err_reg_disable; + return ret; } =20 if (data->power_mode !=3D POWER_MODE_NORMAL) { ret =3D bma400_set_power_mode(data, POWER_MODE_NORMAL); if (ret) { dev_err(data->dev, "Failed to wake up the device\n"); - goto err_reg_disable; + return ret; } /* * TODO: The datasheet waits 1500us here in the example, but @@ -618,19 +641,23 @@ static int bma400_init(struct bma400_data *data) usleep_range(1500, 2000); } =20 + ret =3D devm_add_action_or_reset(data->dev, bma400_power_disable, data); + if (ret) + return ret; + bma400_init_tables(); =20 ret =3D bma400_get_accel_output_data_rate(data); if (ret) - goto err_reg_disable; + return ret; =20 ret =3D bma400_get_accel_oversampling_ratio(data); if (ret) - goto err_reg_disable; + return ret; =20 ret =3D bma400_get_accel_scale(data); if (ret) - goto err_reg_disable; + return ret; =20 /* * Once the interrupt engine is supported we might use the @@ -639,12 +666,6 @@ static int bma400_init(struct bma400_data *data) * channel. */ return regmap_write(data->regmap, BMA400_ACC_CONFIG2_REG, 0x00); - -err_reg_disable: - regulator_bulk_disable(ARRAY_SIZE(data->regulators), - data->regulators); -out: - return ret; } =20 static int bma400_read_raw(struct iio_dev *indio_dev, @@ -822,32 +843,10 @@ int bma400_probe(struct device *dev, struct regmap *r= egmap, const char *name) indio_dev->num_channels =3D ARRAY_SIZE(bma400_channels); indio_dev->modes =3D INDIO_DIRECT_MODE; =20 - dev_set_drvdata(dev, indio_dev); - - return iio_device_register(indio_dev); + return devm_iio_device_register(dev, indio_dev); } EXPORT_SYMBOL(bma400_probe); =20 -void bma400_remove(struct device *dev) -{ - struct iio_dev *indio_dev =3D dev_get_drvdata(dev); - struct bma400_data *data =3D iio_priv(indio_dev); - int ret; - - mutex_lock(&data->mutex); - ret =3D bma400_set_power_mode(data, POWER_MODE_SLEEP); - mutex_unlock(&data->mutex); - - if (ret) - dev_warn(dev, "Failed to put device into sleep mode (%pe)\n", ERR_PTR(re= t)); - - regulator_bulk_disable(ARRAY_SIZE(data->regulators), - data->regulators); - - iio_device_unregister(indio_dev); -} -EXPORT_SYMBOL(bma400_remove); - MODULE_AUTHOR("Dan Robertson "); MODULE_DESCRIPTION("Bosch BMA400 triaxial acceleration sensor core"); MODULE_LICENSE("GPL"); diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c index f50df5310beb..56da06537562 100644 --- a/drivers/iio/accel/bma400_i2c.c +++ b/drivers/iio/accel/bma400_i2c.c @@ -27,13 +27,6 @@ static int bma400_i2c_probe(struct i2c_client *client, return bma400_probe(&client->dev, regmap, id->name); } =20 -static int bma400_i2c_remove(struct i2c_client *client) -{ - bma400_remove(&client->dev); - - return 0; -} - static const struct i2c_device_id bma400_i2c_ids[] =3D { { "bma400", 0 }, { } @@ -52,7 +45,6 @@ static struct i2c_driver bma400_i2c_driver =3D { .of_match_table =3D bma400_of_i2c_match, }, .probe =3D bma400_i2c_probe, - .remove =3D bma400_i2c_remove, .id_table =3D bma400_i2c_ids, }; =20 diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c index 9f622e37477b..96dc9c215401 100644 --- a/drivers/iio/accel/bma400_spi.c +++ b/drivers/iio/accel/bma400_spi.c @@ -87,13 +87,6 @@ static int bma400_spi_probe(struct spi_device *spi) return bma400_probe(&spi->dev, regmap, id->name); } =20 -static int bma400_spi_remove(struct spi_device *spi) -{ - bma400_remove(&spi->dev); - - return 0; -} - static const struct spi_device_id bma400_spi_ids[] =3D { { "bma400", 0 }, { } @@ -112,7 +105,6 @@ static struct spi_driver bma400_spi_driver =3D { .of_match_table =3D bma400_of_spi_match, }, .probe =3D bma400_spi_probe, - .remove =3D bma400_spi_remove, .id_table =3D bma400_spi_ids, }; =20 --=20 2.17.1 From nobody Sat Jun 20 00:55:05 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70AE4C433F5 for ; Sat, 26 Mar 2022 19:42:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234803AbiCZTnk (ORCPT ); Sat, 26 Mar 2022 15:43:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46552 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234772AbiCZTne (ORCPT ); Sat, 26 Mar 2022 15:43:34 -0400 Received: from mail-pl1-x635.google.com (mail-pl1-x635.google.com [IPv6:2607:f8b0:4864:20::635]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C06F3173373; Sat, 26 Mar 2022 12:41:57 -0700 (PDT) Received: by mail-pl1-x635.google.com with SMTP id w8so11451401pll.10; Sat, 26 Mar 2022 12:41:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=G+kfQGcoS7t4Wfq6WTRmsHwcJ9nJ+dj8dGd3GVy/Lg0=; b=omWXM3aQIqgcAUHBaAWpM86M8ipplzUyUqjWRYSVq038m8jb+xt66uUkbXzb/t3/Kr 0kmtSVimmZz86vqTQEGf/2508/uNHHgwGVl3qP5F1V3Y63RlgDDL461RKU4Xa/JWMaP6 W4c90A4KqW2bdaH/N28CVvlp0a4F6UgQcw2/MeyaNU8Pj889Fm34GKChH6R0zOCGYqZr Q/UpY2TvfjMCXwkokfXdMg3u2kRWsA/cXDYLx6tlT7/2STVUA3Q8tePsFGRIRTQge7D/ bjqLHU5QHwJNTl53W40b2RxpCQ45C77g2vAWoHN5yIfYE8fb+eZsVElqdwAJWb2jYbyw WXRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=G+kfQGcoS7t4Wfq6WTRmsHwcJ9nJ+dj8dGd3GVy/Lg0=; b=cfs4vpOfjDOyL/1jgeOpaa+LPThf74dtOifK+G3CqKqoDY1UgjsU0zmFxJxstFT2o7 npjWRd5OjcDOQ+eU8fQeCJX4tvIYpmhyj9RL6cSvdkri7wosyTIUw23AT0NtzTBHh0Rn UfxhsPbaKBfIDVTHAiTNztPSNh6o8Ul3mCAZyel+bqZix0jR8c+FMig6ni7vc7+tCQGX 7TBFbcKwXnfGtcOICc0l3igAPIimSN+92krt1j+1Q7dXZkRW5lsfomnng7FVTzzvOn3p 6TKzqhqgiDgh144R/32nNwQMLdZZZkwuT1lu/SKo9knriCX6PsZUpak3cTflDAV8AvsY fnRQ== X-Gm-Message-State: AOAM532GEb3n0Jb6LB+Bnyu+WgZq9XxgoBO3AHMlizHbzXVv8o1+lc/m 2clh0jXsyzTA+zLgXk/X+UY= X-Google-Smtp-Source: ABdhPJy8U+zkLL/ZYrxAFF4t/H1xWBcAfcLAYmmfdjUNFUMCyfDYo4MbJtL9HHsFYPDJYhyIDr9B4Q== X-Received: by 2002:a17:90b:17c5:b0:1c6:3639:7daf with SMTP id me5-20020a17090b17c500b001c636397dafmr20045005pjb.105.1648323717202; Sat, 26 Mar 2022 12:41:57 -0700 (PDT) Received: from localhost.localdomain ([116.75.119.161]) by smtp.gmail.com with ESMTPSA id k185-20020a6384c2000000b003821dcd9020sm8778784pgd.27.2022.03.26.12.41.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 12:41:56 -0700 (PDT) From: Jagath Jog J To: dan@dlrobertson.com, jic23@kernel.org, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/5] iio: accel: bma400: Add triggered buffer support Date: Sun, 27 Mar 2022 01:11:44 +0530 Message-Id: <20220326194146.15549-4-jagathjog1996@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220326194146.15549-1-jagathjog1996@gmail.com> References: <20220326194146.15549-1-jagathjog1996@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Added trigger buffer support to read continuous acceleration data from device with data ready interrupt which is mapped to INT1 pin. Signed-off-by: Jagath Jog J --- drivers/iio/accel/Kconfig | 2 + drivers/iio/accel/bma400.h | 10 +- drivers/iio/accel/bma400_core.c | 162 ++++++++++++++++++++++++++++++-- drivers/iio/accel/bma400_i2c.c | 2 +- drivers/iio/accel/bma400_spi.c | 2 +- 5 files changed, 168 insertions(+), 10 deletions(-) diff --git a/drivers/iio/accel/Kconfig b/drivers/iio/accel/Kconfig index 49587c992a6d..0eb379578e00 100644 --- a/drivers/iio/accel/Kconfig +++ b/drivers/iio/accel/Kconfig @@ -177,6 +177,8 @@ config BMA220 config BMA400 tristate "Bosch BMA400 3-Axis Accelerometer Driver" select REGMAP + select IIO_BUFFER + select IIO_TRIGGERED_BUFFER select BMA400_I2C if I2C select BMA400_SPI if SPI help diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h index c1b3dbfbd98f..24d2b705343a 100644 --- a/drivers/iio/accel/bma400.h +++ b/drivers/iio/accel/bma400.h @@ -62,6 +62,13 @@ #define BMA400_ACC_CONFIG2_REG 0x1b #define BMA400_CMD_REG 0x7e =20 +/* Interrupt registers */ +#define BMA400_INT_CONFIG0_REG 0x1f +#define BMA400_INT_CONFIG1_REG 0x20 +#define BMA400_INT1_MAP_REG 0x21 +#define BMA400_INT_IO_CTRL_REG 0x24 +#define BMA400_INT_DRDY_MSK BIT(7) + /* Chip ID of BMA 400 devices found in the chip ID register. */ #define BMA400_ID_REG_VAL 0x90 =20 @@ -110,6 +117,7 @@ =20 extern const struct regmap_config bma400_regmap_config; =20 -int bma400_probe(struct device *dev, struct regmap *regmap, const char *na= me); +int bma400_probe(struct device *dev, struct regmap *regmap, int irq, + const char *name); =20 #endif diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_cor= e.c index dc273381a0a2..fa3f4b5f229f 100644 --- a/drivers/iio/accel/bma400_core.c +++ b/drivers/iio/accel/bma400_core.c @@ -11,16 +11,22 @@ * - Create channel for sensor time */ =20 +#include #include #include -#include -#include #include #include #include #include #include =20 +#include +#include +#include +#include +#include +#include + #include "bma400.h" =20 /* @@ -61,6 +67,13 @@ struct bma400_data { struct bma400_sample_freq sample_freq; int oversampling_ratio; int scale; + struct iio_trigger *trig; + /* Correct time stamp alignment */ + struct { + __le16 buff[3]; + u8 temperature; + s64 ts __aligned(8); + } buffer ____cacheline_aligned; }; =20 static bool bma400_is_writable_reg(struct device *dev, unsigned int reg) @@ -152,7 +165,7 @@ static const struct iio_chan_spec_ext_info bma400_ext_i= nfo[] =3D { { } }; =20 -#define BMA400_ACC_CHANNEL(_axis) { \ +#define BMA400_ACC_CHANNEL(_index, _axis) { \ .type =3D IIO_ACCEL, \ .modified =3D 1, \ .channel2 =3D IIO_MOD_##_axis, \ @@ -164,17 +177,32 @@ static const struct iio_chan_spec_ext_info bma400_ext= _info[] =3D { BIT(IIO_CHAN_INFO_SCALE) | \ BIT(IIO_CHAN_INFO_OVERSAMPLING_RATIO), \ .ext_info =3D bma400_ext_info, \ + .scan_index =3D _index, \ + .scan_type =3D { \ + .sign =3D 's', \ + .realbits =3D 12, \ + .storagebits =3D 16, \ + .endianness =3D IIO_LE, \ + }, \ } =20 static const struct iio_chan_spec bma400_channels[] =3D { - BMA400_ACC_CHANNEL(X), - BMA400_ACC_CHANNEL(Y), - BMA400_ACC_CHANNEL(Z), + BMA400_ACC_CHANNEL(0, X), + BMA400_ACC_CHANNEL(1, Y), + BMA400_ACC_CHANNEL(2, Z), { .type =3D IIO_TEMP, .info_mask_separate =3D BIT(IIO_CHAN_INFO_PROCESSED), .info_mask_shared_by_type =3D BIT(IIO_CHAN_INFO_SAMP_FREQ), + .scan_index =3D 3, + .scan_type =3D { + .sign =3D 's', + .realbits =3D 8, + .storagebits =3D 8, + .endianness =3D IIO_LE, + }, }, + IIO_CHAN_SOFT_TIMESTAMP(4), }; =20 static int bma400_get_temp_reg(struct bma400_data *data, int *val, int *va= l2) @@ -659,6 +687,10 @@ static int bma400_init(struct bma400_data *data) if (ret) return ret; =20 + /* Configure INT1 pin to open drain */ + ret =3D regmap_write(data->regmap, BMA400_INT_IO_CTRL_REG, 0x06); + if (ret) + return ret; /* * Once the interrupt engine is supported we might use the * data_src_reg, but for now ensure this is set to the @@ -807,6 +839,33 @@ static int bma400_write_raw_get_fmt(struct iio_dev *in= dio_dev, } } =20 +static int bma400_data_rdy_trigger_set_state(struct iio_trigger *trig, + bool state) +{ + struct iio_dev *indio_dev =3D iio_trigger_get_drvdata(trig); + struct bma400_data *data =3D iio_priv(indio_dev); + int ret; + + ret =3D regmap_update_bits(data->regmap, BMA400_INT_CONFIG0_REG, + BMA400_INT_DRDY_MSK, + FIELD_PREP(BMA400_INT_DRDY_MSK, state)); + if (ret) + return ret; + + ret =3D regmap_update_bits(data->regmap, BMA400_INT1_MAP_REG, + BMA400_INT_DRDY_MSK, + FIELD_PREP(BMA400_INT_DRDY_MSK, state)); + if (ret) + return ret; + + return 0; +} + +static const unsigned long bma400_avail_scan_masks[] =3D { + GENMASK(3, 0), + 0 +}; + static const struct iio_info bma400_info =3D { .read_raw =3D bma400_read_raw, .read_avail =3D bma400_read_avail, @@ -814,7 +873,64 @@ static const struct iio_info bma400_info =3D { .write_raw_get_fmt =3D bma400_write_raw_get_fmt, }; =20 -int bma400_probe(struct device *dev, struct regmap *regmap, const char *na= me) +static const struct iio_trigger_ops bma400_trigger_ops =3D { + .set_trigger_state =3D &bma400_data_rdy_trigger_set_state, + .validate_device =3D &iio_trigger_validate_own_device, +}; + +static irqreturn_t bma400_trigger_handler(int irq, void *p) +{ + struct iio_poll_func *pf =3D p; + struct iio_dev *indio_dev =3D pf->indio_dev; + struct bma400_data *data =3D iio_priv(indio_dev); + int ret, temp; + + mutex_lock(&data->mutex); + + /* bulk read six registers, with the base being the LSB register */ + ret =3D regmap_bulk_read(data->regmap, BMA400_X_AXIS_LSB_REG, + &data->buffer.buff, sizeof(data->buffer.buff)); + mutex_unlock(&data->mutex); + if (ret) + return IRQ_NONE; + + ret =3D regmap_read(data->regmap, BMA400_TEMP_DATA_REG, &temp); + if (ret) + return IRQ_NONE; + + data->buffer.temperature =3D temp; + + iio_push_to_buffers_with_timestamp(indio_dev, &data->buffer, + iio_get_time_ns(indio_dev)); + + iio_trigger_notify_done(indio_dev->trig); + return IRQ_HANDLED; +} + +static irqreturn_t bma400_interrupt(int irq, void *private) +{ + struct iio_dev *indio_dev =3D private; + struct bma400_data *data =3D iio_priv(indio_dev); + irqreturn_t ret =3D IRQ_NONE; + __le16 status; + + mutex_lock(&data->mutex); + ret =3D regmap_bulk_read(data->regmap, BMA400_INT_STAT0_REG, &status, + sizeof(status)); + mutex_unlock(&data->mutex); + if (ret) + return IRQ_NONE; + + if (FIELD_GET(BMA400_INT_DRDY_MSK, le16_to_cpu(status))) { + iio_trigger_poll_chained(data->trig); + ret =3D IRQ_HANDLED; + } + + return ret; +} + +int bma400_probe(struct device *dev, struct regmap *regmap, int irq, + const char *name) { struct iio_dev *indio_dev; struct bma400_data *data; @@ -841,8 +957,40 @@ int bma400_probe(struct device *dev, struct regmap *re= gmap, const char *name) indio_dev->info =3D &bma400_info; indio_dev->channels =3D bma400_channels; indio_dev->num_channels =3D ARRAY_SIZE(bma400_channels); + indio_dev->available_scan_masks =3D bma400_avail_scan_masks; indio_dev->modes =3D INDIO_DIRECT_MODE; =20 + if (irq > 0) { + data->trig =3D devm_iio_trigger_alloc(dev, "%s-dev%d", + indio_dev->name, + iio_device_id(indio_dev)); + if (!data->trig) + return -ENOMEM; + + data->trig->ops =3D &bma400_trigger_ops; + iio_trigger_set_drvdata(data->trig, indio_dev); + + ret =3D devm_iio_trigger_register(data->dev, data->trig); + if (ret) + return dev_err_probe(data->dev, ret, + "iio trigger register fail\n"); + + indio_dev->trig =3D iio_trigger_get(data->trig); + ret =3D devm_request_threaded_irq(dev, irq, NULL, + &bma400_interrupt, + IRQF_TRIGGER_RISING | IRQF_ONESHOT, + indio_dev->name, indio_dev); + if (ret) + return dev_err_probe(data->dev, ret, + "request irq %d failed\n", irq); + } + + ret =3D devm_iio_triggered_buffer_setup(dev, indio_dev, NULL, + &bma400_trigger_handler, NULL); + if (ret) + return dev_err_probe(data->dev, ret, + "iio triggered buffer setup failed\n"); + return devm_iio_device_register(dev, indio_dev); } EXPORT_SYMBOL(bma400_probe); diff --git a/drivers/iio/accel/bma400_i2c.c b/drivers/iio/accel/bma400_i2c.c index 56da06537562..49b0ae13fdc8 100644 --- a/drivers/iio/accel/bma400_i2c.c +++ b/drivers/iio/accel/bma400_i2c.c @@ -24,7 +24,7 @@ static int bma400_i2c_probe(struct i2c_client *client, return PTR_ERR(regmap); } =20 - return bma400_probe(&client->dev, regmap, id->name); + return bma400_probe(&client->dev, regmap, client->irq, id->name); } =20 static const struct i2c_device_id bma400_i2c_ids[] =3D { diff --git a/drivers/iio/accel/bma400_spi.c b/drivers/iio/accel/bma400_spi.c index 96dc9c215401..2957ebc51543 100644 --- a/drivers/iio/accel/bma400_spi.c +++ b/drivers/iio/accel/bma400_spi.c @@ -84,7 +84,7 @@ static int bma400_spi_probe(struct spi_device *spi) if (ret) dev_err(&spi->dev, "Failed to read chip id register\n"); =20 - return bma400_probe(&spi->dev, regmap, id->name); + return bma400_probe(&spi->dev, regmap, spi->irq, id->name); } =20 static const struct spi_device_id bma400_spi_ids[] =3D { --=20 2.17.1 From nobody Sat Jun 20 00:55:05 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EFD4CC433F5 for ; Sat, 26 Mar 2022 19:42:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234813AbiCZTnq (ORCPT ); Sat, 26 Mar 2022 15:43:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46656 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234790AbiCZTnh (ORCPT ); Sat, 26 Mar 2022 15:43:37 -0400 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 03F29174BB7; Sat, 26 Mar 2022 12:41:59 -0700 (PDT) Received: by mail-pl1-x62f.google.com with SMTP id e5so11456550pls.4; Sat, 26 Mar 2022 12:41:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=dDuXdIX9ztuO+V8BPkvUWGSMJTVD8xCUW3sKbXhy9IY=; b=Z7pAq5ZHSpQm6DtWxwcYpAPFaEPn+JMNAJGdVjYpAKl+WP/TnGQOuUXvYBbTi8dJYI aR54n+nqlxgWdPkobYBHpJOKSbFx+qOfMZE4xE3icRzyKavDrYtfGbApgZwhdeuGoTjf WVvAaVZMVS9LrApvHZZb3rvDC8jc2IdmNvXkTB5Ls0t+DToKIeuD5MQ8wvwg+8Nhp1Jf Gy0KcQkxf3UHTb2g3hJb0tzbZb95FBaGHEeRwtfXJjGvwT5/wvAXchJyH9Lqd73P2KB9 zUvMUkh8U6Ml+o6dIBcmwwZEVLyOQUvsg6fIPGPGmcfKwAuSB+SazJqEFsdz3ncU6Tip A29A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=dDuXdIX9ztuO+V8BPkvUWGSMJTVD8xCUW3sKbXhy9IY=; b=gXL2Q5Ildo25hBg3RGEe4h8ZtO0CwYBYBE34AjIijX46uU54WQglot23K3CfjhKM3j LruWtMWKBkyZvx/ZFT5FS6Qxlds8ZTNbDZ0gUStyy7eRKgsfxt7WHKw7KeAXk58kW7PL +HK55RwHMNTZbWUy6VfoXOLbx3mnRJzFSDLxcz/WzFWwxv4lY4ZnJ3gms6qSnO0Efr4f h/dE/md7AO4H/HsQJHQW2cSP55kasIB/sQSZWlM1GHrmigANxh73F9uJjbeGciPOpJXM 67uNfnJpL8L3TY2eCNxu31YhnsDKublUtApTGKFbX9QA+br1/zEOiKHMOdOiIyiRvdzR Tmpw== X-Gm-Message-State: AOAM530Ji6JYuSLax59KlHHVzPJ3sCM1GBf22kX7v2SNPq4BT6W4JRla Xi0EWT+XGpTpdWpnQOzheh0= X-Google-Smtp-Source: ABdhPJwKExcEC7UIysNSn9RE9WEtIAfid0mn6hSDFYe4xnmmy9lmJcogdTLDFYwgEi/JzwY3AECP+Q== X-Received: by 2002:a17:902:edd5:b0:153:abee:1093 with SMTP id q21-20020a170902edd500b00153abee1093mr18775290plk.77.1648323719355; Sat, 26 Mar 2022 12:41:59 -0700 (PDT) Received: from localhost.localdomain ([116.75.119.161]) by smtp.gmail.com with ESMTPSA id k185-20020a6384c2000000b003821dcd9020sm8778784pgd.27.2022.03.26.12.41.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 12:41:59 -0700 (PDT) From: Jagath Jog J To: dan@dlrobertson.com, jic23@kernel.org, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 4/5] iio: accel: bma400: Add separate channel for step counter Date: Sun, 27 Mar 2022 01:11:45 +0530 Message-Id: <20220326194146.15549-5-jagathjog1996@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220326194146.15549-1-jagathjog1996@gmail.com> References: <20220326194146.15549-1-jagathjog1996@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Added channel for step counter which can be enable or disable through the sysfs interface. Signed-off-by: Jagath Jog J --- drivers/iio/accel/bma400.h | 1 + drivers/iio/accel/bma400_core.c | 47 ++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 4 deletions(-) diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h index 24d2b705343a..c9b856b37021 100644 --- a/drivers/iio/accel/bma400.h +++ b/drivers/iio/accel/bma400.h @@ -53,6 +53,7 @@ #define BMA400_STEP_CNT1_REG 0x16 #define BMA400_STEP_CNT3_REG 0x17 #define BMA400_STEP_STAT_REG 0x18 +#define BMA400_STEP_INT_MSK BIT(0) =20 /* * Read-write configuration registers diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_cor= e.c index fa3f4b5f229f..ec2f9c380bda 100644 --- a/drivers/iio/accel/bma400_core.c +++ b/drivers/iio/accel/bma400_core.c @@ -19,6 +19,7 @@ #include #include #include +#include =20 #include #include @@ -68,6 +69,7 @@ struct bma400_data { int oversampling_ratio; int scale; struct iio_trigger *trig; + int steps_enabled; /* Correct time stamp alignment */ struct { __le16 buff[3]; @@ -202,6 +204,12 @@ static const struct iio_chan_spec bma400_channels[] = =3D { .endianness =3D IIO_LE, }, }, + { + .type =3D IIO_STEPS, + .info_mask_separate =3D BIT(IIO_CHAN_INFO_PROCESSED) | + BIT(IIO_CHAN_INFO_ENABLE), + .scan_index =3D -1, /* No buffer support */ + }, IIO_CHAN_SOFT_TIMESTAMP(4), }; =20 @@ -706,13 +714,28 @@ static int bma400_read_raw(struct iio_dev *indio_dev, { struct bma400_data *data =3D iio_priv(indio_dev); int ret; + u8 steps_raw[3]; =20 switch (mask) { case IIO_CHAN_INFO_PROCESSED: - mutex_lock(&data->mutex); - ret =3D bma400_get_temp_reg(data, val, val2); - mutex_unlock(&data->mutex); - return ret; + switch (chan->type) { + case IIO_TEMP: + mutex_lock(&data->mutex); + ret =3D bma400_get_temp_reg(data, val, val2); + mutex_unlock(&data->mutex); + return ret; + case IIO_STEPS: + mutex_lock(&data->mutex); + ret =3D regmap_bulk_read(data->regmap, BMA400_STEP_CNT0_REG, + &steps_raw, sizeof(steps_raw)); + mutex_unlock(&data->mutex); + if (ret) + return ret; + *val =3D get_unaligned_le24(steps_raw); + return IIO_VAL_INT; + default: + return -EINVAL; + } case IIO_CHAN_INFO_RAW: mutex_lock(&data->mutex); ret =3D bma400_get_accel_reg(data, chan, val); @@ -753,6 +776,9 @@ static int bma400_read_raw(struct iio_dev *indio_dev, =20 *val =3D data->oversampling_ratio; return IIO_VAL_INT; + case IIO_CHAN_INFO_ENABLE: + *val =3D data->steps_enabled; + return IIO_VAL_INT; default: return -EINVAL; } @@ -818,6 +844,17 @@ static int bma400_write_raw(struct iio_dev *indio_dev, ret =3D bma400_set_accel_oversampling_ratio(data, val); mutex_unlock(&data->mutex); return ret; + case IIO_CHAN_INFO_ENABLE: + if (data->steps_enabled =3D=3D val) + return 0; + + mutex_lock(&data->mutex); + ret =3D regmap_update_bits(data->regmap, BMA400_INT_CONFIG1_REG, + BMA400_STEP_INT_MSK, + FIELD_PREP(BMA400_STEP_INT_MSK, !!val)); + mutex_unlock(&data->mutex); + data->steps_enabled =3D val; + return ret; default: return -EINVAL; } @@ -834,6 +871,8 @@ static int bma400_write_raw_get_fmt(struct iio_dev *ind= io_dev, return IIO_VAL_INT_PLUS_MICRO; case IIO_CHAN_INFO_OVERSAMPLING_RATIO: return IIO_VAL_INT; + case IIO_CHAN_INFO_ENABLE: + return IIO_VAL_INT; default: return -EINVAL; } --=20 2.17.1 From nobody Sat Jun 20 00:55:05 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AEF19C433EF for ; Sat, 26 Mar 2022 19:42:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234823AbiCZTns (ORCPT ); Sat, 26 Mar 2022 15:43:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47030 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234791AbiCZTnj (ORCPT ); Sat, 26 Mar 2022 15:43:39 -0400 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3941D173F6E; Sat, 26 Mar 2022 12:42:02 -0700 (PDT) Received: by mail-pl1-x631.google.com with SMTP id e5so11456596pls.4; Sat, 26 Mar 2022 12:42:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=llFGG5Ln4GVOwfUYH1k+vdT3vwWNdoegXKZ4vtGyn6w=; b=fzzCsS/pr1ErTf+UmtXWcKGuM7JjCovPVf3AI3L19HoMtAfYfsSvgGqbMejQFbn/4e XuuQEkR5ia1bjCQYGJeDMmkwnaG4dq6O4jySw8xxGXB1EhNkYD4OwovlxTZW50BBYQhW dSISrgeDWJnGtP1XBLWPrR53nipTR2Pw45VSiWzmD27wv6rFv66+6MG/NP2LbjzSRlpL Zf34xgWaAlyeXTUHtCxiuEoQsEUiWTM8t5ZDz6psWVLgDGOvntLpDXP9VGVd8kNXgMs3 MXDVgrPVcF9t9UGnmgjRBIRUSqV3sndfDN30YVxwR4e2i2HasbmndbgaOGiR+d/a/7Kp DCag== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=llFGG5Ln4GVOwfUYH1k+vdT3vwWNdoegXKZ4vtGyn6w=; b=D5ILTXFyLU3pu49XziLtZ4xHDfDJUF0mrjbySCr8t1Q/NVVNfOUVoOegnDoxvrbpKS qE7BKdz5WOre0RLC6RrDslOEaM8UsUtmjQlyxsHoviazgbN8jkD8Ub7FkcFdM3/C1E55 JflImBZGdX8i9MmdaH4eFzgqwJcFJ+U/nuerIIyP/lT584DvXdkCZM8o/7uBxvVAw9Fu FpJsKhjay/QBTavz4Ldxd7buUHKRRQQUFOxCNQt/xKWedMHAP2mhdrEOkVvt60BTJMnI NElcrTEjYUYRgystC57pPgJhyTycWZ7NRYVHKmtA2XrxCTZ6FPqaXlrWus6pC4PN7T81 +Ajg== X-Gm-Message-State: AOAM532TW+5R6YC7VuaaQd1WtGodNxfpFQFYKfFxOlivPwGQ5hK5/OJ4 0vuyvvXwrrdJpHkTqV3KDKM= X-Google-Smtp-Source: ABdhPJxSSj3KRzh+Cczwjgvy6iW74+dHes/vn6ViGSr7LL639XjTIyxHg8AvRoIGSjk9pgOSCXiaow== X-Received: by 2002:a17:902:7109:b0:153:2ed8:b140 with SMTP id a9-20020a170902710900b001532ed8b140mr18735814pll.52.1648323721535; Sat, 26 Mar 2022 12:42:01 -0700 (PDT) Received: from localhost.localdomain ([116.75.119.161]) by smtp.gmail.com with ESMTPSA id k185-20020a6384c2000000b003821dcd9020sm8778784pgd.27.2022.03.26.12.41.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 26 Mar 2022 12:42:01 -0700 (PDT) From: Jagath Jog J To: dan@dlrobertson.com, jic23@kernel.org, andy.shevchenko@gmail.com Cc: linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 5/5] iio: accel: bma400: Add step change event Date: Sun, 27 Mar 2022 01:11:46 +0530 Message-Id: <20220326194146.15549-6-jagathjog1996@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220326194146.15549-1-jagathjog1996@gmail.com> References: <20220326194146.15549-1-jagathjog1996@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Added support for event when there is a detection of step change. INT1 pin is used to interrupt and event is pushed to userspace. Signed-off-by: Jagath Jog J --- drivers/iio/accel/bma400.h | 2 + drivers/iio/accel/bma400_core.c | 73 +++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/drivers/iio/accel/bma400.h b/drivers/iio/accel/bma400.h index c9b856b37021..c4ec0cf6dc00 100644 --- a/drivers/iio/accel/bma400.h +++ b/drivers/iio/accel/bma400.h @@ -39,6 +39,7 @@ #define BMA400_INT_STAT0_REG 0x0e #define BMA400_INT_STAT1_REG 0x0f #define BMA400_INT_STAT2_REG 0x10 +#define BMA400_INT12_MAP_REG 0x23 =20 /* Temperature register */ #define BMA400_TEMP_DATA_REG 0x11 @@ -54,6 +55,7 @@ #define BMA400_STEP_CNT3_REG 0x17 #define BMA400_STEP_STAT_REG 0x18 #define BMA400_STEP_INT_MSK BIT(0) +#define BMA400_STEP_STAT_MASK GENMASK(9, 8) =20 /* * Read-write configuration registers diff --git a/drivers/iio/accel/bma400_core.c b/drivers/iio/accel/bma400_cor= e.c index ec2f9c380bda..aaa104a2698b 100644 --- a/drivers/iio/accel/bma400_core.c +++ b/drivers/iio/accel/bma400_core.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -70,6 +71,7 @@ struct bma400_data { int scale; struct iio_trigger *trig; int steps_enabled; + bool step_event_en; /* Correct time stamp alignment */ struct { __le16 buff[3]; @@ -167,6 +169,12 @@ static const struct iio_chan_spec_ext_info bma400_ext_= info[] =3D { { } }; =20 +static const struct iio_event_spec bma400_step_detect_event =3D { + .type =3D IIO_EV_TYPE_CHANGE, + .dir =3D IIO_EV_DIR_NONE, + .mask_separate =3D BIT(IIO_EV_INFO_ENABLE), +}; + #define BMA400_ACC_CHANNEL(_index, _axis) { \ .type =3D IIO_ACCEL, \ .modified =3D 1, \ @@ -209,6 +217,8 @@ static const struct iio_chan_spec bma400_channels[] =3D= { .info_mask_separate =3D BIT(IIO_CHAN_INFO_PROCESSED) | BIT(IIO_CHAN_INFO_ENABLE), .scan_index =3D -1, /* No buffer support */ + .event_spec =3D &bma400_step_detect_event, + .num_event_specs =3D 1, }, IIO_CHAN_SOFT_TIMESTAMP(4), }; @@ -878,6 +888,58 @@ static int bma400_write_raw_get_fmt(struct iio_dev *in= dio_dev, } } =20 +static int bma400_read_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir) +{ + struct bma400_data *data =3D iio_priv(indio_dev); + + switch (type) { + case IIO_EV_TYPE_CHANGE: + return data->step_event_en; + default: + return -EINVAL; + } +} + +static int bma400_write_event_config(struct iio_dev *indio_dev, + const struct iio_chan_spec *chan, + enum iio_event_type type, + enum iio_event_direction dir, int state) +{ + int ret; + struct bma400_data *data =3D iio_priv(indio_dev); + + switch (type) { + case IIO_EV_TYPE_CHANGE: + mutex_lock(&data->mutex); + if (!data->steps_enabled) { + ret =3D regmap_update_bits(data->regmap, + BMA400_INT_CONFIG1_REG, + BMA400_STEP_INT_MSK, + FIELD_PREP(BMA400_STEP_INT_MSK, + 1)); + if (ret) + return ret; + data->steps_enabled =3D 1; + } + + ret =3D regmap_update_bits(data->regmap, + BMA400_INT12_MAP_REG, + BMA400_STEP_INT_MSK, + FIELD_PREP(BMA400_STEP_INT_MSK, + state)); + mutex_unlock(&data->mutex); + if (ret) + return ret; + data->step_event_en =3D state; + return 0; + default: + return -EINVAL; + } +} + static int bma400_data_rdy_trigger_set_state(struct iio_trigger *trig, bool state) { @@ -910,6 +972,8 @@ static const struct iio_info bma400_info =3D { .read_avail =3D bma400_read_avail, .write_raw =3D bma400_write_raw, .write_raw_get_fmt =3D bma400_write_raw_get_fmt, + .read_event_config =3D bma400_read_event_config, + .write_event_config =3D bma400_write_event_config, }; =20 static const struct iio_trigger_ops bma400_trigger_ops =3D { @@ -965,6 +1029,15 @@ static irqreturn_t bma400_interrupt(int irq, void *pr= ivate) ret =3D IRQ_HANDLED; } =20 + if (FIELD_GET(BMA400_STEP_STAT_MASK, le16_to_cpu(status))) { + iio_push_event(indio_dev, + IIO_EVENT_CODE(IIO_STEPS, 0, IIO_NO_MOD, + IIO_EV_DIR_NONE, + IIO_EV_TYPE_CHANGE, 0, 0, 0), + iio_get_time_ns(indio_dev)); + ret =3D IRQ_HANDLED; + } + return ret; } =20 --=20 2.17.1