From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753282AbdIXWAs (ORCPT ); Sun, 24 Sep 2017 18:00:48 -0400 Received: from mail-out-1.itc.rwth-aachen.de ([134.130.5.46]:16447 "EHLO mail-out-1.itc.rwth-aachen.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753139AbdIXWAm (ORCPT ); Sun, 24 Sep 2017 18:00:42 -0400 X-IronPort-AV: E=Sophos;i="5.42,433,1500933600"; d="scan'208";a="14865902" From: =?UTF-8?q?Stefan=20Br=C3=BCns?= To: CC: Rob Herring , Peter Meerwald-Stadler , =?UTF-8?q?Stefan=20Br=C3=BCns?= , , Manivannan Sadhasivam , Lars-Peter Clausen , "Jonathan Cameron" , Hartmut Knaack Subject: [PATCH v3 4/4] iio: light: vl6180: Correct ALS scale for non-default gain/integration time Date: Sun, 24 Sep 2017 23:59:20 +0200 X-Mailer: git-send-email 2.14.1 In-Reply-To: <20170924215920.7465-1-stefan.bruens@rwth-aachen.de> References: <20170924215920.7465-1-stefan.bruens@rwth-aachen.de> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [77.182.212.37] X-ClientProxiedBy: rwthex-s3-b.rwth-ad.de (2002:8682:1aa1::8682:1aa1) To rwthex-w2-a.rwth-ad.de (2002:8682:1a9e::8682:1a9e) Message-ID: Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The reported scale was only correct for the default settings of 100 ms integration time and gain 1. This aligns the reported scale with the behaviour of any other IIO driver and the documented ABI, but may require userspace changes if someone uses non-default settings. Signed-off-by: Stefan Brüns --- Changes in v3: None Changes in v2: None drivers/iio/light/vl6180.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/iio/light/vl6180.c b/drivers/iio/light/vl6180.c index 49e9f92cd116..67f8beb84fc3 100644 --- a/drivers/iio/light/vl6180.c +++ b/drivers/iio/light/vl6180.c @@ -315,9 +315,12 @@ static int vl6180_read_raw(struct iio_dev *indio_dev, case IIO_CHAN_INFO_SCALE: switch (chan->type) { case IIO_LIGHT: - *val = 0; /* one ALS count is 0.32 Lux */ - *val2 = 320000; - break; + /* one ALS count is 0.32 Lux @ gain 1, IT 100 ms */ + *val = 32000; /* 0.32 * 1000 * 100 */ + *val2 = data->als_gain_milli * data->als_it_ms; + + return IIO_VAL_FRACTIONAL; + case IIO_DISTANCE: *val = 0; /* sensor reports mm, scale to meter */ *val2 = 1000; -- 2.14.1