From patchwork Sat Jun 30 16:32:44 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10498317 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 3F406602BF for ; Sat, 30 Jun 2018 16:33:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2299728CC0 for ; Sat, 30 Jun 2018 16:33:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1735928CC9; Sat, 30 Jun 2018 16:33:08 +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 AD1F028CC0 for ; Sat, 30 Jun 2018 16:33:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751286AbeF3QdH (ORCPT ); Sat, 30 Jun 2018 12:33:07 -0400 Received: from mail-pl0-f68.google.com ([209.85.160.68]:37080 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751246AbeF3QdG (ORCPT ); Sat, 30 Jun 2018 12:33:06 -0400 Received: by mail-pl0-f68.google.com with SMTP id 31-v6so5927552plc.4 for ; Sat, 30 Jun 2018 09:33:06 -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=/fuKC8mWsRvKnmAGDp1A+WHhuGddOt/O4Zy0EY6V/eQ=; b=N5UHpHfgRAGfYE3WG/CH2VIX5yc4wd/Wx39KEJS+mUwFZxjo/dKbKlMiot+P5Wo4Dn W/RNhD/YBP8Otw38hhvxi0RRXh0gofhMIP+EOcmZ7H49oxtwNf2Uz0pg+MSS0c6q5ij+ cDVMaMVtbcS+CqCHgixtmSVupWBMS7USz+FrBnXMsfa4azG010nPRfXw0s3DQA04hxOL idTKEG/NPvAH1XaD9MkGxP4Ul4aa2Q76xkByHEorvCHSEARpQTCRIb2Pt9oCL0KvcQFy U/mtWhbNTSjOWGkveZ+PyZIKlsHATE6RQzfgY9uS+CAajiYbtrkx+EQ45nLeu0amtnx1 D9WA== 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=/fuKC8mWsRvKnmAGDp1A+WHhuGddOt/O4Zy0EY6V/eQ=; b=Hl+LxUPVKRQpJtmBklOM3mTWOxAHJ6dfx7XPqPhbA0FJV3VukadFUsnnaQgpraSiEb fg5LxNVYqpBlTUylFX0W4CeGei3UHpMwOghtWRv0PZkGbx/moXRcn7H5wru3XPEyGawD GMKnAqUlYyftgGF6EORHuVrQRsa0ldvleM/61nI8BZHXaNu2QMxlVUtQN1vGL6fJ6rR4 GaxrP1vwIK/2PgEfPyFfRfdqvr09kzRtvqVQ3dQJdshiB1SXc3qnpzGlEqw2eBvgzwEW UNXnKcGoXVm9wVnnHBQJhzL+lZQJ1JMNJUQpmio3X7BdPS9wG5aoVLklkM8zG3pbg8zo w/tg== X-Gm-Message-State: APt69E0Kf87ccc5eQvivQ/8i+BnKbI/Gh0HgxmNnErutgrYAFicPQ3kC OFdJN4JKixtaLF4F4nsT8cdgpQ== X-Google-Smtp-Source: ADUXVKKE9mRSDShgEeUgEPj8mGY8Brr3pHzadjCyARy2StOXCfH2yGZe+2vdevQuBZ7m1IMSfRviEw== X-Received: by 2002:a17:902:22:: with SMTP id 31-v6mr19686031pla.332.1530376386296; Sat, 30 Jun 2018 09:33:06 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:8dd7:7458:d0a4:c135]) by smtp.gmail.com with ESMTPSA id 74-v6sm26992545pfj.127.2018.06.30.09.33.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 30 Jun 2018 09:33:05 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v5 3/4] iio: accel: adxl345: add calibration offset support Date: Sun, 1 Jul 2018 01:32:44 +0900 Message-Id: <1530376365-23946-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1530376365-23946-1-git-send-email-akinobu.mita@gmail.com> References: <1530376365-23946-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 --- * v5 - No changes from v4 drivers/iio/accel/adxl345_core.c | 41 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 7a25840..7b29ae8 100644 --- a/drivers/iio/accel/adxl345_core.c +++ b/drivers/iio/accel/adxl345_core.c @@ -18,6 +18,10 @@ #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_OFS_AXIS(index) (ADXL345_REG_OFSX + (index)) #define ADXL345_REG_POWER_CTL 0x2D #define ADXL345_REG_DATA_FORMAT 0x31 #define ADXL345_REG_DATAX0 0x32 @@ -56,7 +60,8 @@ struct adxl345_data { .modified = 1, \ .channel2 = IIO_MOD_##axis, \ .address = index, \ - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \ + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_CALIBBIAS), \ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \ } @@ -72,6 +77,7 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, { struct adxl345_data *data = iio_priv(indio_dev); __le16 accel; + unsigned int regval; int ret; switch (mask) { @@ -94,6 +100,38 @@ static int adxl345_read_raw(struct iio_dev *indio_dev, *val2 = adxl345_uscale; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_CALIBBIAS: + ret = regmap_read(data->regmap, + ADXL345_REG_OFS_AXIS(chan->address), ®val); + if (ret < 0) + return ret; + /* + * 8-bit resolution at +/- 2g, that is 4x accel data scale + * factor + */ + *val = sign_extend32(regval, 7) * 4; + + return IIO_VAL_INT; + } + + 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); + + switch (mask) { + case IIO_CHAN_INFO_CALIBBIAS: + /* + * 8-bit resolution at +/- 2g, that is 4x accel data scale + * factor + */ + return regmap_write(data->regmap, + ADXL345_REG_OFS_AXIS(chan->address), + val / 4); } return -EINVAL; @@ -101,6 +139,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,