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=-13.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,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 5CAE6C2D0A8 for ; Wed, 30 Sep 2020 07:57:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 1AD462076E for ; Wed, 30 Sep 2020 07:57:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="JL2vo9mx" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728399AbgI3H5j (ORCPT ); Wed, 30 Sep 2020 03:57:39 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728321AbgI3H5e (ORCPT ); Wed, 30 Sep 2020 03:57:34 -0400 Received: from mail-pj1-x1042.google.com (mail-pj1-x1042.google.com [IPv6:2607:f8b0:4864:20::1042]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F1AB6C0613D2 for ; Wed, 30 Sep 2020 00:57:33 -0700 (PDT) Received: by mail-pj1-x1042.google.com with SMTP id kk9so460007pjb.2 for ; Wed, 30 Sep 2020 00:57:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6s2rUyIhHoR4qKNTzxmszZi7AfKkr8P4gJKIqWc5ulE=; b=JL2vo9mxUvSWP8FTaPCzqJI+mkxMGkkYu1fhJNfBsSD+/c6y2RaZSMB/etQ3U1L/CA kMBagCSxE4FdyCxC9cEddzYYTR9ZmX9RI9DVIebN/gkISrGzRF2CekthJvS6KN7lRmrA awnp8JDKQlm/5dWAqwh3scgsReneB0it816ps= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6s2rUyIhHoR4qKNTzxmszZi7AfKkr8P4gJKIqWc5ulE=; b=IDYzkOulwccSecC/HiXHyohRk1m+PLg1KBUn89pMySVYXddIARVFyzQUJnMqlJB4Nm Ud3fx0YNEz9/PW6EGHR+LIXlfX4uhtpF3m1n2jAKp/BJ7s4JY9QAoxn3FS7cWzBEH3TX jdpErNdBC555XUlB5VIEjHN9VpeY22YUsgyHmI+V/vF9M3sCVD/eVzXA8MISVP/usY+l Y7Jq072rq9h5sV5r35DSDDnyTRVPxfiAbvO6U7+rMOP1xkF+jfO7rSO8aHWUx15jEwV3 J3ht+eU8+XGlphTPSc5DMd50TaNO41fmgotuKj5uXRjlBvWZtHze2+r++JSR64GquZjA Cfqw== X-Gm-Message-State: AOAM531YfcRlVDuj2Ho7+fi7cNeB1YfBBn8XfYfHuSY4x/0biKqpvji9 xbpPkWVHnWRedpFPgVpw920R98hgVh7+4A== X-Google-Smtp-Source: ABdhPJxsUTBBMgC7PZSwrtA58859Qla54+5OVb1+3AeoTfUIg0pveIyLmZ07T/mJYl7mEvRq8pkN3g== X-Received: by 2002:a17:902:8c98:b029:d2:2f2a:584a with SMTP id t24-20020a1709028c98b02900d22f2a584amr1269777plo.8.1601452653527; Wed, 30 Sep 2020 00:57:33 -0700 (PDT) Received: from smtp.gmail.com ([2620:15c:202:1:3e52:82ff:fe6c:83ab]) by smtp.gmail.com with ESMTPSA id l21sm1272131pjq.54.2020.09.30.00.57.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 30 Sep 2020 00:57:33 -0700 (PDT) From: Stephen Boyd To: Jonathan Cameron Cc: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, Daniel Campello , Lars-Peter Clausen , Peter Meerwald-Stadler , Douglas Anderson , Gwendal Grignou , Evan Green Subject: [PATCH v2 3/6] iio: sx9310: Support setting hysteresis values Date: Wed, 30 Sep 2020 00:57:25 -0700 Message-Id: <20200930075728.2410327-4-swboyd@chromium.org> X-Mailer: git-send-email 2.28.0.709.gb0816b6eb0-goog In-Reply-To: <20200930075728.2410327-1-swboyd@chromium.org> References: <20200930075728.2410327-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for setting the hysteresis as a shifted value of a channel's proximity threshold. Each channel can have a different threshold, but the hysteresis applies to all channels as a right shift factor. Therefore, duplicate the hysteresis value across all channels and make it depend on the channel's proximity threshold. This is sort of odd but seems to work in practice as most of the time only one channel is used. Cc: Daniel Campello Cc: Lars-Peter Clausen Cc: Peter Meerwald-Stadler Cc: Douglas Anderson Cc: Gwendal Grignou Cc: Evan Green Signed-off-by: Stephen Boyd --- drivers/iio/proximity/sx9310.c | 62 +++++++++++++++++++++++++++++++++- 1 file changed, 61 insertions(+), 1 deletion(-) diff --git a/drivers/iio/proximity/sx9310.c b/drivers/iio/proximity/sx9310.c index 35e927dc4f66..9eb10e8263e7 100644 --- a/drivers/iio/proximity/sx9310.c +++ b/drivers/iio/proximity/sx9310.c @@ -75,6 +75,7 @@ #define SX9310_REG_PROX_CTRL8_9_BODYTHRESH_900 0x03 #define SX9310_REG_PROX_CTRL8_9_BODYTHRESH_1500 0x05 #define SX9310_REG_PROX_CTRL10 0x1a +#define SX9310_REG_PROX_CTRL10_HYST_MASK GENMASK(5, 4) #define SX9310_REG_PROX_CTRL10_HYST_6PCT (0x01 << 4) #define SX9310_REG_PROX_CTRL10_FAR_DEBOUNCE_2 0x01 #define SX9310_REG_PROX_CTRL11 0x1b @@ -149,7 +150,9 @@ static const struct iio_event_spec sx9310_events[] = { { .type = IIO_EV_TYPE_THRESH, .dir = IIO_EV_DIR_EITHER, - .mask_separate = BIT(IIO_EV_INFO_ENABLE) | BIT(IIO_EV_INFO_VALUE), + .mask_separate = BIT(IIO_EV_INFO_ENABLE) | + BIT(IIO_EV_INFO_HYSTERESIS) | + BIT(IIO_EV_INFO_VALUE), }, }; @@ -574,6 +577,30 @@ static int sx9310_read_thresh(struct sx9310_data *data, return IIO_VAL_INT; } +static int sx9310_read_hysteresis(struct sx9310_data *data, + const struct iio_chan_spec *chan, int *val) +{ + unsigned int regval, pthresh; + int ret; + + ret = sx9310_read_thresh(data, chan, &pthresh); + if (ret < 0) + return ret; + + ret = regmap_read(data->regmap, SX9310_REG_PROX_CTRL10, ®val); + if (ret) + return ret; + + regval = FIELD_GET(SX9310_REG_PROX_CTRL10_HYST_MASK, regval); + if (!regval) + regval = 5; + + /* regval is at most 5 */ + *val = pthresh >> (5 - regval); + + return IIO_VAL_INT; +} + static int sx9310_read_event_val(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, enum iio_event_type type, @@ -588,6 +615,8 @@ static int sx9310_read_event_val(struct iio_dev *indio_dev, switch (info) { case IIO_EV_INFO_VALUE: return sx9310_read_thresh(data, chan, val); + case IIO_EV_INFO_HYSTERESIS: + return sx9310_read_hysteresis(data, chan, val); default: return -EINVAL; } @@ -623,6 +652,35 @@ static int sx9310_write_thresh(struct sx9310_data *data, return ret; } +static int sx9310_write_hysteresis(struct sx9310_data *data, + const struct iio_chan_spec *chan, int _val) +{ + unsigned int hyst, val = _val; + int ret, pthresh; + + ret = sx9310_read_thresh(data, chan, &pthresh); + if (ret < 0) + return ret; + + if (val == 0) + hyst = 0; + else if (val == pthresh >> 2) + hyst = 3; + else if (val == pthresh >> 3) + hyst = 2; + else if (val == pthresh >> 4) + hyst = 1; + else + return -EINVAL; + + hyst = FIELD_PREP(SX9310_REG_PROX_CTRL10_HYST_MASK, hyst); + mutex_lock(&data->mutex); + ret = regmap_update_bits(data->regmap, SX9310_REG_PROX_CTRL10, + SX9310_REG_PROX_CTRL10_HYST_MASK, hyst); + mutex_unlock(&data->mutex); + + return ret; +} static int sx9310_write_event_val(struct iio_dev *indio_dev, const struct iio_chan_spec *chan, @@ -638,6 +696,8 @@ static int sx9310_write_event_val(struct iio_dev *indio_dev, switch (info) { case IIO_EV_INFO_VALUE: return sx9310_write_thresh(data, chan, val); + case IIO_EV_INFO_HYSTERESIS: + return sx9310_write_hysteresis(data, chan, val); default: return -EINVAL; } -- Sent by a computer, using git, on the internet