From patchwork Thu Jun 21 15:39:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10480087 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5F4EB602CB for ; Thu, 21 Jun 2018 15:39:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E4512918E for ; Thu, 21 Jun 2018 15:39:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 42D9E291AC; Thu, 21 Jun 2018 15:39:31 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C92082918E for ; Thu, 21 Jun 2018 15:39:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933279AbeFUPja (ORCPT ); Thu, 21 Jun 2018 11:39:30 -0400 Received: from mail-pl0-f66.google.com ([209.85.160.66]:45645 "EHLO mail-pl0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933188AbeFUPj3 (ORCPT ); Thu, 21 Jun 2018 11:39:29 -0400 Received: by mail-pl0-f66.google.com with SMTP id o18-v6so1200565pll.12 for ; Thu, 21 Jun 2018 08:39:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PX4Vz2tx5osk0eoq4XOe8i1yTmMwa+iipoocqlswCDo=; b=mqnP8voIQxEFmaJX3joy2GBkdFprl0MIYaDUcA5eObQX/D5Qf39O8XhH7WBsl30ByZ h1l2hmqkvIu+cQNQct2hW1Q1BgDzS6xKJcjoAA2zWZrYSNxTRo2QkhCOdSjA9XaBal3n 50uKp1G+746y5COq8WsPKJSVSAN7ZzyzOsdzuNZfj53HaFX8p4rW94OVz488wbwQNQUe X7OpWyWNO+nNIci6yrgcz5c2d3bjJxmUI2IJfHX2phglV/7tQ20qbWl8RSiifr2a+TwT OW3zEb3DCPS+kdK7jn0MG/bSd1gaawbBM3K07GGRXI9NJkHh3gkYUTf9XpaY5Hv3jtms a5OA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PX4Vz2tx5osk0eoq4XOe8i1yTmMwa+iipoocqlswCDo=; b=rBmSI3zL6LV9ivbI3KflR+ejM/SjVogOX0yNYPajzzTpxSndT7cuq1FWm76/6m6B/h Zo/0GfFyi/OeaIP9rJSZD0vY+rg6hhMErgQ4Hzk8zPHXldS92zFrx7zhqBO4EYmYAh1P owiKjNwNbwbLXRq3COHgoIf8mvM4eMjriiA069Icr6e2ntEwhFw79/dvkIUTSmZa2ru+ k1IljEooVtPSYI8X0vA7RBJhQtYZaDhdiP/PSVd5zYqd+RLL5I2+7LxAP/XcXZcIbm2w uraTpLzJKYmsHyGm4ohsna8XRiME7ebApvP4tdbahqzOgn+F1JC3Lx9mJI6Hchg5Cg8p wzdQ== X-Gm-Message-State: APt69E0pzge98LqkvygxC7WQ9g2ntGS5U9/j5knwDxP9G8HmlZAb0slu Y8uF8iedMGadjZY1raTC4b7hlQ== X-Google-Smtp-Source: ADUXVKKmuTh401i9UUZhJEyesRTyZ1nSXjTiG7h8iSQ2ZMvru46g4/P4gC9o7w4hRWb4DMxs7d0LaA== X-Received: by 2002:a17:902:7b95:: with SMTP id w21-v6mr29285615pll.150.1529595569188; Thu, 21 Jun 2018 08:39:29 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:a469:fcdd:65db:d22]) by smtp.gmail.com with ESMTPSA id e16-v6sm7482362pff.185.2018.06.21.08.39.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 21 Jun 2018 08:39:28 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v3 4/4] iio: accel: adxl345: add sampling frequency support Date: Fri, 22 Jun 2018 00:39:08 +0900 Message-Id: <1529595548-25215-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529595548-25215-1-git-send-email-akinobu.mita@gmail.com> References: <1529595548-25215-1-git-send-email-akinobu.mita@gmail.com> Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The ADXL345 provides selectable output data rate. This adds the iio channel information for the sampling frequency with that feature. Cc: Eva Rachel Retuya Cc: Andy Shevchenko Cc: Jonathan Cameron Signed-off-by: Akinobu Mita --- * v3 - Calculate sampling frequency at runtime instead of having constant table drivers/iio/accel/adxl345_core.c | 63 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index d109ca5..460b3c9 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -14,6 +14,7 @@ #include #include +#include #include "adxl345.h" @@ -22,6 +23,7 @@ #define ADXL345_REG_OFSY 0x1f #define ADXL345_REG_OFSZ 0x20 #define ADXL345_REG_OFS_AXIS(si) (ADXL345_REG_OFSX + (si)) +#define ADXL345_REG_BW_RATE 0x2C #define ADXL345_REG_POWER_CTL 0x2D #define ADXL345_REG_DATA_FORMAT 0x31 #define ADXL345_REG_DATAX0 0x32 @@ -30,6 +32,9 @@ #define ADXL345_REG_DATA_AXIS(si) \ (ADXL345_REG_DATAX0 + (si) * sizeof(__le16)) +#define ADXL345_BW_RATE GENMASK(3, 0) +#define ADXL345_BASE_RATE_NANO_HZ 97656250LL + #define ADXL345_POWER_CTL_MEASURE BIT(3) #define ADXL345_POWER_CTL_STANDBY 0x00 @@ -61,7 +66,8 @@ struct adxl345_data { .channel2 = IIO_MOD_##axis, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_CALIBBIAS), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ), \ .scan_index = si, \ } @@ -77,6 +83,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, { struct adxl345_data *data = iio_priv(indio_dev); __le16 accel; + long long samp_freq_nhz; unsigned int regval; int ret; @@ -113,6 +120,16 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, *val = sign_extend32(regval, 7) * 4; return IIO_VAL_INT; + case IIO_CHAN_INFO_SAMP_FREQ: + ret = regmap_read(data->regmap, ADXL345_REG_BW_RATE, ®val); + if (ret < 0) + return ret; + + samp_freq_nhz = ADXL345_BASE_RATE_NANO_HZ << + (regval & ADXL345_BW_RATE); + *val = div_s64_rem(samp_freq_nhz, 1000000000, val2); + + return IIO_VAL_INT_PLUS_NANO; } return -EINVAL; @@ -123,6 +140,7 @@ static int adxl345_write_raw(struct iio_dev *indio_dev, int val, int val2, long mask) { struct adxl345_data *data = iio_priv(indio_dev); + int i; switch (mask) { case IIO_CHAN_INFO_CALIBBIAS: @@ -133,14 +151,57 @@ static int adxl345_write_raw(struct iio_dev *indio_dev, return regmap_write(data->regmap, ADXL345_REG_OFSX + chan->scan_index, val / 4); + case IIO_CHAN_INFO_SAMP_FREQ: + for (i = 0; i <= ADXL345_BW_RATE; i++) { + int nhz; + int hz; + + hz = div_s64_rem(ADXL345_BASE_RATE_NANO_HZ << i, + 1000000000, &nhz); + if (hz == val && nhz == val2) { + return regmap_update_bits(data->regmap, + ADXL345_REG_BW_RATE, + ADXL345_BW_RATE, i); + } + } + return -EINVAL; } return -EINVAL; } +static int adxl345_write_raw_get_fmt(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_CALIBBIAS: + return IIO_VAL_INT; + case IIO_CHAN_INFO_SAMP_FREQ: + return IIO_VAL_INT_PLUS_NANO; + default: + return -EINVAL; + } +} + +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL( +"0.09765625 0.1953125 0.390625 0.78125 1.5625 3.125 6.25 12.5 25 50 100 200 400 800 1600 3200" +); + +static struct attribute *adxl345_attrs[] = { + &iio_const_attr_sampling_frequency_available.dev_attr.attr, + NULL, +}; + +static const struct attribute_group adxl345_attrs_group = { + .attrs = adxl345_attrs, +}; + static const struct iio_info adxl345_info = { + .attrs = &adxl345_attrs_group, .read_raw = adxl345_read_raw, .write_raw = adxl345_write_raw, + .write_raw_get_fmt = adxl345_write_raw_get_fmt, }; int adxl345_core_probe(struct device *dev, struct regmap *regmap,