From patchwork Sun Apr 22 22:03:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Veenstra X-Patchwork-Id: 10355843 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 7B28B60388 for ; Sun, 22 Apr 2018 22:04:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 652EA2893F for ; Sun, 22 Apr 2018 22:04:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5A09828964; Sun, 22 Apr 2018 22:04:05 +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 E6EFA2893F for ; Sun, 22 Apr 2018 22:04:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753652AbeDVWEE (ORCPT ); Sun, 22 Apr 2018 18:04:04 -0400 Received: from mail-wr0-f196.google.com ([209.85.128.196]:39421 "EHLO mail-wr0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753646AbeDVWED (ORCPT ); Sun, 22 Apr 2018 18:04:03 -0400 Received: by mail-wr0-f196.google.com with SMTP id q3-v6so26022407wrj.6; Sun, 22 Apr 2018 15:04:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=JnfMBB/ovLsWwJhtp+vdGW5WFrdC/E98+unTnBj+bJQ=; b=BOvQVC1GPmPiK8VNQZ1p9XrLtmTn2mYSanaqbiAfjH7MYRYfXoy92V14JUbZiTredZ bw85oFp+20zdcprCPnp0UChQQd7RfNTDPl4bBENIFu8KMCThiuE0DWZF1OjhPCKMw/Y5 j7qwKGG1Co8sBpu0r8J3tpW+9b1qt57aW1g4lkYPRfOAQxAdmfOGdpqKB0T7p70LEqvj EOaD7f9oWR7ljAOY/yJc4I2CpI2AGvIA4161WLjQ2f1/z+rCnyHmNuxgm4IcaPYsDO4s em7YMzLGXUaSY9AMIbv5WG3Xngfyfla2lTFg8EtH/lZPvOEvK4hejGR4PtVg0c1XdQU3 DjsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=JnfMBB/ovLsWwJhtp+vdGW5WFrdC/E98+unTnBj+bJQ=; b=A7Vx48Dl7r38tdykxiK1KM0yjvM3nfzKFqyFLUxjjRUpr97E2BGUTI0UahUwJgkSck UK7nGu2l49/pJ+99eluRF8i4gzvQCLrPVMVwN5sS8fkJnlfHnLCEKTqTodkr4ECkpWtT t18cZVv+JGeAuuY2T/rkj9U0RJ9NVznvCa3MQBwa8VD+MgN0WM2Fad/u1udRzSRR8K7R GTFdqd+qNO97gWvGqO9hTFottefMQu0cEOufZb07cwgIcWbY81RGBOvG0yOxxLaulQaL IpzxNWDFuZRKFndhuVV/IT7Vk1zZG8OwFJvpaD/+HEOp66YA1TzYiTJQNy9qZcFWoX0c 99PA== X-Gm-Message-State: ALQs6tD7RlNSCZs5V0/L4lmiWdPPtBBNlxwNP2xK3BSUykJp2CkWrxdl t5yBQIBKaWhboovEWWff5SE= X-Google-Smtp-Source: AIpwx4+uc8rseDihjH+ijIk0RmejlnYNfZWdGLz9xjXjwdTgHi55uHsOuaDDuUx/ZLKav7dazJUrVw== X-Received: by 10.80.235.148 with SMTP id y20mr9861692edr.185.1524434642281; Sun, 22 Apr 2018 15:04:02 -0700 (PDT) Received: from zenbook-arch (s559434a1.adsl.online.nl. [85.148.52.161]) by smtp.gmail.com with ESMTPSA id f5sm6391799edb.86.2018.04.22.15.04.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 22 Apr 2018 15:04:01 -0700 (PDT) Date: Mon, 23 Apr 2018 00:03:59 +0200 From: David Veenstra To: jic23@kernel.org, lars@metafoo.de, pmeerw@pmeerw.net Cc: robh+dt@kernel.org, Michael.Hennerich@analog.com, knaack.h@gmx.de, linux-iio@vger.kernel.org, daniel.baluta@nxp.com, devel@driverdev.osuosl.org, devicetree@vger.kernel.org Subject: [PATCH v3 6/9] staging: iio: ad2s1200: Add scaling factor for angular velocity channel Message-ID: <803058d8b119451a193c556866ffbb291ec83bcb.1524432236.git.davidjulianveenstra@gmail.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.9.4 (2018-02-28) 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 sysfs iio ABI states radians per second is expected as the unit for angular velocity, but the 12-bit angular velocity register has rps as its unit. So a scaling factor of approximately 2 * Pi is added to the angular velocity channel. Signed-off-by: David Veenstra --- Changes in v3: - A decimal approximation of the scale is used, instead of a fractional approximation. - Remove unneeded explanation of iio_convert_raw_to_processed. drivers/staging/iio/resolver/ad2s1200.c | 71 +++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 26 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s1200.c b/drivers/staging/iio/resolver/ad2s1200.c index 3c7163610ff6..3e1696e52c38 100644 --- a/drivers/staging/iio/resolver/ad2s1200.c +++ b/drivers/staging/iio/resolver/ad2s1200.c @@ -57,37 +57,55 @@ static int ad2s1200_read_raw(struct iio_dev *indio_dev, struct ad2s1200_state *st = iio_priv(indio_dev); int ret = 0; - mutex_lock(&st->lock); - gpiod_set_value(st->sample, 0); - - /* delay (6 * AD2S1200_TSCLK + 20) nano seconds */ - udelay(1); - gpiod_set_value(st->sample, 1); - gpiod_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); - - ret = spi_read(st->sdev, &st->rx, 2); - if (ret < 0) { + switch (m) { + case IIO_CHAN_INFO_SCALE: + switch (chan->type) { + case IIO_ANGL_VEL: + /* 2 * Pi ~= 6.283185 */ + *val = 6; + *val2 = 283185; + return IIO_VAL_INT_PLUS_MICRO; + default: + return -EINVAL; + } + break; + case IIO_CHAN_INFO_RAW: + mutex_lock(&st->lock); + gpiod_set_value(st->sample, 0); + + /* delay (6 * AD2S1200_TSCLK + 20) nano seconds */ + udelay(1); + gpiod_set_value(st->sample, 1); + gpiod_set_value(st->rdvel, !!(chan->type == IIO_ANGL)); + + ret = spi_read(st->sdev, &st->rx, 2); + if (ret < 0) { + mutex_unlock(&st->lock); + return ret; + } + + switch (chan->type) { + case IIO_ANGL: + *val = be16_to_cpup(&st->rx) >> 4; + break; + case IIO_ANGL_VEL: + *val = sign_extend32(be16_to_cpup(&st->rx) >> 4, 11); + break; + default: + mutex_unlock(&st->lock); + return -EINVAL; + } + + /* delay (2 * AD2S1200_TSCLK + 20) ns for sample pulse */ + udelay(1); mutex_unlock(&st->lock); - return ret; - } - switch (chan->type) { - case IIO_ANGL: - *val = be16_to_cpup(&st->rx) >> 4; - break; - case IIO_ANGL_VEL: - *val = sign_extend32(be16_to_cpup(&st->rx) >> 4, 11); - break; + return IIO_VAL_INT; default: - mutex_unlock(&st->lock); - return -EINVAL; + break; } - /* delay (2 * AD2S1200_TSCLK + 20) ns for sample pulse */ - udelay(1); - mutex_unlock(&st->lock); - - return IIO_VAL_INT; + return -EINVAL; } static const struct iio_chan_spec ad2s1200_channels[] = { @@ -101,6 +119,7 @@ static const struct iio_chan_spec ad2s1200_channels[] = { .indexed = 1, .channel = 0, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), } };