From patchwork Wed Apr 20 11:25:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ferraris X-Patchwork-Id: 12820085 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EA684C4332F for ; Wed, 20 Apr 2022 11:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378069AbiDTL3S (ORCPT ); Wed, 20 Apr 2022 07:29:18 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35564 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1354709AbiDTL3R (ORCPT ); Wed, 20 Apr 2022 07:29:17 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 667345FE6; Wed, 20 Apr 2022 04:26:31 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: aferraris) with ESMTPSA id 6E02C1F4375D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650453989; bh=PDQk8Hg2XmGeAhw+vnz6Kqr/MRl2sSD13MWqXSmdmNo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fVzTvgfLnjb/DzKK6Unoni3TLPrSMJ6tPUe53F3JnZPnOUXLHdTcI/POmlSEu+aQF d7t2f3cbbwfawtPhbZxsIkrLhhLsMd9qDV1jx1miedYHpE54RJUFwXuphWiP216DJI tWf26zjeYQgGfTtKrNxJ+Tr2tQuEhJwJfQnzlYNlBHdYLugQSHQvuu4ssIh5nOtqg6 GlxBZq3piukjvIuTegbgyZlmZtfifO77cvouoRiZQrLHXPLfqVhlQ2lnvpGB4tDIRU PKdWkAT4zjPbfv0szY+Til3VVxqU3xVhJf4e7+oT+I18UfVWWgE6Sf8yaS+Y3d+LSl KWE8u7CANzmJw== From: Arnaud Ferraris To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v2 1/2] dt-bindings: iio: light: stk33xx: Add proximity-near-level Date: Wed, 20 Apr 2022 13:25:39 +0200 Message-Id: <20220420112540.91907-2-arnaud.ferraris@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220420112540.91907-1-arnaud.ferraris@collabora.com> References: <20220420112540.91907-1-arnaud.ferraris@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This allows exporting the value from which userspace should assert an object is "near". Signed-off-by: Arnaud Ferraris Reviewed-by: Krzysztof Kozlowski --- Documentation/devicetree/bindings/iio/light/stk33xx.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Documentation/devicetree/bindings/iio/light/stk33xx.yaml b/Documentation/devicetree/bindings/iio/light/stk33xx.yaml index f92bf7b2b7f0..f6e22dc9814a 100644 --- a/Documentation/devicetree/bindings/iio/light/stk33xx.yaml +++ b/Documentation/devicetree/bindings/iio/light/stk33xx.yaml @@ -13,6 +13,9 @@ maintainers: description: | Ambient light and proximity sensor over an i2c interface. +allOf: + - $ref: ../common.yaml# + properties: compatible: enum: @@ -26,6 +29,8 @@ properties: interrupts: maxItems: 1 + proximity-near-level: true + required: - compatible - reg @@ -44,6 +49,7 @@ examples: stk3310@48 { compatible = "sensortek,stk3310"; reg = <0x48>; + proximity-near-level = <25>; interrupt-parent = <&gpio1>; interrupts = <5 IRQ_TYPE_LEVEL_LOW>; }; From patchwork Wed Apr 20 11:25:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnaud Ferraris X-Patchwork-Id: 12820084 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 52399C43219 for ; Wed, 20 Apr 2022 11:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378072AbiDTL3T (ORCPT ); Wed, 20 Apr 2022 07:29:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357405AbiDTL3R (ORCPT ); Wed, 20 Apr 2022 07:29:17 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e3e3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AA89362E5; Wed, 20 Apr 2022 04:26:31 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: aferraris) with ESMTPSA id EB2CD1F4375F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1650453990; bh=xnwSIcU9NhkZbooNPSsKPj3qxRSEyE8mP14pNaznZBI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E1plTEtJN9kJX2jnaqG9mZqBIKfGYgL4u5Vvw7jN0ftB55Rm7tEhfpWRhkOw0jLcQ TDbWuhoqNOnV4t+rnmgv+yIjvpzFCNtqyo7b2D+Ser0/FJWrssPVAkUhTVTWyIT0yq hGkcIs7LZ0MNck7dC2PvV3lFVeAQBvA87MnLUTq8bJEpATUgci4o6xW18P7FbYLTlZ CQqq1H5DvC39+L8poWpZlvf8z45RfruVBoqWjqJPc3+BS8S95OBmX+TEelNpnhqBNr 0bwfMIj0ThAKBmxgtWM75FRzTOeazKT/7DT2MIhYE2AfYa6Eaqlcj0dAHTPNuGdmRC gTvG2H/6kGLUQ== From: Arnaud Ferraris To: Jonathan Cameron , Lars-Peter Clausen , Rob Herring , Krzysztof Kozlowski Cc: linux-iio@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@collabora.com Subject: [PATCH v2 2/2] iio: stk3310: Export near level property for proximity sensor Date: Wed, 20 Apr 2022 13:25:40 +0200 Message-Id: <20220420112540.91907-3-arnaud.ferraris@collabora.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220420112540.91907-1-arnaud.ferraris@collabora.com> References: <20220420112540.91907-1-arnaud.ferraris@collabora.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org This makes the value from which an object should be considered "near" available to userspace. This hardware-dependent value should be set in the device-tree. Signed-off-by: Arnaud Ferraris --- Changes in v2: - drop zero-assignment as the variable won't be set if DT property is missing drivers/iio/light/stk3310.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/drivers/iio/light/stk3310.c b/drivers/iio/light/stk3310.c index 1d02dfbc29d1..b578b46276cc 100644 --- a/drivers/iio/light/stk3310.c +++ b/drivers/iio/light/stk3310.c @@ -106,6 +106,7 @@ struct stk3310_data { struct mutex lock; bool als_enabled; bool ps_enabled; + uint32_t ps_near_level; u64 timestamp; struct regmap *regmap; struct regmap_field *reg_state; @@ -135,6 +136,25 @@ static const struct iio_event_spec stk3310_events[] = { }, }; +static ssize_t stk3310_read_near_level(struct iio_dev *indio_dev, + uintptr_t priv, + const struct iio_chan_spec *chan, + char *buf) +{ + struct stk3310_data *data = iio_priv(indio_dev); + + return sprintf(buf, "%u\n", data->ps_near_level); +} + +static const struct iio_chan_spec_ext_info stk3310_ext_info[] = { + { + .name = "nearlevel", + .shared = IIO_SEPARATE, + .read = stk3310_read_near_level, + }, + { /* sentinel */ } +}; + static const struct iio_chan_spec stk3310_channels[] = { { .type = IIO_LIGHT, @@ -151,6 +171,7 @@ static const struct iio_chan_spec stk3310_channels[] = { BIT(IIO_CHAN_INFO_INT_TIME), .event_spec = stk3310_events, .num_event_specs = ARRAY_SIZE(stk3310_events), + .ext_info = stk3310_ext_info, } }; @@ -581,6 +602,10 @@ static int stk3310_probe(struct i2c_client *client, data = iio_priv(indio_dev); data->client = client; i2c_set_clientdata(client, indio_dev); + + device_property_read_u32(&client->dev, "proximity-near-level", + &data->ps_near_level); + mutex_init(&data->lock); ret = stk3310_regmap_init(data);