From patchwork Mon Jul 29 11:50:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhash Jha X-Patchwork-Id: 13744773 Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC08614831E; Mon, 29 Jul 2024 11:51:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253904; cv=none; b=Zev7XiEPKxk+vkpqpCxLyz3KOoWL7pe5e2DU82Woek24D0kmm1fRyx3YVjKgn7s9oqSuuO5hcre2x8qE1zS+m0eS7+67GaYh9nwDCOlY4ACHeZHwUEoggpJoCPMl9cPHgYjL4DiO2sGUD7n4gEjU6aE4YFPrcCjMVyzYHnSyQGw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253904; c=relaxed/simple; bh=sI4cdAFg0hsoGmnBNLAc/3uLbSNzKKojFjUB26LrnUA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KlS0DXfnWg5KNZG7CbPboGAQS9rrgpx+rUjngTmmZOjQ5BGgKhSso3rKKl3uBZJXOOtJCSFq2GEHedKCj7QjiSKiyRdE9J0BjEEQb5QXuVV/tSEDGZgnSBpH3Lc3fG/lH7JXTflGt9eV9fFFesidLlB9iUDlJI+sE8C9lHZQ1NQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=CxRvjsdb; arc=none smtp.client-ip=209.85.214.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CxRvjsdb" Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-1fc5239faebso16231525ad.1; Mon, 29 Jul 2024 04:51:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722253902; x=1722858702; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=a/vRoovyIj8/KYbO+9JAvtM+g6AnVksICedVIcBIJP4=; b=CxRvjsdb6iA+5I4SPCvLz65ktNciu4ZfwXh1h5qIaZeHSu+jZ6jAATomgPFrTRDp9M z95ba6WPUe0rMIKA0iylRyHFiHHe6PSd+jRWmsStX74/vEnDgLE2Led+r3nvla6KpyT9 QE6sNUzzouByVGkltW8IyzTnuMcgFL1ZFFqFW2CfKW134gVU2TR8JQ7XD8V/6NHyRJPv P5Du0/wk1XoG/YMpUHC04MFJPOOIB8MfufseS7OSvxbE5H7AYRn3mYvhvHHwG2TNw+Dg 3kBDZhNbl+QNI8C1cpYadXQlGnPyYIIw071WbP0m0HQAIvV2k+z8IVoF00JDKnQLzIx1 zhtg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722253902; x=1722858702; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=a/vRoovyIj8/KYbO+9JAvtM+g6AnVksICedVIcBIJP4=; b=E2hXx3FX0U1v9OBBY39eof4hrISIiaJsVddG3HDiKICJ0ussj1vwtRKNPC268tHui0 Ol6s0FF94+4brNQoRwCiA4jU3t3xqkAQH3jZpas4vs+K2avJpNmYeqC/gzY6PisdFGcD pwPpB7pd9DEY2N7ujnC3+r60Ipp5jXVTqHRJEuMPt46jF/IgsQptxp4lY15M8trVouBh OvfFKrj1bxcaPOBbROfttJDzAEHZWcIioeStDH4A/xx1pqRwHiB1Fn6Dx75kIkO43bl/ VJ24HoecPsLihayPiW5O7wQJLUoVFiM+y45pCbk13zxmoTdhMmpE0MMo8/VWbLoRaSX8 j4lQ== X-Forwarded-Encrypted: i=1; AJvYcCXJ+9d0AWw5Ae1shQQS2+CeHKmUx0CuEgF/IGPKl+D4r0zjxBnk7KqSUy7nCspii3hkSeNvKPeE0yu/P12qEoTmQkCdsqlLEFt5qytT X-Gm-Message-State: AOJu0YxbUo2sqlDLOeEum0BVtNjaMZFMW0lr+imdsBkFdFBNTr6ra2Qe TFkumNrSywyEmhHpyywxSdWUSk1a3i97buqfLcIkgOij+Y62aH6KU7FHlipo2X0tFg== X-Google-Smtp-Source: AGHT+IGF7qBOOuXao+SNJ3DZq6DSRV5MzvrRXiOAqEdUWp6xRaJUZUHXQ78+ewRegz+cEhw7FrLYRA== X-Received: by 2002:a17:90b:3882:b0:2c8:da73:af7d with SMTP id 98e67ed59e1d1-2cf7e09577cmr5214190a91.3.1722253901474; Mon, 29 Jul 2024 04:51:41 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.100]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2cd8f7692f0sm6760987a91.1.2024.07.29.04.51.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 04:51:40 -0700 (PDT) From: Abhash Jha To: linux-iio@vger.kernel.org Cc: anshulusr@gmail.com, jic23@kernel.org, lars@metafoo.de, linux-kernel@vger.kernel.org, Abhash Jha Subject: [PATCH v3 1/3] iio: light: ltr390: Add configurable gain and resolution Date: Mon, 29 Jul 2024 17:20:53 +0530 Message-ID: <20240729115056.355466-2-abhashkumarjha123@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729115056.355466-1-abhashkumarjha123@gmail.com> References: <20240729115056.355466-1-abhashkumarjha123@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add support for configuring and reading the gain and resolution (integration time). Also provide the available values for gain and resoltion respectively via `read_avail` callback. Signed-off-by: Abhash Jha --- drivers/iio/light/ltr390.c | 135 ++++++++++++++++++++++++++++++++++--- 1 file changed, 124 insertions(+), 11 deletions(-) diff --git a/drivers/iio/light/ltr390.c b/drivers/iio/light/ltr390.c index fff1e8990..b79cd413f 100644 --- a/drivers/iio/light/ltr390.c +++ b/drivers/iio/light/ltr390.c @@ -28,16 +28,23 @@ #include -#define LTR390_MAIN_CTRL 0x00 -#define LTR390_PART_ID 0x06 -#define LTR390_UVS_DATA 0x10 +#define LTR390_MAIN_CTRL 0x00 +#define LTR390_ALS_UVS_MEAS_RATE 0x04 +#define LTR390_ALS_UVS_GAIN 0x05 +#define LTR390_PART_ID 0x06 +#define LTR390_ALS_DATA 0x0D +#define LTR390_UVS_DATA 0x10 +#define LTR390_INT_CFG 0x19 + +#define LTR390_PART_NUMBER_ID 0xb +#define LTR390_ALS_UVS_GAIN_MASK 0x07 +#define LTR390_ALS_UVS_INT_TIME_MASK 0x70 +#define LTR390_ALS_UVS_INT_TIME(x) FIELD_PREP(LTR390_ALS_UVS_INT_TIME_MASK, (x)) #define LTR390_SW_RESET BIT(4) #define LTR390_UVS_MODE BIT(3) #define LTR390_SENSOR_ENABLE BIT(1) -#define LTR390_PART_NUMBER_ID 0xb - /* * At 20-bit resolution (integration time: 400ms) and 18x gain, 2300 counts of * the sensor are equal to 1 UV Index [Datasheet Page#8]. @@ -60,6 +67,8 @@ struct ltr390_data { struct i2c_client *client; /* Protects device from simulataneous reads */ struct mutex lock; + int gain; + int int_time_us; }; static const struct regmap_config ltr390_regmap_config = { @@ -75,8 +84,6 @@ static int ltr390_register_read(struct ltr390_data *data, u8 register_address) int ret; u8 recieve_buffer[3]; - guard(mutex)(&data->lock); - ret = regmap_bulk_read(data->regmap, register_address, recieve_buffer, sizeof(recieve_buffer)); if (ret) { @@ -94,6 +101,7 @@ static int ltr390_read_raw(struct iio_dev *iio_device, int ret; struct ltr390_data *data = iio_priv(iio_device); + guard(mutex)(&data->lock); switch (mask) { case IIO_CHAN_INFO_RAW: ret = ltr390_register_read(data, LTR390_UVS_DATA); @@ -105,18 +113,118 @@ static int ltr390_read_raw(struct iio_dev *iio_device, *val = LTR390_WINDOW_FACTOR; *val2 = LTR390_COUNTS_PER_UVI; return IIO_VAL_FRACTIONAL; + + case IIO_CHAN_INFO_INT_TIME: + *val = data->int_time_us; + return IIO_VAL_INT; + default: return -EINVAL; } } -static const struct iio_info ltr390_info = { - .read_raw = ltr390_read_raw, -}; +/* integration time in us */ +static const int ltr390_int_time_map_us[] = { 400000, 200000, 100000, 50000, 25000, 12500 }; +static const int ltr390_gain_map[] = { 1, 3, 6, 9, 18 }; static const struct iio_chan_spec ltr390_channel = { .type = IIO_UVINDEX, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_INT_TIME) | BIT(IIO_CHAN_INFO_SCALE) +}; + +static int ltr390_set_gain(struct ltr390_data *data, int val) +{ + int ret, idx; + + for (idx = 0; idx < ARRAY_SIZE(ltr390_gain_map); idx++) { + if (ltr390_gain_map[idx] != val) + continue; + + guard(mutex)(&data->lock); + ret = regmap_update_bits(data->regmap, + LTR390_ALS_UVS_GAIN, + LTR390_ALS_UVS_GAIN_MASK, idx); + if (ret) + return ret; + + data->gain = ltr390_gain_map[idx]; + return 0; + } + + return -EINVAL; +} + +static int ltr390_set_int_time(struct ltr390_data *data, int val) +{ + int ret, idx; + + for (idx = 0; idx < ARRAY_SIZE(ltr390_int_time_map_us); idx++) { + if (ltr390_int_time_map_us[idx] != val) + continue; + + guard(mutex)(&data->lock); + ret = regmap_update_bits(data->regmap, + LTR390_ALS_UVS_MEAS_RATE, + LTR390_ALS_UVS_INT_TIME_MASK, + LTR390_ALS_UVS_INT_TIME(idx)); + if (ret) + return ret; + + data->int_time_us = ltr390_int_time_map_us[idx]; + return 0; + } + + return -EINVAL; +} + +static int ltr390_read_avail(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, + const int **vals, int *type, int *length, long mask) +{ + switch (mask) { + case IIO_CHAN_INFO_SCALE: + *length = ARRAY_SIZE(ltr390_gain_map); + *type = IIO_VAL_INT; + *vals = ltr390_gain_map; + return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_INT_TIME: + *length = ARRAY_SIZE(ltr390_int_time_map_us); + *type = IIO_VAL_INT; + *vals = ltr390_int_time_map_us; + return IIO_AVAIL_LIST; + default: + return -EINVAL; + } +} + +static int ltr390_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, + int val, int val2, long mask) +{ + struct ltr390_data *data = iio_priv(indio_dev); + + switch (mask) { + case IIO_CHAN_INFO_SCALE: + if (val2 != 0) + return -EINVAL; + + return ltr390_set_gain(data, val); + + case IIO_CHAN_INFO_INT_TIME: + if (val2 != 0) + return -EINVAL; + + return ltr390_set_int_time(data, val); + + default: + return -EINVAL; + } +} + +static const struct iio_info ltr390_info = { + .read_raw = ltr390_read_raw, + .write_raw = ltr390_write_raw, + .read_avail = ltr390_read_avail, }; static int ltr390_probe(struct i2c_client *client) @@ -139,6 +247,11 @@ static int ltr390_probe(struct i2c_client *client) "regmap initialization failed\n"); data->client = client; + /* default value of integration time from pg: 15 of the datasheet */ + data->int_time_us = 100000; + /* default value of gain from pg: 16 of the datasheet */ + data->gain = 3; + mutex_init(&data->lock); indio_dev->info = <r390_info; From patchwork Mon Jul 29 11:50:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhash Jha X-Patchwork-Id: 13744774 Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 698A714883B; Mon, 29 Jul 2024 11:51:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253909; cv=none; b=iHRPbCYWq6ajSP9DcIOvwIrOqipU5qcCJ3cILh9K+hzR5s3k8sOmKGhnY5yf38CNQStgPG78WgGEk/Iyv07cGWYkzy/W0A/RXGacRO8eUss5XAIrfx1y62h6UwASu0fVEDuBIm5yoeUqKWImxNZu8Y2XHPVTFENEApl8HklDNes= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253909; c=relaxed/simple; bh=/Qy1LObMKWIxCMmIDmIh0oDsUkuilV/YtTh2bV9PWBo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=F1dh5TojE17qHY/WCQyvwn81i5paIiF8bs6yaQU6TSKW9sHi3exX+A8vo/cTJppqwJwgPkvVxKJYNkyOCou75GtQsNK3BWcWIwC0+0YJtdWWSNksX4mVRDB8PoDsNgSkFzsbzRQj1xTSLYBzNbsWaRpxBrZQqqU0touusqmMAhw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MHqsMXTV; arc=none smtp.client-ip=209.85.215.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MHqsMXTV" Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-7a211a272c2so1857455a12.1; Mon, 29 Jul 2024 04:51:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722253907; x=1722858707; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=TBXlZtIXpxwGCC54MpHsk2hkjmskav/WyDY22uHOy5I=; b=MHqsMXTV7ECcNGNHMyuyT1TLB8qGB1Y9SGgnzNIkcNtk8JUws+IZ2vNnpV29cbFqpb gSKP8Pkn5uVuI6ogBa2AxoGRCblJQo55nXQRdlwCmMROAZKxwoeQeOfQNDVskEkPoeyy oljzmw40h47gXQ+iTlNVQl+G05/udSq6piV0YC4A+r9b1YyGYkYhnduaDMNDWFrZTCyg BD2C/pB74yUhtwDnLTfFTN2kDN2qoiJvpHefkGaLdUwWxs6Hw1jSV90/xfUftO17x/Fv PD8x/U/9CqBEw8+NwuiPl5a4W/bTNw18cTbtmKX51jkGM1xJiOTckmi5IYas8MjE9a8E Zt5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722253907; x=1722858707; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TBXlZtIXpxwGCC54MpHsk2hkjmskav/WyDY22uHOy5I=; b=oS29+gAM5xsYX5tCUMH2aQBTOLgC1/Igu3gUrP5tphuf5zTOrPRmb+pBX49vKM5mRA zm/ARqnr9qs8VkSWGpU8aSZ50ZULzlH8Ilc3/fjOuEUeUlYqREO1CLqAEBCLG457tk/K rB47CGo12FwCQK3KGjlAS+WwQNruRx7yIgHFZTAKgjgxLe0epGrxzkBN0aQ1luOJyQE6 zyDoRpfiERB/c4T5I1wWvFDogqiKzcwC5HFoeGZ8NbMEO8BEvQNPJ4auBblYfbJflRuH ooAftmvPV+3rncdJb5s5hro9aagOUCqRaGMh+oUscuX4PSZIde0qEhHwqOpla4tMRyF2 XFWw== X-Forwarded-Encrypted: i=1; AJvYcCVj9wWesiupVJLxXcRcbIF2/jyMDxnzjWXDNoLK2KvTikIs+CAeyS2gqgfHqkw9D/Q/e8iV77xVzkmb9+A=@vger.kernel.org X-Gm-Message-State: AOJu0YwO0uT545S4qXRlikPDaUJsHqJ+Ew8xrzoz2Wag8oyLQi+kphAy 8837Ffi/P89dTWL+Pn4HGWa1I5bsSjIBgdixxXfMBqrBtqyJT1Wchy8jSTwcxOSSaA== X-Google-Smtp-Source: AGHT+IGF+wjsrrV67Pij9SFqzeDliTRks/HuCmQeNAm0imaxPTBFAgavjvkH/vSIBPJzDV5Xqdcw6w== X-Received: by 2002:a17:90b:4a81:b0:2c3:34f4:5154 with SMTP id 98e67ed59e1d1-2cf7ce8754bmr12389745a91.1.1722253907060; Mon, 29 Jul 2024 04:51:47 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.100]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2cd8f7692f0sm6760987a91.1.2024.07.29.04.51.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 04:51:46 -0700 (PDT) From: Abhash Jha To: linux-iio@vger.kernel.org Cc: anshulusr@gmail.com, jic23@kernel.org, lars@metafoo.de, linux-kernel@vger.kernel.org, Abhash Jha Subject: [PATCH v3 2/3] iio: light: ltr390: Add ALS channel and support for gain and resolution Date: Mon, 29 Jul 2024 17:20:54 +0530 Message-ID: <20240729115056.355466-3-abhashkumarjha123@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729115056.355466-1-abhashkumarjha123@gmail.com> References: <20240729115056.355466-1-abhashkumarjha123@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add new ALS channel and allow reading raw and scale values. Also provide gain and resolution configuration for ALS channel. Add automatic mode switching between the UVS and ALS channel based on which channel is being accessed. The default mode in which the sensor start is ALS mode. Signed-off-by: Abhash Jha --- drivers/iio/light/ltr390.c | 109 ++++++++++++++++++++++++++++++++----- 1 file changed, 94 insertions(+), 15 deletions(-) diff --git a/drivers/iio/light/ltr390.c b/drivers/iio/light/ltr390.c index b79cd413f..79f5a516a 100644 --- a/drivers/iio/light/ltr390.c +++ b/drivers/iio/light/ltr390.c @@ -62,11 +62,17 @@ */ #define LTR390_WINDOW_FACTOR 1 +enum ltr390_mode { + LTR390_SET_ALS_MODE, + LTR390_SET_UVS_MODE, +}; + struct ltr390_data { struct regmap *regmap; struct i2c_client *client; /* Protects device from simulataneous reads */ struct mutex lock; + enum ltr390_mode mode; int gain; int int_time_us; }; @@ -94,6 +100,25 @@ static int ltr390_register_read(struct ltr390_data *data, u8 register_address) return get_unaligned_le24(recieve_buffer); } +static int ltr390_set_mode(struct ltr390_data *data, enum ltr390_mode mode) +{ + if (data->mode == mode) + return 0; + + switch (mode) { + case LTR390_SET_ALS_MODE: + regmap_clear_bits(data->regmap, LTR390_MAIN_CTRL, LTR390_UVS_MODE); + break; + + case LTR390_SET_UVS_MODE: + regmap_set_bits(data->regmap, LTR390_MAIN_CTRL, LTR390_UVS_MODE); + break; + } + + data->mode = mode; + return 0; +} + static int ltr390_read_raw(struct iio_dev *iio_device, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -104,15 +129,56 @@ static int ltr390_read_raw(struct iio_dev *iio_device, guard(mutex)(&data->lock); switch (mask) { case IIO_CHAN_INFO_RAW: - ret = ltr390_register_read(data, LTR390_UVS_DATA); - if (ret < 0) - return ret; + switch (chan->type) { + case IIO_UVINDEX: + ret = ltr390_set_mode(data, LTR390_SET_UVS_MODE); + if (ret < 0) + return ret; + + ret = ltr390_register_read(data, LTR390_UVS_DATA); + if (ret < 0) + return ret; + break; + + case IIO_INTENSITY: + ret = ltr390_set_mode(data, LTR390_SET_ALS_MODE); + if (ret < 0) + return ret; + + ret = ltr390_register_read(data, LTR390_ALS_DATA); + if (ret < 0) + return ret; + break; + + default: + return -EINVAL; + } + *val = ret; return IIO_VAL_INT; case IIO_CHAN_INFO_SCALE: - *val = LTR390_WINDOW_FACTOR; - *val2 = LTR390_COUNTS_PER_UVI; - return IIO_VAL_FRACTIONAL; + switch (chan->type) { + case IIO_UVINDEX: + ret = ltr390_set_mode(data, LTR390_SET_UVS_MODE); + if (ret < 0) + return ret; + + *val = LTR390_WINDOW_FACTOR; + *val2 = LTR390_COUNTS_PER_UVI; + return IIO_VAL_FRACTIONAL; + + case IIO_INTENSITY: + ret = ltr390_set_mode(data, LTR390_SET_ALS_MODE); + if (ret < 0) + return ret; + + *val = LTR390_WINDOW_FACTOR; + *val2 = data->gain; + return IIO_VAL_FRACTIONAL; + + default: + return -EINVAL; + } case IIO_CHAN_INFO_INT_TIME: *val = data->int_time_us; @@ -127,11 +193,23 @@ static int ltr390_read_raw(struct iio_dev *iio_device, static const int ltr390_int_time_map_us[] = { 400000, 200000, 100000, 50000, 25000, 12500 }; static const int ltr390_gain_map[] = { 1, 3, 6, 9, 18 }; -static const struct iio_chan_spec ltr390_channel = { - .type = IIO_UVINDEX, - .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), - .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_INT_TIME), - .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_INT_TIME) | BIT(IIO_CHAN_INFO_SCALE) +static const struct iio_chan_spec ltr390_channels[] = { + /* UV sensor */ + { + .type = IIO_UVINDEX, + .scan_index = 0, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_INT_TIME) | BIT(IIO_CHAN_INFO_SCALE) + }, + /* ALS sensor */ + { + .type = IIO_INTENSITY, + .scan_index = 1, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE), + .info_mask_shared_by_all = BIT(IIO_CHAN_INFO_INT_TIME), + .info_mask_shared_by_all_available = BIT(IIO_CHAN_INFO_INT_TIME) | BIT(IIO_CHAN_INFO_SCALE) + }, }; static int ltr390_set_gain(struct ltr390_data *data, int val) @@ -251,12 +329,14 @@ static int ltr390_probe(struct i2c_client *client) data->int_time_us = 100000; /* default value of gain from pg: 16 of the datasheet */ data->gain = 3; + /* default mode for ltr390 is ALS mode */ + data->mode = LTR390_SET_ALS_MODE; mutex_init(&data->lock); indio_dev->info = <r390_info; - indio_dev->channels = <r390_channel; - indio_dev->num_channels = 1; + indio_dev->channels = ltr390_channels; + indio_dev->num_channels = ARRAY_SIZE(ltr390_channels); indio_dev->name = "ltr390"; ret = regmap_read(data->regmap, LTR390_PART_ID, &part_number); @@ -274,8 +354,7 @@ static int ltr390_probe(struct i2c_client *client) /* Wait for the registers to reset before proceeding */ usleep_range(1000, 2000); - ret = regmap_set_bits(data->regmap, LTR390_MAIN_CTRL, - LTR390_SENSOR_ENABLE | LTR390_UVS_MODE); + ret = regmap_set_bits(data->regmap, LTR390_MAIN_CTRL, LTR390_SENSOR_ENABLE); if (ret) return dev_err_probe(dev, ret, "failed to enable the sensor\n"); From patchwork Mon Jul 29 11:50:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Abhash Jha X-Patchwork-Id: 13744775 Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1A782149E0E; Mon, 29 Jul 2024 11:51:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.180 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253916; cv=none; b=mopeskiYURh0XjxlxPAqPJkcN+Tp5n0KU6RFVr4BSVR9xTF32n5vlUnBv1Rh70C1ntBHZV9CIldRGyHVkbo9aZpK+deoaA83ttPDwkvztqZk38XmKkvWTYMWC0ur51KGS1xrZ9wPOX3oK7MmmQkI6FQzh2u1APYQUau94ol2Cj4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1722253916; c=relaxed/simple; bh=4HCffACfMnUeNPUu7Hcwx9FsdGsQwVRifBkP6WtEeQA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KBxaxAuZI7kkO6rvkXhHcU4O+vqDvYdm+CudVZFp0AgGBRP8wGclZAyj8k9usSiUzWwgHtxzNJg3yv3Wy/X3lVW0ZiwAVo3MJcFgLIECSeC/EdGLikuBVjU5t+qFLnSgCoxOOaVq3KuIxp1Bc0jo6Iuo4OABNNJh24IjFWDCMis= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Tu2F04bP; arc=none smtp.client-ip=209.85.210.180 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Tu2F04bP" Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-70d399da0b5so2698556b3a.3; Mon, 29 Jul 2024 04:51:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1722253914; x=1722858714; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/ijrVq/IlpFEKBloYw5MT83j0yPX8QqiotVSowdQK84=; b=Tu2F04bPOWU39Z92OtQEoPFO/9H9J9WnAUcyAFo+bMP/bsxlNHr+AUizUcWh0U28an zsPEnr2aqUf/fz9jtKgMZnVasvYjLeXFNDXkuE50pVoIjtnyWC4yCWaHr+AvSoB9FRVi OkH2f0Ttrq7dZ/QbjcxgEcYOe477FwKpDPXJJVJtoZQfhiwNAB6J3acfY8Bc8llx18AW nRNxesVQCNaL4J7rWWM7E4YrSnFnLLA/MmcRMluKOKhaoTGijVRqsiJm2d09AuVNAybL dkgjsFh7ipxplpk/s0PqZWevh1yaP5FOA8susCr49LAxEKsf/3fws8jKXj+AjLJLuV1p IwQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1722253914; x=1722858714; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/ijrVq/IlpFEKBloYw5MT83j0yPX8QqiotVSowdQK84=; b=K2GqeKKNoWA4BF2B3vW9zhYvwrWvCPDL3t3pbS4f1B/uAFKsE+SFUH445uDmzzlFex Zc5PI6mEsBI+NPgny6bL1tz9EjFZtuj+HmYgsy0Blz4ODgrmaAxSWYn7jBeip/yLSFb3 oFLni1u1p+JCDSrHURgtJxALLJthQahqH+SCiEsmO+3TTzJvwW2buYu6C4IkbOeTASwE NuokukOWGU/oXcXXu3hmqIMFQcF4DihpZy1VKd3ooYSuh30OdrbLKOFH8p+22K8E/vbO HlNcUdWaqlCJJ4hV0NPLgtBs4wymdmKVmrfMBwrzB6C2RgHfvYBGyYNtgRf3N6q+T/fU 0zDA== X-Forwarded-Encrypted: i=1; AJvYcCXgNGUzlJCsRdHvph//VPp+4TacrIbf1Ww2bxMfE8U3/X+McG3ohn78xcSD/Akx7wHtwLzCF5pebbV0jD72Lk9yJDojl8/JqVoHDRHl X-Gm-Message-State: AOJu0YwxQ3ntRpeltsbMLyHG/mn7vGZpIjpiXCzE0VTQYO4ISX/hLM+l kwc82P/1HKebmPSXOS685d+BzThhFjmC+i+Rlax4OHS9ZyYNYzuXFYoGYQZc038/9A== X-Google-Smtp-Source: AGHT+IHr9vW59MWTmsjFeW74/VYGlSKKWrlM47p/n6Hr26QWUtn+RjmS4n6KrGNZrvaEz9wL6xEgzQ== X-Received: by 2002:a05:6a20:158e:b0:1c4:2469:f893 with SMTP id adf61e73a8af0-1c4a14ded1amr10792108637.46.1722253913615; Mon, 29 Jul 2024 04:51:53 -0700 (PDT) Received: from localhost.localdomain ([136.233.9.100]) by smtp.googlemail.com with ESMTPSA id 98e67ed59e1d1-2cd8f7692f0sm6760987a91.1.2024.07.29.04.51.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Jul 2024 04:51:53 -0700 (PDT) From: Abhash Jha To: linux-iio@vger.kernel.org Cc: anshulusr@gmail.com, jic23@kernel.org, lars@metafoo.de, linux-kernel@vger.kernel.org, Abhash Jha Subject: [PATCH v3 3/3] iio: light: ltr390: Calculate 'counts_per_uvi' dynamically Date: Mon, 29 Jul 2024 17:20:55 +0530 Message-ID: <20240729115056.355466-4-abhashkumarjha123@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240729115056.355466-1-abhashkumarjha123@gmail.com> References: <20240729115056.355466-1-abhashkumarjha123@gmail.com> Precedence: bulk X-Mailing-List: linux-iio@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 counts_per_uvi depends on the current value of gain and resolution. Hence, we cannot use the hardcoded value 96. The `counts_per_uvi` function gives the count based on the current gain and resolution (integration time). Signed-off-by: Abhash Jha --- drivers/iio/light/ltr390.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/drivers/iio/light/ltr390.c b/drivers/iio/light/ltr390.c index 79f5a516a..dacbe9f62 100644 --- a/drivers/iio/light/ltr390.c +++ b/drivers/iio/light/ltr390.c @@ -45,6 +45,8 @@ #define LTR390_UVS_MODE BIT(3) #define LTR390_SENSOR_ENABLE BIT(1) +#define LTR390_FRACTIONAL_PRECISION 100 + /* * At 20-bit resolution (integration time: 400ms) and 18x gain, 2300 counts of * the sensor are equal to 1 UV Index [Datasheet Page#8]. @@ -119,6 +121,16 @@ static int ltr390_set_mode(struct ltr390_data *data, enum ltr390_mode mode) return 0; } +static int ltr390_counts_per_uvi(struct ltr390_data *data) +{ + int orig_gain = 18; + int orig_int_time = 400; + int divisor = orig_gain * orig_int_time; + int gain = data->gain; + + return DIV_ROUND_CLOSEST(23 * gain * data->int_time_us, 10 * divisor); +} + static int ltr390_read_raw(struct iio_dev *iio_device, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -163,8 +175,8 @@ static int ltr390_read_raw(struct iio_dev *iio_device, if (ret < 0) return ret; - *val = LTR390_WINDOW_FACTOR; - *val2 = LTR390_COUNTS_PER_UVI; + *val = LTR390_WINDOW_FACTOR * LTR390_FRACTIONAL_PRECISION; + *val2 = ltr390_counts_per_uvi(data); return IIO_VAL_FRACTIONAL; case IIO_INTENSITY: