From patchwork Sat Jun 16 15:04: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: 10467971 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 DA0D96028E for ; Sat, 16 Jun 2018 15:05:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CA0B028800 for ; Sat, 16 Jun 2018 15:05:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE0EB28CBE; Sat, 16 Jun 2018 15:05:11 +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 2389428CA1 for ; Sat, 16 Jun 2018 15:05:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754158AbeFPPFK (ORCPT ); Sat, 16 Jun 2018 11:05:10 -0400 Received: from mail-pf0-f193.google.com ([209.85.192.193]:36090 "EHLO mail-pf0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754135AbeFPPFJ (ORCPT ); Sat, 16 Jun 2018 11:05:09 -0400 Received: by mail-pf0-f193.google.com with SMTP id a12-v6so6192016pfi.3 for ; Sat, 16 Jun 2018 08:05:09 -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=IeBCPEmeSJ9woEqoX1n++w1ZeCg34wF6gaRQSfswM24=; b=hT8vQx6u3u8wcsMbVuSoSfPQtfBAZzCNox5nnfB7V3GN7MJp4EflOKvz5u3rL/nwx6 /NetgVMG9KlUXRr9E4+cdaUHzeNzOeHpJDtvN4peJ3sYU7103JmeZub1uvSsZBUzYQPS tlo9LnqdSN1OJI+4BjSpdtYaO45rmt8s37h9G9HNNSnJdIDOzKWNIqAVN1mu97PyGJDZ X5IHy6Gz0qOPaHhBn2fUUQxN9LUT+MX+6x5rl8MPLsbSnZhipd6+QjKM05b0IFy3ijzg WV8uLSeHC7IrQvCAxY7IR/SX66cSSswNfXTI16GBKee5X2vRqf6jk7JMUM8nRLha6t2b GRCA== 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=IeBCPEmeSJ9woEqoX1n++w1ZeCg34wF6gaRQSfswM24=; b=KKPuEzwMbU8mP/nGY8dR+SRKGMkCSVMIuOjyry1W29c68gb9vrVPt0cgKGp/ixgNlF va2FTBGN3WMjLfMk0s8fFN8vYc9jVhGyAV4gcmFSqebKrK3mu/3gjgEL8aNEdCzq56yt rNOtQ1roo15akPrAGcJ27YhIlZqNBSvHVSy0hW7ECo93ydZZuCJS/1DJ0u5UBb86Ybaf 1xqlYf3xjssShvpI5+U9b0jS/zvCySA2U21TxxL3UolDZsnShCjwTp3YseNOhlRuVind tispapSCKgm6dINLSqKHaX40LedWQDEqXPjXnQ0aSi9/qvxZX7kV42pvWqiPcRiGt28T bV9A== X-Gm-Message-State: APt69E0XERQXfDPKutI88mzv5wOaSwDNTmkpXnVBrJOAac6KrzMacdpu yUJd1kv+28Nip4GS/t/aSiJl1g== X-Google-Smtp-Source: ADUXVKKQRps3hXTkjUNQso5ZsW6muDGPB093sdc+h+wnLxFwlQosy8HBOU9KtvukSaczLAVM6KMltw== X-Received: by 2002:a65:6103:: with SMTP id z3-v6mr1205384pgu.125.1529161509279; Sat, 16 Jun 2018 08:05:09 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:5de8:1cbd:bd2:a915]) by smtp.gmail.com with ESMTPSA id a25-v6sm14529900pff.8.2018.06.16.08.05.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Jun 2018 08:05:08 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH 4/4] iio: accel: adxl345: add sampling frequency support Date: Sun, 17 Jun 2018 00:04:43 +0900 Message-Id: <1529161484-28781-5-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529161484-28781-1-git-send-email-akinobu.mita@gmail.com> References: <1529161484-28781-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 --- drivers/iio/accel/adxl345_core.c | 61 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index a392f9e..80e60c5 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" @@ -21,12 +22,15 @@ #define ADXL345_REG_OFSX 0x1e #define ADXL345_REG_OFSY 0x1f #define ADXL345_REG_OFSZ 0x20 +#define ADXL345_REG_BW_RATE 0x2C #define ADXL345_REG_POWER_CTL 0x2D #define ADXL345_REG_DATA_FORMAT 0x31 #define ADXL345_REG_DATAX0 0x32 #define ADXL345_REG_DATAY0 0x34 #define ADXL345_REG_DATAZ0 0x36 +#define ADXL345_BW_RATE GENMASK(3, 0) + #define ADXL345_POWER_CTL_MEASURE BIT(3) #define ADXL345_POWER_CTL_STANDBY 0x00 @@ -59,6 +63,7 @@ struct adxl345_data { .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ BIT(IIO_CHAN_INFO_CALIBBIAS), \ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE) | \ + BIT(IIO_CHAN_INFO_SAMP_FREQ) | \ BIT(IIO_CHAN_INFO_CALIBSCALE), \ .scan_index = si, \ } @@ -69,6 +74,28 @@ static const struct iio_chan_spec adxl345_channels[] = { ADXL345_CHANNEL(2, Z), }; +static const struct { + int val; + int val2; +} adxl345_samp_freq_table[] = { + { 0, 97656 }, + { 0, 195313 }, + { 0, 390625 }, + { 0, 781250 }, + { 1, 562500 }, + { 3, 125000 }, + { 6, 250000 }, + { 12, 500000 }, + { 25, 0 }, + { 50, 0 }, + { 100, 0 }, + { 200, 0 }, + { 400, 0 }, + { 800, 0 }, + { 1600, 0 }, + { 3200, 0 }, +}; + static int adxl345_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -114,6 +141,15 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, *val2 = adxl345_uscale * 4; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_SAMP_FREQ: + ret = regmap_read(data->regmap, ADXL345_REG_BW_RATE, ®val); + if (ret < 0) + return ret; + regval &= ADXL345_BW_RATE; + *val = adxl345_samp_freq_table[regval].val; + *val2 = adxl345_samp_freq_table[regval].val2; + + return IIO_VAL_INT_PLUS_MICRO; } return -EINVAL; @@ -125,18 +161,43 @@ static int adxl345_write_raw(struct iio_dev *indio_dev, { struct adxl345_data *data = iio_priv(indio_dev); int ret; + int i; switch (mask) { case IIO_CHAN_INFO_CALIBBIAS: ret = regmap_write(data->regmap, ADXL345_REG_OFSX + chan->scan_index, val); return ret; + case IIO_CHAN_INFO_SAMP_FREQ: + for (i = 0; i < ARRAY_SIZE(adxl345_samp_freq_table); i++) { + if (adxl345_samp_freq_table[i].val == val && + adxl345_samp_freq_table[i].val2 == val2) { + return regmap_update_bits(data->regmap, + ADXL345_REG_BW_RATE, + ADXL345_BW_RATE, i); + } + } + return -EINVAL; } return -EINVAL; } +static IIO_CONST_ATTR_SAMP_FREQ_AVAIL( +"0.097656 0.195313 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, };