From patchwork Mon Oct 2 12:33:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matti Vaittinen X-Patchwork-Id: 147442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1653687vqb; Mon, 2 Oct 2023 12:46:50 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFBgYJxzd2noCm2q+72qX5ugsjQishO4DoVyGA/N3lK/oBiXh+/zTiSSWH3UWT4xCILc377 X-Received: by 2002:a05:6a00:2d0e:b0:692:780a:de90 with SMTP id fa14-20020a056a002d0e00b00692780ade90mr11535797pfb.30.1696276009497; Mon, 02 Oct 2023 12:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696276009; cv=none; d=google.com; s=arc-20160816; b=QVcX3LM18wpNSA0daX18OXqti2NzL0+OaAL+b0ClrwT4PBo+jNK3d15Q4COKz9/h/w qZAX3tGFR5pv4lGnD2Nj2YRu9F7BoQXLxan7CdIgkg0Mhzj24XMLy6AMi1X9zt6GdObl /LSVWhrLswCrQGvAaDspCg6jrMmzQgO3oTQJ1YC9EurosiLLEV8ioWMkFtaCchhi9VGG EZR5zauoiB8fzngSs5bzgAMjnANYgaZ1Z0zMrK2/AsC3C0dLWU2nr2qJrxlgIpna/1Oz /dLRBNg4pdS/64790VNI9o+duU25oZimBdNGHxKm7THNiQO0g1nARfu2oIO9wjMOI2b9 CdaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-disposition:mime-version:message-id :subject:cc:to:from:date:dkim-signature; bh=5ccscJTYG0Q2IcsDa7Ds1vsKDg7Jem9n0Wcf6EhcTis=; fh=1h4YjSgDDTHCV92oKY/OJnApqRtzfV+67imdyGUaLZQ=; b=s0J3DasUypNuNVtEMto9gTZApIAdATFX8hc0rjZc00y0jN58oUOUp42P+vtfKmlkLg DUCWHht3uLzGkDY9m6zEero+wHyBQjot8MaP3A5k0Lan5le5kjaenWVrE7+a9OWdxuys rsy6s98DiIhvNBLeDJeJ5KWCxEWVAK7R4HtGJYvY3FTBsBHxA9P232hAs+oxivhpYsMe wP2JupyuL9FqrRxHuHvNbbkSgAbQPUbNHGYCw2XWdbj/HYqK2DnpClocb85ew4lY+D8a 57aXsDnMUjYMo5PDp0d1HS0M86WrDRNtENAbcNVm/znseLBwwz2IsbyHR3zf7H6u6vy2 NZCw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bvqKJnm8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id cg10-20020a056a00290a00b00690f8063627si27219498pfb.38.2023.10.02.12.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 12:46:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=bvqKJnm8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by groat.vger.email (Postfix) with ESMTP id 176A880295F5; Mon, 2 Oct 2023 05:34:12 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236623AbjJBMdz (ORCPT + 18 others); Mon, 2 Oct 2023 08:33:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236662AbjJBMdy (ORCPT ); Mon, 2 Oct 2023 08:33:54 -0400 Received: from mail-lf1-x12a.google.com (mail-lf1-x12a.google.com [IPv6:2a00:1450:4864:20::12a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D66883; Mon, 2 Oct 2023 05:33:50 -0700 (PDT) Received: by mail-lf1-x12a.google.com with SMTP id 2adb3069b0e04-5031ccf004cso25182166e87.2; Mon, 02 Oct 2023 05:33:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1696250029; x=1696854829; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=5ccscJTYG0Q2IcsDa7Ds1vsKDg7Jem9n0Wcf6EhcTis=; b=bvqKJnm8/jhYB5M7lpD3Z2w5qUwW4WSVkisCvHg99QAiuWjzJ3NSLbwDTvjWA1gxgq U5dR3nVxXFUl4zYbUSxv850oclNRBt+Y/dZ7GA2xE1Ysxi7AFHisV3BrsMsLMf42ZOqb keVZBsBpZbmM/YRL+Exc7RayJ+Dm0CDA3JshMT0kplvSHK+VwjjDIQskjjIphOuVP/8u nSRD3pImzs+zWK9E55E9J0GuRZXDw/g5QYQNcBT+UWxZgPXuC1oE1FPxczJo85Tq/XlK DXfDfAZsAj7sfPQgz2y7lcom3gwXuIHcirOLz1DiafJ3G0+mf9c1yTzA/iPiSvkz+TGr 0XfA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1696250029; x=1696854829; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5ccscJTYG0Q2IcsDa7Ds1vsKDg7Jem9n0Wcf6EhcTis=; b=FlPTzRfPMg7GwTxvkpZ1IIafVWy2yMtm1GAga7pswg73G6v1mzzKlmCuZb+zJ40RWF aN8N3AkL2fsWgXPOXyFzOpA1nzV9+6G9MSrfT14+/EP60YxX8Xad5ey6h7oRPHkxYijd RPTb2WBnN1Vogqgo793Nzhd9nRFvaI2qtlc3Wp95CoybNPwSSXt5DUf3IKWiuC4lp8kg G0AmgANv+hZM2cmMxq4WvHyWs8Zn6RuKjIoBd1DlsipcpuW+v7vxtl6rD6Flvx4E8xJ0 xPNFn/onHVS64d0+v+8NobTdOOoOoOd5xbKfjqQ1vvBL6SyW0rP29xtRHGF4qQV87F+G AG6A== X-Gm-Message-State: AOJu0Yx35+EuRpEOGL1nUcrMIYSjQHrAgy/zTBhLd/WDZxYxGhmEVQ5m 2ukvl6HgVPbZBe2dtjXqODI= X-Received: by 2002:a05:6512:3295:b0:503:5d8:da2e with SMTP id p21-20020a056512329500b0050305d8da2emr8122821lfe.13.1696250028454; Mon, 02 Oct 2023 05:33:48 -0700 (PDT) Received: from dc78bmyyyyyyyyyyyyydt-3.rev.dnainternet.fi (dc78bmyyyyyyyyyyyyydt-3.rev.dnainternet.fi. [2001:14ba:16f8:1500::7]) by smtp.gmail.com with ESMTPSA id o1-20020ac24341000000b004fe1bc7e4acsm4749638lfl.131.2023.10.02.05.33.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 05:33:47 -0700 (PDT) Date: Mon, 2 Oct 2023 15:33:41 +0300 From: Matti Vaittinen To: Matti Vaittinen , Matti Vaittinen Cc: Matti Vaittinen , Jonathan Cameron , Lars-Peter Clausen , linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] iio: bu27008: Add processed illuminance channel Message-ID: MIME-Version: 1.0 Content-Disposition: inline X-Spam-Status: No, score=-0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (groat.vger.email [0.0.0.0]); Mon, 02 Oct 2023 05:34:12 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778674313377063685 X-GMAIL-MSGID: 1778674313377063685 The RGB + IR data can be used to calculate illuminance value (Luxes). Implement the equation obtained from the ROHM HW colleagues and add a light data channel outputting illuminance values in (nano) Luxes. Both the read_raw and buffering values is supported, with the limitation that buffering is only allowed when suitable scan-mask is used. (RGB+IR, no clear). The equation has been developed by ROHM HW colleagues for open air sensor. Adding any lens to the sensor is likely to impact to the used c1, c2, c3 coefficients. Also, The output values have only been tested on BU27008. According to the HW colleagues, the very same equation should work also on BU27010. Calculate and output illuminance values from BU27008 and BU27010. Signed-off-by: Matti Vaittinen --- I did very dummy testing at very normal daylight inside a building. No special equipments were used - I simply compared values computed from BU27008 RGB+IR channels, to values displayed by the ALS in my mobile phone. Results were roughly the same (around 400 lux). Couldn't repeat test on BU27010, but the data it outputs should be same format as BU27008 data so equation should work for both sensors. --- drivers/iio/light/rohm-bu27008.c | 216 ++++++++++++++++++++++++++++++- 1 file changed, 211 insertions(+), 5 deletions(-) base-commit: 5e99f692d4e32e3250ab18d511894ca797407aec diff --git a/drivers/iio/light/rohm-bu27008.c b/drivers/iio/light/rohm-bu27008.c index 6a6d77805091..d480cf761377 100644 --- a/drivers/iio/light/rohm-bu27008.c +++ b/drivers/iio/light/rohm-bu27008.c @@ -130,6 +130,7 @@ * @BU27008_BLUE: Blue channel. Via data2 (when used). * @BU27008_CLEAR: Clear channel. Via data2 or data3 (when used). * @BU27008_IR: IR channel. Via data3 (when used). + * @BU27008_LUX: Illuminance channel, computed using RGB and IR. * @BU27008_NUM_CHANS: Number of channel types. */ enum bu27008_chan_type { @@ -138,6 +139,7 @@ enum bu27008_chan_type { BU27008_BLUE, BU27008_CLEAR, BU27008_IR, + BU27008_LUX, BU27008_NUM_CHANS }; @@ -172,6 +174,8 @@ static const unsigned long bu27008_scan_masks[] = { ALWAYS_SCANNABLE | BIT(BU27008_CLEAR) | BIT(BU27008_IR), /* buffer is R, G, B, IR */ ALWAYS_SCANNABLE | BIT(BU27008_BLUE) | BIT(BU27008_IR), + /* buffer is R, G, B, IR, LUX */ + ALWAYS_SCANNABLE | BIT(BU27008_BLUE) | BIT(BU27008_IR) | BIT(BU27008_LUX), 0 }; @@ -331,6 +335,19 @@ static const struct iio_chan_spec bu27008_channels[] = { * Hence we don't advertise available ones either. */ BU27008_CHAN(IR, DATA3, 0), + { + .type = IIO_LIGHT, + .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | + BIT(IIO_CHAN_INFO_SCALE), + .channel = BU27008_LUX, + .scan_index = BU27008_LUX, + .scan_type = { + .sign = 'u', + .realbits = 64, + .storagebits = 64, + .endianness = IIO_CPU, + }, + }, IIO_CHAN_SOFT_TIMESTAMP(BU27008_NUM_CHANS), }; @@ -1004,6 +1021,183 @@ static int bu27008_read_one(struct bu27008_data *data, struct iio_dev *idev, return ret; } +static int bu27008_get_rgb_ir(struct bu27008_data *data, unsigned int *red, + unsigned int *green, unsigned int *blue, unsigned int *ir) +{ + int ret, chan_sel, int_time, tmpret, valid; + __le16 chans[BU27008_NUM_HW_CHANS]; + + chan_sel = BU27008_BLUE2_IR3 << (ffs(data->cd->chan_sel_mask) - 1); + + ret = regmap_update_bits(data->regmap, data->cd->chan_sel_reg, + data->cd->chan_sel_mask, chan_sel); + if (ret) + return ret; + + ret = bu27008_meas_set(data, true); + if (ret) + return ret; + + ret = bu27008_get_int_time_us(data); + if (ret < 0) + int_time = BU27008_MEAS_TIME_MAX_MS; + else + int_time = ret / USEC_PER_MSEC; + + msleep(int_time); + + ret = regmap_read_poll_timeout(data->regmap, data->cd->valid_reg, + valid, (valid & BU27008_MASK_VALID), + BU27008_VALID_RESULT_WAIT_QUANTA_US, + BU27008_MAX_VALID_RESULT_WAIT_US); + if (ret) + goto out; + + ret = regmap_bulk_read(data->regmap, BU27008_REG_DATA0_LO, chans, + sizeof(chans)); + if (ret) + goto out; + + *red = le16_to_cpu(chans[0]); + *green = le16_to_cpu(chans[1]); + *blue = le16_to_cpu(chans[2]); + *ir = le16_to_cpu(chans[3]); + +out: + tmpret = bu27008_meas_set(data, false); + if (tmpret) + dev_warn(data->dev, "Stopping measurement failed\n"); + + return ret; +} + +/* + * Following equation for computing lux out of register values was given by + * ROHM HW colleagues; + * + * Red = RedData*1024 / Gain * 20 / meas_mode + * Green = GreenData* 1024 / Gain * 20 / meas_mode + * Blue = BlueData* 1024 / Gain * 20 / meas_mode + * IR = IrData* 1024 / Gain * 20 / meas_mode + * + * where meas_mode is the integration time in mS / 10 + * + * IRratio = (IR > 0.18 * Green) ? 0 : 1 + * + * Lx = max(c1*Red + c2*Green + c3*Blue,0) + * + * for + * IRratio 0: c1 = -0.00002237, c2 = 0.0003219, c3 = -0.000120371 + * IRratio 1: c1 = -0.00001074, c2 = 0.000305415, c3 = -0.000129367 + */ + +/* + * The max chan data is 0xffff. When we multiply it by 1024 * 20, we'll get + * 0x4FFFB000 which still fits in 32-bit integer. So this can't overflow. + */ +#define NORM_CHAN_DATA_FOR_LX_CALC(chan, gain, time) ((chan) * 1024 * 20 / \ + (gain) / (time)) +static u64 bu27008_calc_nlux(struct bu27008_data *data, unsigned int red, + unsigned int green, unsigned int blue, unsigned int ir, + unsigned int gain, unsigned int gain_ir, unsigned int time) +{ + s64 c1, c2, c3, nlux; + + time /= 10000; + ir = NORM_CHAN_DATA_FOR_LX_CALC(ir, gain_ir, time); + red = NORM_CHAN_DATA_FOR_LX_CALC(red, gain, time); + green = NORM_CHAN_DATA_FOR_LX_CALC(green, gain, time); + blue = NORM_CHAN_DATA_FOR_LX_CALC(blue, gain, time); + + if ((u64)ir * 100LLU > 18LLU * (u64)green) { + c1 = -22370; + c2 = 321900; + c3 = -120371; + } else { + c1 = -10740; + c2 = 305415; + c3 = -129367; + } + nlux = c1 * red + c2 * green + c3 * blue; + if (nlux < 0) + nlux = 0; + + return nlux; +} + +static int bu27008_get_time_n_gains(struct bu27008_data *data, + unsigned int *gain, unsigned int *gain_ir, unsigned int *time) +{ + int ret; + + ret = bu27008_get_gain(data, &data->gts, gain); + if (ret < 0) + return ret; + + ret = bu27008_get_gain(data, &data->gts_ir, gain_ir); + if (ret < 0) + return ret; + + ret = bu27008_get_int_time_us(data); + if (ret < 0) + return ret; + + /* Max integration time is 400000i. Fits in signed int. */ + *time = ret; + + return 0; +} + +struct bu27008_buf { + __le16 chan[BU27008_NUM_HW_CHANS]; + u64 lux __aligned(8); + s64 ts __aligned(8); +}; + +static int bu27008_buffer_get_lux(struct bu27008_data *data, + struct bu27008_buf *raw) +{ + unsigned int red, green, blue, ir, gain, gain_ir, time; + int ret; + + red = le16_to_cpu(raw->chan[0]); + green = le16_to_cpu(raw->chan[1]); + blue = le16_to_cpu(raw->chan[2]); + ir = le16_to_cpu(raw->chan[3]); + ret = bu27008_get_time_n_gains(data, &gain, &gain_ir, &time); + if (ret) + return ret; + + raw->lux = bu27008_calc_nlux(data, red, green, blue, ir, gain, gain_ir, + time); + + return 0; +} + +static int bu27008_read_lux(struct bu27008_data *data, struct iio_dev *idev, + struct iio_chan_spec const *chan, + int *val, int *val2) +{ + unsigned int red, green, blue, ir, gain, gain_ir, time; + u64 nlux; + int ret; + + ret = bu27008_get_rgb_ir(data, &red, &green, &blue, &ir); + if (ret) + return ret; + + ret = bu27008_get_time_n_gains(data, &gain, &gain_ir, &time); + if (ret) + return ret; + + nlux = bu27008_calc_nlux(data, red, green, blue, ir, gain, gain_ir, + time); + *val = (int)nlux; + *val2 = nlux >> 32LLU; + + return IIO_VAL_INT_64; +} + static int bu27008_read_raw(struct iio_dev *idev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -1012,13 +1206,17 @@ static int bu27008_read_raw(struct iio_dev *idev, int busy, ret; switch (mask) { + case IIO_CHAN_INFO_RAW: busy = iio_device_claim_direct_mode(idev); if (busy) return -EBUSY; mutex_lock(&data->mutex); - ret = bu27008_read_one(data, idev, chan, val, val2); + if (chan->type == IIO_LIGHT) + ret = bu27008_read_lux(data, idev, chan, val, val2); + else + ret = bu27008_read_one(data, idev, chan, val, val2); mutex_unlock(&data->mutex); iio_device_release_direct_mode(idev); @@ -1026,6 +1224,11 @@ static int bu27008_read_raw(struct iio_dev *idev, return ret; case IIO_CHAN_INFO_SCALE: + if (chan->type == IIO_LIGHT) { + *val = 0; + *val2 = 1; + return IIO_VAL_INT_PLUS_NANO; + } ret = bu27008_get_scale(data, chan->scan_index == BU27008_IR, val, val2); if (ret) @@ -1231,15 +1434,13 @@ static const struct iio_trigger_ops bu27008_trigger_ops = { .reenable = bu27008_trigger_reenable, }; + static irqreturn_t bu27008_trigger_handler(int irq, void *p) { struct iio_poll_func *pf = p; struct iio_dev *idev = pf->indio_dev; struct bu27008_data *data = iio_priv(idev); - struct { - __le16 chan[BU27008_NUM_HW_CHANS]; - s64 ts __aligned(8); - } raw; + struct bu27008_buf raw; int ret, dummy; memset(&raw, 0, sizeof(raw)); @@ -1256,6 +1457,11 @@ static irqreturn_t bu27008_trigger_handler(int irq, void *p) sizeof(raw.chan)); if (ret < 0) goto err_read; + if (test_bit(BU27008_LUX, idev->active_scan_mask)) { + ret = bu27008_buffer_get_lux(data, &raw); + if (ret) + goto err_read; + } iio_push_to_buffers_with_timestamp(idev, &raw, pf->timestamp); err_read: