From patchwork Sat Jun 16 15:04:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10467969 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 3526A6028E for ; Sat, 16 Jun 2018 15:05:10 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 253B428CA1 for ; Sat, 16 Jun 2018 15:05:10 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 181EC28CBE; Sat, 16 Jun 2018 15:05:10 +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 9BFFA28CA1 for ; Sat, 16 Jun 2018 15:05:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754152AbeFPPFI (ORCPT ); Sat, 16 Jun 2018 11:05:08 -0400 Received: from mail-pf0-f194.google.com ([209.85.192.194]:43785 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754135AbeFPPFH (ORCPT ); Sat, 16 Jun 2018 11:05:07 -0400 Received: by mail-pf0-f194.google.com with SMTP id y8-v6so6181150pfm.10 for ; Sat, 16 Jun 2018 08:05:07 -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=cymI2PWauyH+xLiOAdgSYHfwlAfiv1IFnqZqE1c50Ng=; b=fGo/J5RfxOdC7Drrc4vVztTqeeAc4sfrSKAh7+JTon+NHhh9L+e1b+8eOL355mxZUl iyw7dPiNRAuUDz/iQierT9vWhBqvYtNdG+nhXQKa/SZcf50PpV6LmZzRa0H9Yyi9p2e9 g9ZPYL/iOufIdmQJ6dIJ8JqUrNio/msIbENhICoqUtMyJ7tYiU02QyexHgwADfpwqHVe H3wWS3P6AAItQ0ckpGChY6bmDtKE+Sq3oIsINMWzLYbe2kLMVOpIh4rtaIFqAYoKdhNT DldQwJXygPXA83ajQ5zPsWL8ZMMHJWvpmDJ6zSwlYD3Yt9USPDoWsOfwzRhaWhVfZUxf JYaQ== 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=cymI2PWauyH+xLiOAdgSYHfwlAfiv1IFnqZqE1c50Ng=; b=cY2Vz9jZJqH97A/Z7YLTgmnA7oH1b1dzNG5zc4fqXgtJ0WiNNGTkxmW7jjzAeoZxCi ACPhjMHIa/MDRIfeOc9E38pUTbGrHG28wu69F9IYSBvb4YJKgccvjdz3h9sbEXLeUPGi gG5AjwyDq2LFuKHwL7GoNhSxmPu3xOkDx6A2ZiZIT2jnd4f1vkCff5U9EKMj81TsjrfW pmw+VE2Xvb+alRW2fWRNS6O+k4pZWLOYGmg9EPZISSd5juSc7PowOgPBmLi1xBI2IlnV LatX3ixHwtDmQxGMKDPElWBJs435Qnx8QJu4L+bYxaTNoRBJKhqdvUWg1kpbrzmDW7KW 08Vg== X-Gm-Message-State: APt69E0RoY23GueJJR7tEB8A33EBr5+pdYN/burkt+iji4it3Q5tgdSQ r5+Zmea5/w3ZlHmv9wRHg35apw== X-Google-Smtp-Source: ADUXVKIgVtJy2O0lfLzGuOm+J+Deyj7j3mXZmkwKVVRTPU0GZTn8dYI0tMsquZ0TYd0o8ipQF1CRIA== X-Received: by 2002:aa7:820e:: with SMTP id k14-v6mr6606473pfi.97.1529161507040; Sat, 16 Jun 2018 08:05:07 -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.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 16 Jun 2018 08:05:06 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH 3/4] iio: accel: adxl345: add calibration offset support Date: Sun, 17 Jun 2018 00:04:42 +0900 Message-Id: <1529161484-28781-4-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 the offset adjustment registers for each axis. This adds the iio channel information for the calibraion offsets with that feature. Cc: Eva Rachel Retuya Cc: Andy Shevchenko Cc: Jonathan Cameron Signed-off-by: Akinobu Mita --- drivers/iio/accel/adxl345_core.c | 52 +++++++++++++++++++++++++++++++++++----- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 6b62f82..a392f9e 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -18,6 +18,9 @@ #include "adxl345.h" #define ADXL345_REG_DEVID 0x00 +#define ADXL345_REG_OFSX 0x1e +#define ADXL345_REG_OFSY 0x1f +#define ADXL345_REG_OFSZ 0x20 #define ADXL345_REG_POWER_CTL 0x2D #define ADXL345_REG_DATA_FORMAT 0x31 #define ADXL345_REG_DATAX0 0x32 @@ -53,8 +56,10 @@ struct adxl345_data { .type = IIO_ACCEL, \ .modified = 1, \ .channel2 = IIO_MOD_##axis, \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ - .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ + .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_CALIBSCALE), \ .scan_index = si, \ } @@ -69,7 +74,8 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct adxl345_data *data = iio_priv(indio_dev); - __le16 regval; + __le16 accel; + unsigned int regval; int ret; switch (mask) { @@ -80,18 +86,51 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, * and ADXL345_REG_DATA(X0/Y0/Z0) + 1 the most significant byte */ ret = regmap_bulk_read(data->regmap, ADXL345_REG_DATAX0 + - sizeof(regval) * chan->scan_index, - ®val, sizeof(regval)); + sizeof(accel) * chan->scan_index, &accel, + sizeof(accel)); if (ret < 0) return ret; - *val = sign_extend32(le16_to_cpu(regval), 12); + *val = sign_extend32(le16_to_cpu(accel), 12); return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: *val = 0; *val2 = adxl345_uscale; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_CALIBBIAS: + ret = regmap_read(data->regmap, + ADXL345_REG_OFSX + chan->scan_index, ®val); + if (ret < 0) + return ret; + *val = sign_extend32(regval, 7); + return IIO_VAL_INT; + case IIO_CHAN_INFO_CALIBSCALE: + /* + * 8-bit resolution at +/- 2g, that is 4x accel data scale + * factor + */ + *val = 0; + *val2 = adxl345_uscale * 4; + + return IIO_VAL_INT_PLUS_MICRO; + } + + return -EINVAL; +} + +static int adxl345_write_raw(struct iio_dev *indio_dev, + struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct adxl345_data *data = iio_priv(indio_dev); + int ret; + + switch (mask) { + case IIO_CHAN_INFO_CALIBBIAS: + ret = regmap_write(data->regmap, + ADXL345_REG_OFSX + chan->scan_index, val); + return ret; } return -EINVAL; @@ -99,6 +138,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, static const struct iio_info adxl345_info = { .read_raw = adxl345_read_raw, + .write_raw = adxl345_write_raw, }; int adxl345_core_probe(struct device *dev, struct regmap *regmap,