From patchwork Mon Jun 25 15:22:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10486729 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 8396D60230 for ; Mon, 25 Jun 2018 15:23:21 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 77E0C28511 for ; Mon, 25 Jun 2018 15:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6CAA52851D; Mon, 25 Jun 2018 15:23:21 +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 F326328511 for ; Mon, 25 Jun 2018 15:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934694AbeFYPXS (ORCPT ); Mon, 25 Jun 2018 11:23:18 -0400 Received: from mail-pg0-f66.google.com ([74.125.83.66]:39246 "EHLO mail-pg0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751745AbeFYPXO (ORCPT ); Mon, 25 Jun 2018 11:23:14 -0400 Received: by mail-pg0-f66.google.com with SMTP id n2-v6so2782991pgq.6 for ; Mon, 25 Jun 2018 08:23:14 -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=DJWL60U0Ieg4PY7h3qfLglKh2ZA2/2b6UTZ/nsJTUsQ=; b=ukJoTLYUyYpE1ZeGNWn4Fqh7pFJluzug2ERP+BF0OGSvmWctVdvE5n+1bO+6n1EfDC O5TPxlir0hCAYQuY27w7FMQVscEu2Rv2aTm/IqcYPvA7JnRheghW28ROtSdgc06r+7+g X/TpUy6uvquJe+m4+lZAYYq7QSRi8mOq8VLvzG2mWMvCbCHQRgdCjv6qwWvHkS7J6zFQ noo3+aT/kfUdJVKXpzc3Fdml+5ydX2TYs7WykaMqraVreey1eZh6Q1jIIJtlpNeLpeSw UprRyVydkxjBuq6sL6S+Xd5mxwcv3WKJ4oDm6ex1Nl5se2PGxm4fubw6VPVyhVKu9b46 Xgsg== 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=DJWL60U0Ieg4PY7h3qfLglKh2ZA2/2b6UTZ/nsJTUsQ=; b=tvgKwE5OqHzVtReX8KvUM05c4GtfAoWI/dMJy8YMifXG2to70n8VBh+x1MXBxGYGPj 34id9F9+r8SXeEti5Z7KT2y0b6+51mX+quB5eGKjEPZNBNwprCbLND3A+ylrqvdr8SqV fYHoGPivQYzOliwPK/IkXPvxy46mDQ05LnukEzGVRU7biYpunc7Liw2kgNk546bbyi6c C/V3a5Oppz+l0IeRSY5HL3LRJOh/qYl4WVnP8KN0tapBctxGHfS1b8NuxtVMPzE9KPLJ E82J525QGc2WOODhzBGDAPwT2mYWA/6RIAcj9DeKTO+TlSpfKqud0YROl0/uWvWjRdq+ ojDQ== X-Gm-Message-State: APt69E2xCY7zYwqyqjqGNW8hZZ5eFEDudRypQ5p8f3fIaa9JPNn5i4E2 CdR5GBCJAyLBMnzuLX8H2/ABsg== X-Google-Smtp-Source: ADUXVKKkhkuUUkPbelmyweNwlJ3OLsh3Ji7XVh/sV6iYOO/R17opUIxipuBTPrrJrObawoKkN4Ft3g== X-Received: by 2002:a63:af49:: with SMTP id s9-v6mr11380245pgo.49.1529940193977; Mon, 25 Jun 2018 08:23:13 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:488e:1524:9076:6446]) by smtp.gmail.com with ESMTPSA id g2-v6sm12610781pgn.92.2018.06.25.08.23.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jun 2018 08:23:13 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v4 4/4] iio: accel: adxl345: add sampling frequency support Date: Tue, 26 Jun 2018 00:22:43 +0900 Message-Id: <1529940163-5149-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529940163-5149-1-git-send-email-akinobu.mita@gmail.com> References: <1529940163-5149-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 --- * v4 - No changes from v3 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 7b29ae8..0a46791 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,9 @@ #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 ADXL345_POWER_CTL_MEASURE BIT(3) #define ADXL345_POWER_CTL_STANDBY 0x00 @@ -62,7 +67,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 +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; @@ -112,6 +119,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; @@ -122,6 +139,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: @@ -132,14 +150,57 @@ 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: + 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,