From patchwork Sat Nov 3 22:49:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matheus Tavares X-Patchwork-Id: 10666789 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A7B4414E2 for ; Sat, 3 Nov 2018 22:50:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9ACCE29AC7 for ; Sat, 3 Nov 2018 22:50:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8F19229AD3; Sat, 3 Nov 2018 22:50:35 +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.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 1E09529AC7 for ; Sat, 3 Nov 2018 22:50:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728801AbeKDIDE (ORCPT ); Sun, 4 Nov 2018 03:03:04 -0500 Received: from mail-qk1-f195.google.com ([209.85.222.195]:40102 "EHLO mail-qk1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726954AbeKDIDD (ORCPT ); Sun, 4 Nov 2018 03:03:03 -0500 Received: by mail-qk1-f195.google.com with SMTP id y16so7757780qki.7 for ; Sat, 03 Nov 2018 15:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=usp-br.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=m0AamTcm1g4t7bycgutx/ePAEZettKzmbxK6n56vTuo=; b=xVuXDa7SIAlQvPnjjEqBbluD0g7qOhssMDDXcJ4NVxL2IP8nNndDK2RVatjx+MHffm DlwmktP1oEZ34TqmR4dToUiSvQDRsEWbyzGlHQN+Lzk5D+uSqPUmRmsSgdQg2eQkTX6c birMcUVjD7EQhoLj78nxCfaOqc+Lux+1UufnYgWUA4TSHN5XAfasQpip/KAhJSXXenYU VM5AizT+3+4hZdbEIJqMogjC1LwOnElI+LfrL76QFtzrLlyEG+6GqQr2kStvAecxHZCk 9f+mmsA/XiarkEEY9Lk4nSBZifQfA8H/A5xc7p9b6TmU6TAL20MohUxAn5VWceKqYdRz lfoQ== 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=m0AamTcm1g4t7bycgutx/ePAEZettKzmbxK6n56vTuo=; b=lG8kUJ5GXgi6DFX2upnt+9HemsAJ4S30n78syaLXY3ycEbWA8QyPislH1wL8X3cDyK RdOgXtdaEmm00PAHBtFDjWYLw+WtQ8PWy8EEQWGONHGlQjp/1oAdG032WErOQjsdj3Ov NCcaVYWUXK7zBhmbG+6C4OkYhZK8gspg7VBwhKItQd2gOWfzhKjN3UXAB/Z9nGbT8JxH N7q5OTvZCUS26CvYVUBwz/W4Dxp1ADV/+igPfiGAOjedzyu++9434fcZAPVbIoEYjphs kM71c+n3k0BT1fPCoS2DBZN+ib3sHEjKUicHvaqG5PLbp05tMmv1VYE+dz7rcjS6exqa G+ng== X-Gm-Message-State: AGRZ1gIdNtsg2ho0pf2Lo3/yNs+4bQHZDTbU4s3Q1gPRDYZEYs8FeYJV sW03HcjqoipEwxvtpJOYO65Dwg== X-Google-Smtp-Source: AJdET5f4V7R90r/Ps/jr9qC25oKb7stN+/NkcZzVB9gvH4MhDmnduu4wzuC2Tj96PFcIJ/Y3JsOxlw== X-Received: by 2002:ad4:5307:: with SMTP id y7mr16298887qvr.9.1541285422387; Sat, 03 Nov 2018 15:50:22 -0700 (PDT) Received: from mango.spo.virtua.com.br ([2804:14c:81:942d::1]) by smtp.gmail.com with ESMTPSA id 35-v6sm27550924qtu.69.2018.11.03.15.50.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 03 Nov 2018 15:50:21 -0700 (PDT) From: Matheus Tavares To: Lars-Peter Clausen , Michael Hennerich , Jonathan Cameron , Hartmut Knaack , Peter Meerwald-Stadler , Greg Kroah-Hartman Cc: linux-iio@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-usp@googlegroups.com, Victor Colombo Subject: [PATCH v3 5/6] staging:iio:ad2s90: Add IIO_CHAN_INFO_SCALE to channel spec and read_raw Date: Sat, 3 Nov 2018 19:49:47 -0300 Message-Id: <20181103224948.31014-6-matheus.bernardino@usp.br> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181103224948.31014-1-matheus.bernardino@usp.br> References: <20181103224948.31014-1-matheus.bernardino@usp.br> 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 This patch adds the IIO_CHAN_INFO_SCALE mask to ad2s90_chan and implements the relative read behavior at ad2s90_read_raw. Signed-off-by: Victor Colombo Signed-off-by: Matheus Tavares --- drivers/staging/iio/resolver/ad2s90.c | 30 +++++++++++++++++++-------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/staging/iio/resolver/ad2s90.c b/drivers/staging/iio/resolver/ad2s90.c index 8f79cccf4814..9c168b7410d0 100644 --- a/drivers/staging/iio/resolver/ad2s90.c +++ b/drivers/staging/iio/resolver/ad2s90.c @@ -34,17 +34,29 @@ static int ad2s90_read_raw(struct iio_dev *indio_dev, int ret; struct ad2s90_state *st = iio_priv(indio_dev); - mutex_lock(&st->lock); - ret = spi_read(st->sdev, st->rx, 2); - if (ret < 0) { + switch (m) { + case IIO_CHAN_INFO_SCALE: + /* 2 * Pi / 2^12 */ + *val = 6283; /* mV */ + *val2 = 12; + return IIO_VAL_FRACTIONAL_LOG2; + case IIO_CHAN_INFO_RAW: + mutex_lock(&st->lock); + ret = spi_read(st->sdev, st->rx, 2); + if (ret < 0) { + mutex_unlock(&st->lock); + return ret; + } + *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); + mutex_unlock(&st->lock); - return ret; - } - *val = (((u16)(st->rx[0])) << 4) | ((st->rx[1] & 0xF0) >> 4); - mutex_unlock(&st->lock); + return IIO_VAL_INT; + default: + break; + } - return IIO_VAL_INT; + return -EINVAL; } static const struct iio_info ad2s90_info = { @@ -55,7 +67,7 @@ static const struct iio_chan_spec ad2s90_chan = { .type = IIO_ANGL, .indexed = 1, .channel = 0, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), }; static int ad2s90_probe(struct spi_device *spi)