From patchwork Mon Jun 25 15:22: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: 10486727 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 0CDA56023A 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 0171928517 for ; Mon, 25 Jun 2018 15:23:21 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EA4292851B; Mon, 25 Jun 2018 15:23:20 +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 7C5CE28511 for ; Mon, 25 Jun 2018 15:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934743AbeFYPXT (ORCPT ); Mon, 25 Jun 2018 11:23:19 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:39966 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752108AbeFYPXM (ORCPT ); Mon, 25 Jun 2018 11:23:12 -0400 Received: by mail-pf0-f196.google.com with SMTP id z24-v6so6604473pfe.7 for ; Mon, 25 Jun 2018 08:23:12 -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=hJXCZ1Ts5pcgF/4NTXmav0D9fTLzjTKkIMajfbU8Pgs=; b=BA1jrCuUfCNLn8irfGyOOHqEIM3qX1tCrOpYYNROdOGde8Uz1X5aJkgIGHg2YTwSko wDjXuFnleTLi39TOc2qcddF/OHogOLp/RBDNVzwJLdqWv8oFLe43bJN8DwHH4SRapzVV M6BvAUeFFRbEf2YlEzirKpxxWOw8gUDZP4KeMLNgzmY31v/gnnM0ZFhqkuWppT46tFs7 QGmrJycMHJl77l4RQd51WBPanBLEc/CoM5hQ/mGHxI9DNr/Athxr4wTi/xtV8aM3CyhB W2J/V/N8JfQIyWW6Q4h2gA2SCPP+YDaEil3u1x3I/OlKdHNOCe6U9Q3Xs5MwHu5E6n// FT/w== 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=hJXCZ1Ts5pcgF/4NTXmav0D9fTLzjTKkIMajfbU8Pgs=; b=YfjJHKIN0RlSUu4SjGGu6/0cM9xT+ypvF8b2xbbMUz2hV2A8Vow6ToWxyr0ri65HC/ 4G7Bagewcw0KInHm6DqGY80tC0oC2tjJ4bEUiuOzl1J8iF0z1HpOMxvhPJyeXiJJSooi 5t40tXYZBgkvOREsYAX2kRHfGtEZxDTA5g7HMv0GvkaE4FOTFQDJL6ciyWAulcO/v6zg sCbMWFCDfHK8VGhBxDXdi14QjuKBrTBgMqnIGeZXhMkgwGJFEP+1XmcSRDRrfATmBIf9 qTg7327zA+6X0O6B2KQ4fZAomw6pXQxRXMgoPaQB8VEWBlQMhg/2ES7sq0XRy72aYdqQ azJw== X-Gm-Message-State: APt69E19Yhy93pJsrRc9gEiRWlgzRWZj0bZ+liXiwCYpKK3gojNujar6 NdA4ROMyHrEJj3GeEcxZPYDAag== X-Google-Smtp-Source: ADUXVKIAjb0+s0nmnzf1bqm/vb7OvY66kump4JbwnJlWP6BZVqo6cjWQcRiyJwirixbC0/eFr3Rtmg== X-Received: by 2002:a65:5085:: with SMTP id r5-v6mr11351207pgp.123.1529940191610; Mon, 25 Jun 2018 08:23:11 -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.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Jun 2018 08:23:10 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v4 3/4] iio: accel: adxl345: add calibration offset support Date: Tue, 26 Jun 2018 00:22:42 +0900 Message-Id: <1529940163-5149-4-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 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 --- * v4 - Switch to use chan->address instead of scan_index 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,