From patchwork Mon Jul 9 15:10: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: 10514847 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 DE68B60318 for ; Mon, 9 Jul 2018 15:10:28 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CD8DA28D74 for ; Mon, 9 Jul 2018 15:10:28 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C9B0728DB4; Mon, 9 Jul 2018 15:10:28 +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 4114C28D9B for ; Mon, 9 Jul 2018 15:10:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932967AbeGIPK1 (ORCPT ); Mon, 9 Jul 2018 11:10:27 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:39047 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932949AbeGIPK0 (ORCPT ); Mon, 9 Jul 2018 11:10:26 -0400 Received: by mail-pf0-f194.google.com with SMTP id s21-v6so13905718pfm.6 for ; Mon, 09 Jul 2018 08:10:26 -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; bh=Z05F34wUYG6TaXS5dfcZm4RP1n9lS/8Df0l2qHppjEA=; b=FsiOt4BSOlLgx6m2IIUvqnwn2fs9R7+lTmqNjiv34iCe8yTI18cHqGTRHdkKv9nk5B AdOOTAbi4wIX06hj+pNOnZWk/L8gkMIX0k6a1kF5tzM1oqaWlvYBHWJ1p5oxLsL+JBDy HAvhQtC4/62h+9PfPKoaVBeX26MGTFmKwzged3WpvkFWS8hFeQNwJp7/frNGPQAffK0d /C0p/2Ze++QrlRfyPln2PTdCDS54tBSmlQOd20egoF1RNZVfgBZJkDzBqjKt7Z1ZKPGb Qu5XXUjW7ECNRJ/JoNkIdWeMuNbFOCD2qgKnY+94kVoE6IqF8tRDiEtUXawuaqJIclyn 1jKg== 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; bh=Z05F34wUYG6TaXS5dfcZm4RP1n9lS/8Df0l2qHppjEA=; b=NEV1Y9fSHYJE28RBLRG9iP1Oa6mzLEaOtVLG3BsC7alelG1qPrfp2yASskVhD0VRO1 5k1pwMeF7USENiKMFwVeoQHKHZZwSpMla+I6Yw2ohgw7f5cjB394Zpv2ZMom3PfKE6Gv dAYUVRvUgqD/8n9x6C51c/JFm2EwpzPOAeoU9NDX6kwjq5INfi8w1u8q+/SzAZF12TFn IIs1tqgwa/9j27Yn62aTBVTOA/ysFTs5dfPhmKgbDHfmrZJie/5Wn3FdN+l6j+c89fxV 92WymCzrplQR5kvrNaqq3arLQYRb3qTx/djJk5A/MqGq3pJ+Um91nac7iHbDV/x/Elh2 gOPw== X-Gm-Message-State: APt69E2kpaP43BmOlBHXg2bEEj/I1vpxbXl19qTq1bKXkj0f4W4hPUzC fhAZso15uvTuS42Zqxbw6JtBVg== X-Google-Smtp-Source: AAOMgpfIyB7CZIa2K6551T03gWxBEDH6IgQlcuII+JpBJDuE6UE22+NmMmgpw3z8oyxN2gfI1/wlZg== X-Received: by 2002:a65:5907:: with SMTP id f7-v6mr18772099pgu.83.1531149026186; Mon, 09 Jul 2018 08:10:26 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:3963:3c46:f9cd:fcc]) by smtp.gmail.com with ESMTPSA id k10-v6sm39117886pfj.29.2018.07.09.08.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 09 Jul 2018 08:10:25 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v6] iio: accel: adxl345: add sampling frequency support Date: Tue, 10 Jul 2018 00:10:08 +0900 Message-Id: <1531149008-2836-1-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 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 --- This was part of a patchset titled "add calibration offset and sampling frequency support". All other patches have already been picked up. * v6 (Suggested by Andy Shevchenko) - Simplify calculation of sampling frequency setting by using clamp_val() drivers/iio/accel/adxl345_core.c | 57 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 7b29ae8..3359f33 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(index) (ADXL345_REG_OFSX + (index)) +#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,10 @@ #define ADXL345_REG_DATA_AXIS(index) \ (ADXL345_REG_DATAX0 + (index) * sizeof(__le16)) +#define ADXL345_BW_RATE GENMASK(3, 0) +#define ADXL345_BASE_RATE_NANO_HZ 97656250LL +#define NHZ_PER_HZ 1000000000LL + #define ADXL345_POWER_CTL_MEASURE BIT(3) #define ADXL345_POWER_CTL_STANDBY 0x00 @@ -62,7 +68,8 @@ struct adxl345_data { .address = index, \ .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), \ } static const struct iio_chan_spec adxl345_channels[] = { @@ -77,6 +84,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; @@ -112,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, NHZ_PER_HZ, val2); + + return IIO_VAL_INT_PLUS_NANO; } return -EINVAL; @@ -122,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); + s64 n; switch (mask) { case IIO_CHAN_INFO_CALIBBIAS: @@ -132,14 +151,50 @@ static int adxl345_write_raw(struct iio_dev *indio_dev, return regmap_write(data->regmap, ADXL345_REG_OFS_AXIS(chan->address), val / 4); + case IIO_CHAN_INFO_SAMP_FREQ: + n = div_s64(val * NHZ_PER_HZ + val2, ADXL345_BASE_RATE_NANO_HZ); + + return regmap_update_bits(data->regmap, ADXL345_REG_BW_RATE, + ADXL345_BW_RATE, + clamp_val(ilog2(n), 0, + ADXL345_BW_RATE)); } 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,