Received: by 2002:a05:6358:9144:b0:117:f937:c515 with SMTP id r4csp5845621rwr; Tue, 9 May 2023 07:05:43 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4rnuA6SADqiTVO2sf8nv8s2m+SHtlw8eHhq92b+8YCCGFiQvc+Hzp8N7Ozg+iTiHqhkV8o X-Received: by 2002:a17:902:da84:b0:1ac:a28e:4b29 with SMTP id j4-20020a170902da8400b001aca28e4b29mr1857581plx.26.1683641143073; Tue, 09 May 2023 07:05:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683641143; cv=none; d=google.com; s=arc-20160816; b=vhDkG/jdU+F1pRW0/ho+luTkWgJDVSkpvN4yRJvYz884PIJNHjS7lCubiUrB8SLX+r qhC2/ftC0SXHI03RUvTOIH/wfOUYtJ0ZiILjY+byv+t1SirJ3biErRvM3Xo5YO8qJthL 4z0Ao8dU3wVIf35zjpN0aCF5QaSDo5FyBaI5NyY3VaDiDGdgU5C3RyVvy8lsQJSBrnVP 3hMH4jztgWMyLi/RU975NEc1EA7TT47jDasJRktYwRzGWlxLv/AtSnR6g5VjearPa46G S0rVNiWWH1MtDE//eGMc5nDfSKxzsoRxd9lCGh9fNX7w4RlNZ777k4z4hn0J8VHLzQkO HFng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QuK79GFmYf4uj+jtkzxxrSS2hQm5roAwqGNt6wwbEl0=; b=ab0S2SITUt4U2dU1+80gHkrtx/2YG6069SiX23zDJHb8RLrHBkoGnBp31Rm+dCQyD9 ySycaRxQhTBqBBqQx3Sw3Qph4sEiMfvJ5vZeY+t2vmADAkgkdxZlLM2PhNS2QYgy3rhQ zBPXhBieAQRTs96t2IQTqhG6IqE9MPIioSgG6m1OLuDXLb/Eiyf8zpkX+cv1S3A8LCMb xvQ77NCohFF+9B+Llo2uRmp98CwdmP3EM1u9khISYRWXUadG818YqXdXnNgMbzDaGB8U L0wABlm/jqS9kbEV6kbzuqN7BKp3cIpLNfkcJ5I3eHV07842Gjdi5H7VUIgA6Xa0RR9Z N3wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=PocDJrag; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id n2-20020a637202000000b0050be719abc9si1520878pgc.167.2023.05.09.07.05.23; Tue, 09 May 2023 07:05:43 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@axis.com header.s=axis-central1 header.b=PocDJrag; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=axis.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235768AbjEIOCb (ORCPT + 99 others); Tue, 9 May 2023 10:02:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46940 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235719AbjEIOCT (ORCPT ); Tue, 9 May 2023 10:02:19 -0400 Received: from smtp2.axis.com (smtp2.axis.com [195.60.68.18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 066A6359D; Tue, 9 May 2023 07:02:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=axis.com; q=dns/txt; s=axis-central1; t=1683640932; x=1715176932; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QuK79GFmYf4uj+jtkzxxrSS2hQm5roAwqGNt6wwbEl0=; b=PocDJragBqIn/j2KtFUZHrqhqa89oJ9H5rFwVZKndjEZxeeNUjZpWlYe LPII0oY3hP3a+lRmiCfZb/JMpBBCtcBEXW9CBInjXPtEX6YPk0kR20wAw bLYaW77ebyRzZKXyNqw0MeY89bknHYZtuBt14knlZYaKcPxxAwzrbnQel 1B2eeXQKInI22BEpUSVVvWGU8u5UWS/vIrxuLRn7Ao4P3JIoGu++/SUHm XJGXf/4h1lkH7OoIpGLDxGA4MsG4PoQI45A9A/JcreYakko8Gda+L61ZM ATdp6XdLU0LY9RHd7YnVZtMovpNpkBTA7bkMUBK9eHobDPrwUtMusjeZb A==; From: Astrid Rost To: Jonathan Cameron , Lars-Peter Clausen CC: , , , Astrid Rost Subject: [PATCH v2 5/7] iio: light: vcnl4000: Add debounce count for vcnl4040/4200 Date: Tue, 9 May 2023 16:01:51 +0200 Message-ID: <20230509140153.3279288-6-astrid.rost@axis.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20230509140153.3279288-1-astrid.rost@axis.com> References: <20230509140153.3279288-1-astrid.rost@axis.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_PASS, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add read/write attribute for proximity and illumination debounce-count and read attribute for available debounce-counts. The debounce-count is set in the interrupt persistence flags (PS_PERS and ALS_PERS). An interrupt will not be asserted if the raw value is not over (or lower) than the threshold for the set continued refresh times. This is supported for vcnl4040 vcnl4200. Signed-off-by: Astrid Rost --- drivers/iio/light/vcnl4000.c | 156 ++++++++++++++++++++++++++++++++++- 1 file changed, 152 insertions(+), 4 deletions(-) diff --git a/drivers/iio/light/vcnl4000.c b/drivers/iio/light/vcnl4000.c index 68eea686b2dc..b8ce4ed6b0bb 100644 --- a/drivers/iio/light/vcnl4000.c +++ b/drivers/iio/light/vcnl4000.c @@ -84,8 +84,10 @@ #define VCNL4040_ALS_CONF_ALS_SHUTDOWN BIT(0) #define VCNL4040_ALS_CONF_IT GENMASK(7, 6) /* Ambient integration time */ #define VCNL4040_ALS_CONF_INT_EN BIT(1) /* Ambient light Interrupt enable */ +#define VCNL4040_ALS_CONF_PERS GENMASK(3, 2) /* Ambient interrupt persistence setting */ #define VCNL4040_PS_CONF1_PS_SHUTDOWN BIT(0) #define VCNL4040_PS_CONF2_PS_IT GENMASK(3, 1) /* Proximity integration time */ +#define VCNL4040_CONF1_PS_PERS GENMASK(5, 4) /* Proximity interrupt persistence setting */ #define VCNL4040_PS_CONF2_PS_INT GENMASK(9, 8) /* Proximity interrupt mode */ #define VCNL4040_PS_IF_AWAY BIT(8) /* Proximity event cross low threshold */ #define VCNL4040_PS_IF_CLOSE BIT(9) /* Proximity event cross high threshold */ @@ -153,6 +155,9 @@ static const int vcnl4200_als_it_times[][2] = { {0, 400000}, }; +static const int vcnl4040_als_debounce_count[] = {1, 2, 4, 8}; +static const int vcnl4040_ps_debounce_count[] = {1, 2, 3, 4}; + #define VCNL4000_SLEEP_DELAY_MS 2000 /* before we enter pm_runtime_suspend */ enum vcnl4000_device_ids { @@ -680,6 +685,106 @@ static ssize_t vcnl4040_write_ps_it(struct vcnl4000_data *data, int val) return ret; } +static ssize_t vcnl4040_read_als_debounce_count(struct vcnl4000_data *data, int *val) +{ + int ret; + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_AL_CONF); + if (ret < 0) + return ret; + + ret = FIELD_GET(VCNL4040_ALS_CONF_PERS, ret); + + if (ret >= ARRAY_SIZE(vcnl4200_als_it_times)) + return -EINVAL; + + *val = vcnl4040_als_debounce_count[ret]; + + return ret; +} + +static ssize_t vcnl4040_write_als_debounce_count(struct vcnl4000_data *data, int val) +{ + unsigned int i; + int ret, index = -1; + u16 regval; + + for (i = 0; i < ARRAY_SIZE(vcnl4040_als_debounce_count); i++) { + if (val == vcnl4040_als_debounce_count[i]) { + index = i; + break; + } + } + + if (index < 0) + return -EINVAL; + + mutex_lock(&data->vcnl4000_lock); + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_AL_CONF); + if (ret < 0) + goto out; + + regval = (ret & ~VCNL4040_ALS_CONF_PERS) | + FIELD_PREP(VCNL4040_ALS_CONF_PERS, index); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, + regval); + +out: + mutex_unlock(&data->vcnl4000_lock); + return ret; +} + +static ssize_t vcnl4040_read_ps_debounce_count(struct vcnl4000_data *data, int *val) +{ + int ret; + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); + if (ret < 0) + return ret; + + ret = FIELD_GET(VCNL4040_CONF1_PS_PERS, ret); + + if (ret >= ARRAY_SIZE(vcnl4200_ps_it_times)) + return -EINVAL; + + *val = vcnl4040_ps_debounce_count[ret]; + + return ret; +} + +static ssize_t vcnl4040_write_ps_debounce_count(struct vcnl4000_data *data, int val) +{ + unsigned int i; + int ret, index = -1; + u16 regval; + + for (i = 0; i < ARRAY_SIZE(vcnl4040_ps_debounce_count); i++) { + if (val == vcnl4040_ps_debounce_count[i]) { + index = i; + break; + } + } + + if (index < 0) + return -EINVAL; + + mutex_lock(&data->vcnl4000_lock); + + ret = i2c_smbus_read_word_data(data->client, VCNL4200_PS_CONF1); + if (ret < 0) + goto out; + + regval = (ret & ~VCNL4040_CONF1_PS_PERS) | + FIELD_PREP(VCNL4040_CONF1_PS_PERS, index); + ret = i2c_smbus_write_word_data(data->client, VCNL4200_PS_CONF1, + regval); + +out: + mutex_unlock(&data->vcnl4000_lock); + return ret; +} + static int vcnl4000_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, long mask) @@ -730,6 +835,21 @@ static int vcnl4000_read_raw(struct iio_dev *indio_dev, if (ret < 0) return ret; return IIO_VAL_INT_PLUS_MICRO; + case IIO_CHAN_INFO_DEBOUNCE_COUNT: + switch (chan->type) { + case IIO_LIGHT: + ret = vcnl4040_read_als_debounce_count(data, val); + break; + case IIO_PROXIMITY: + ret = vcnl4040_read_ps_debounce_count(data, val); + break; + default: + return -EINVAL; + } + if (ret < 0) + return ret; + return IIO_VAL_INT; + default: return -EINVAL; } @@ -753,6 +873,15 @@ static int vcnl4040_write_raw(struct iio_dev *indio_dev, default: return -EINVAL; } + case IIO_CHAN_INFO_DEBOUNCE_COUNT: + switch (chan->type) { + case IIO_LIGHT: + return vcnl4040_write_als_debounce_count(data, val); + case IIO_PROXIMITY: + return vcnl4040_write_ps_debounce_count(data, val); + default: + return -EINVAL; + } default: return -EINVAL; } @@ -791,6 +920,21 @@ static int vcnl4040_read_avail(struct iio_dev *indio_dev, } *type = IIO_VAL_INT_PLUS_MICRO; return IIO_AVAIL_LIST; + case IIO_CHAN_INFO_DEBOUNCE_COUNT: + switch (chan->type) { + case IIO_LIGHT: + *vals = (int *)vcnl4040_als_debounce_count; + *length = ARRAY_SIZE(vcnl4040_als_debounce_count); + break; + case IIO_PROXIMITY: + *vals = (int *)vcnl4040_ps_debounce_count; + *length = ARRAY_SIZE(vcnl4040_ps_debounce_count); + break; + default: + return -EINVAL; + } + *type = IIO_VAL_INT; + return IIO_AVAIL_LIST; default: return -EINVAL; } @@ -1504,15 +1648,19 @@ static const struct iio_chan_spec vcnl4040_channels[] = { .type = IIO_LIGHT, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE) | - BIT(IIO_CHAN_INFO_INT_TIME), - .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME), + BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), .event_spec = vcnl4000_event_spec, .num_event_specs = ARRAY_SIZE(vcnl4000_event_spec), }, { .type = IIO_PROXIMITY, .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | - BIT(IIO_CHAN_INFO_INT_TIME), - .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME), + BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), + .info_mask_separate_available = BIT(IIO_CHAN_INFO_INT_TIME) | + BIT(IIO_CHAN_INFO_DEBOUNCE_COUNT), .ext_info = vcnl4000_ext_info, .event_spec = vcnl4040_event_spec, .num_event_specs = ARRAY_SIZE(vcnl4040_event_spec), -- 2.30.2