From patchwork Mon Jun 18 15:59:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akinobu Mita X-Patchwork-Id: 10472169 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 DCF686029B for ; Mon, 18 Jun 2018 15:59:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CB406289E8 for ; Mon, 18 Jun 2018 15:59:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BFCF728A0C; Mon, 18 Jun 2018 15:59:31 +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 5A014289E8 for ; Mon, 18 Jun 2018 15:59:31 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755316AbeFRP7a (ORCPT ); Mon, 18 Jun 2018 11:59:30 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:40033 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755025AbeFRP73 (ORCPT ); Mon, 18 Jun 2018 11:59:29 -0400 Received: by mail-pg0-f68.google.com with SMTP id w8-v6so4705410pgp.7 for ; Mon, 18 Jun 2018 08:59:29 -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=puutFnavf6EyiKG342LL75ANiBif++Rw7E2y3KvpTH4=; b=mdxZ6qyEK2YicG2gVj1eGt3aqq6UiQongAjMVQDv1TaQICqLbjppUGuxaFsrjMb2gj +NxqOplZRnKhpau32dfAzl4H+jWH2AxKpWmZXXyTqduq5noyzaeauKw1nI1140sR89iN w6JiIPuLP9j+F64m4LeXQ7Km78u85h+vJnu/uv2wGo3BMuTfa86XgB+y5epc4Kr4BiOc nNTE3o8H1N09GlFA9mPhJjVkfdV9U1SA/O++xCQCHiRCHIlQtc3yA/1uTrcIuSpd7wl2 4Rs8K6lezpSAmuZGwLgviohapJmOAk92nooxsxsrSjjP6qjN5N/Fy2ufHudvLsJcKppk uUeQ== 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=puutFnavf6EyiKG342LL75ANiBif++Rw7E2y3KvpTH4=; b=TPdrm2wxgP/oAPTPs1IZMbRC9O9IvUBT/pwz+4miZS9cDdZc2bCFgu3ZzGR4JFuWtw lbe5jVGX9JU0GxXpVpEAsZXIuPizlD2HGUn9EIQ99fbwxmYHV6lPwhLZXuLttOigEXRu p+sdEe5nT/DPbRD/TzdsAgQB7W1ZK1jOTYmhb4UkFHxxng4/qdoL1Br3W6oVxNBYEmVy 8tevWnwjGBMVjJVfOclx4k9jXciWb1AdfgFLm8/m79b4sVQIixVEprBjggtsw5lQb+PP 7roy/MPWr5LYlqqV50pLujpglwlAJXZtotttPhZoWIMbPhrPGob55rwuuzSqMWec4poi MsBg== X-Gm-Message-State: APt69E2aAsAaDj7hUdpwqto4KJ7G8kFS/jdNEbOtI3hz7ITtAFLCFA2L xkQWM6qIuA9dkBQmOGwy8uATVw== X-Google-Smtp-Source: ADUXVKIfuZV0Pw5XDdhARiiH2J+pz/j8vx7SVDgupwQbmU56Kh3/9daK+glpsZPRoxPAvM41EYQ4pA== X-Received: by 2002:a65:65ca:: with SMTP id y10-v6mr11569063pgv.359.1529337569302; Mon, 18 Jun 2018 08:59:29 -0700 (PDT) Received: from localhost.localdomain ([240f:34:212d:1:e9ea:30c2:7286:e591]) by smtp.gmail.com with ESMTPSA id a27-v6sm26395643pfc.18.2018.06.18.08.59.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 18 Jun 2018 08:59:28 -0700 (PDT) From: Akinobu Mita To: linux-iio@vger.kernel.org Cc: Akinobu Mita , Eva Rachel Retuya , Andy Shevchenko , Jonathan Cameron Subject: [PATCH v2 3/4] iio: accel: adxl345: add calibration offset support Date: Tue, 19 Jun 2018 00:59:11 +0900 Message-Id: <1529337552-23726-4-git-send-email-akinobu.mita@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1529337552-23726-1-git-send-email-akinobu.mita@gmail.com> References: <1529337552-23726-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 --- * v2 - Adjust the value for the calibbias to make the same scale as the _raw measurement, and remove misused calibscale. drivers/iio/accel/adxl345_core.c | 47 +++++++++++++++++++++++++++++++++++----- 1 file changed, 42 insertions(+), 5 deletions(-) diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c index 6b62f82..a6cdf1b 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,7 +56,8 @@ struct adxl345_data { .type = IIO_ACCEL, \ .modified = 1, \ .channel2 = IIO_MOD_##axis, \ - .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), \ .scan_index = si, \ } @@ -69,7 +73,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 +85,49 @@ 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; + /* + * 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_OFSX + chan->scan_index, + val / 4); } return -EINVAL; @@ -99,6 +135,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,