From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20BCEC282C8 for ; Mon, 28 Jan 2019 17:06:51 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E63522175B for ; Mon, 28 Jan 2019 17:06:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548695211; bh=/xvOAwenGXDDzugznOOfqVvB99hujNRz8+ogvgFcsVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Nup9Wk9rvcuIKKhTcFwlONRNTArJlMpmDOK+PNGTKSLSfEYS67B/uXkV2+V8b5oim REC039okQM4kM55lTbwGXo/f51/+z7Py02pxdYrxLrVu8FX+Dpj1lXtx9ZPHI6FGLn 4GWtoFldcifaIbkANW8YvKgbKfi0vfGtmGnALpjE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387951AbfA1RGs (ORCPT ); Mon, 28 Jan 2019 12:06:48 -0500 Received: from mail.kernel.org ([198.145.29.99]:41714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733270AbfA1QNG (ORCPT ); Mon, 28 Jan 2019 11:13:06 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DA0062177E; Mon, 28 Jan 2019 16:13:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548691985; bh=/xvOAwenGXDDzugznOOfqVvB99hujNRz8+ogvgFcsVc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oZ9NDeitrg53Qr4iPDvFBrT0Ob532sXBkDFntM/jmCXjRWzozkACVxsfejLcGg2sO hEWPOqcduFOCv9ewppxm54MFE9JWMdWBeZgNKbB8ga1SVLIgGvaUwWzaFnopyyH12/ PPAXC7ZaVMZFwYQH2f+c5lv2LllqwWOwowvJhWhM= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Renato Lui Geh , Jonathan Cameron , Sasha Levin , linux-iio@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 4.14 028/170] staging: iio: ad7780: update voltage on read Date: Mon, 28 Jan 2019 11:09:38 -0500 Message-Id: <20190128161200.55107-28-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> MIME-Version: 1.0 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Renato Lui Geh [ Upstream commit 336650c785b62c3bea7c8cf6061c933a90241f67 ] The ad7780 driver previously did not read the correct device output, as it read an outdated value set at initialization. It now updates its voltage on read. Signed-off-by: Renato Lui Geh Acked-by: Alexandru Ardelean Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/staging/iio/adc/ad7780.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/staging/iio/adc/ad7780.c b/drivers/staging/iio/adc/ad7780.c index dec3ba6eba8a..52613f6a9dd8 100644 --- a/drivers/staging/iio/adc/ad7780.c +++ b/drivers/staging/iio/adc/ad7780.c @@ -87,12 +87,16 @@ static int ad7780_read_raw(struct iio_dev *indio_dev, long m) { struct ad7780_state *st = iio_priv(indio_dev); + int voltage_uv; switch (m) { case IIO_CHAN_INFO_RAW: return ad_sigma_delta_single_conversion(indio_dev, chan, val); case IIO_CHAN_INFO_SCALE: - *val = st->int_vref_mv * st->gain; + voltage_uv = regulator_get_voltage(st->reg); + if (voltage_uv < 0) + return voltage_uv; + *val = (voltage_uv / 1000) * st->gain; *val2 = chan->scan_type.realbits - 1; return IIO_VAL_FRACTIONAL_LOG2; case IIO_CHAN_INFO_OFFSET: -- 2.19.1