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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 42088C6FA82 for ; Tue, 20 Sep 2022 22:01:38 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229779AbiITWBh (ORCPT ); Tue, 20 Sep 2022 18:01:37 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59628 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229599AbiITWBg (ORCPT ); Tue, 20 Sep 2022 18:01:36 -0400 Received: from aposti.net (aposti.net [89.234.176.197]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6B78275FF3 for ; Tue, 20 Sep 2022 15:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1663711293; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=fptKGAw9F2Rj/FmQsFzOAHWTZNlnm287yzLWxYekM4k=; b=h3/pKOYq16SO+ltMOEzuVggKAw/YcREsufAhNLsna6GVUMg4mSMY+LOkabyanmRr59NWqe d2vqD0VHSvhSzFHqffpOskh0R2UNGzXKrqR8sUSaaCBPZdmT4clzsy5yYt6N6hbdh1slPN ZXohW5TGgvrIHwT4BmS3tCb6+dx8Veg= Date: Tue, 20 Sep 2022 23:01:24 +0100 From: Paul Cercueil Subject: Re: [PATCH 2/3] iio: light: vcnl4000: Add enable attributes for vcnl4040 To: =?iso-8859-1?q?M=E5rten?= Lindahl Cc: Jonathan Cameron , Lars-Peter Clausen , Uwe =?iso-8859-1?q?Kleine-K=F6nig?= , linux-iio@vger.kernel.org, kernel@axis.com Message-Id: In-Reply-To: <20220920180958.2308229-3-marten.lindahl@axis.com> References: <20220920180958.2308229-1-marten.lindahl@axis.com> <20220920180958.2308229-3-marten.lindahl@axis.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org Hi M=E5rten, Le mar., sept. 20 2022 at 20:09:57 +0200, M=E5rten Lindahl=20 a =E9crit : > Add channel attribute in_illuminance_en and in_proximity_en with > read/write access for vcnl4040. If automatic runtime power management=20 > is > turned off (power/control =3D on), both sensors can be kept on or off by > userspace. I don't really understand this. If automatic runtime power management=20 is turned OFF, I would expect both sensors to be kept ON always. It's not userspace's job to do power management of the chip. Why are=20 these channel attributes needed? Cheers, -Paul > Signed-off-by: M=E5rten Lindahl > --- > drivers/iio/light/vcnl4000.c | 79=20 > ++++++++++++++++++++++++++++++++---- > 1 file changed, 72 insertions(+), 7 deletions(-) >=20 > diff --git a/drivers/iio/light/vcnl4000.c=20 > b/drivers/iio/light/vcnl4000.c > index 0b226c684957..9838f0868372 100644 > --- a/drivers/iio/light/vcnl4000.c > +++ b/drivers/iio/light/vcnl4000.c > @@ -125,6 +125,9 @@ struct vcnl4000_data { > enum vcnl4000_device_ids id; > int rev; > int al_scale; > + bool als_enable; > + bool ps_enable; > + > const struct vcnl4000_chip_spec *chip_spec; > struct mutex vcnl4000_lock; > struct vcnl4200_channel vcnl4200_al; > @@ -202,10 +205,13 @@ static ssize_t vcnl4000_write_als_enable(struct=20 > vcnl4000_data *data, int val) > if (ret < 0) > return ret; >=20 > - if (val) > + if (val) { > ret &=3D ~VCNL4040_ALS_CONF_ALS_SD; > - else > + data->als_enable =3D true; > + } else { > ret |=3D VCNL4040_ALS_CONF_ALS_SD; > + data->als_enable =3D false; > + } >=20 > return i2c_smbus_write_word_data(data->client, VCNL4200_AL_CONF, > ret); > @@ -225,10 +231,13 @@ static ssize_t vcnl4000_write_ps_enable(struct=20 > vcnl4000_data *data, int val) > if (ret < 0) > return ret; >=20 > - if (val) > + if (val) { > ret &=3D ~VCNL4040_PS_CONF1_PS_SD; > - else > + data->ps_enable =3D true; > + } else { > ret |=3D VCNL4040_PS_CONF1_PS_SD; > + data->ps_enable =3D false; > + } >=20 > return i2c_smbus_write_word_data(data->client, > VCNL4200_PS_CONF1, ret); > @@ -283,6 +292,8 @@ static int vcnl4200_init(struct vcnl4000_data=20 > *data) > dev_dbg(&data->client->dev, "device id 0x%x", id); >=20 > data->rev =3D (ret >> 8) & 0xf; > + data->als_enable =3D false; > + data->ps_enable =3D false; >=20 > data->vcnl4200_al.reg =3D VCNL4200_AL_DATA; > data->vcnl4200_ps.reg =3D VCNL4200_PS_DATA; > @@ -459,8 +470,12 @@ static bool vcnl4010_is_in_periodic_mode(struct=20 > vcnl4000_data *data) > static int vcnl4000_set_pm_runtime_state(struct vcnl4000_data *data,=20 > bool on) > { > struct device *dev =3D &data->client->dev; > + struct iio_dev *indio_dev =3D i2c_get_clientdata(data->client); > int ret; >=20 > + if (!indio_dev->dev.power.runtime_auto) > + return 0; > + > if (on) { > ret =3D pm_runtime_resume_and_get(dev); > } else { > @@ -507,6 +522,38 @@ static int vcnl4000_read_raw(struct iio_dev=20 > *indio_dev, > *val =3D 0; > *val2 =3D data->al_scale; > return IIO_VAL_INT_PLUS_MICRO; > + case IIO_CHAN_INFO_ENABLE: > + switch (chan->type) { > + case IIO_LIGHT: > + *val =3D data->als_enable; > + return IIO_VAL_INT; > + case IIO_PROXIMITY: > + *val =3D data->ps_enable; > + return IIO_VAL_INT; > + default: > + return -EINVAL; > + } > + default: > + return -EINVAL; > + } > +} > + > +static int vcnl4040_write_raw(struct iio_dev *indio_dev, > + struct iio_chan_spec const *chan, > + int val, int val2, long mask) > +{ > + struct vcnl4000_data *data =3D iio_priv(indio_dev); > + > + switch (mask) { > + case IIO_CHAN_INFO_ENABLE: > + switch (chan->type) { > + case IIO_LIGHT: > + return vcnl4000_write_als_enable(data, val); > + case IIO_PROXIMITY: > + return vcnl4000_write_ps_enable(data, val); > + default: > + return -EINVAL; > + } > default: > return -EINVAL; > } > @@ -845,6 +892,19 @@ static const struct iio_chan_spec=20 > vcnl4010_channels[] =3D { > IIO_CHAN_SOFT_TIMESTAMP(1), > }; >=20 > +static const struct iio_chan_spec vcnl4040_channels[] =3D { > + { > + .type =3D IIO_LIGHT, > + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | > + BIT(IIO_CHAN_INFO_SCALE) | BIT(IIO_CHAN_INFO_ENABLE), > + }, { > + .type =3D IIO_PROXIMITY, > + .info_mask_separate =3D BIT(IIO_CHAN_INFO_RAW) | > + BIT(IIO_CHAN_INFO_ENABLE), > + .ext_info =3D vcnl4000_ext_info, > + } > +}; > + > static const struct iio_info vcnl4000_info =3D { > .read_raw =3D vcnl4000_read_raw, > }; > @@ -859,6 +919,11 @@ static const struct iio_info vcnl4010_info =3D { > .write_event_config =3D vcnl4010_write_event_config, > }; >=20 > +static const struct iio_info vcnl4040_info =3D { > + .read_raw =3D vcnl4000_read_raw, > + .write_raw =3D vcnl4040_write_raw, > +}; > + > static const struct vcnl4000_chip_spec vcnl4000_chip_spec_cfg[] =3D { > [VCNL4000] =3D { > .prod =3D "VCNL4000", > @@ -888,9 +953,9 @@ static const struct vcnl4000_chip_spec=20 > vcnl4000_chip_spec_cfg[] =3D { > .measure_light =3D vcnl4200_measure_light, > .measure_proximity =3D vcnl4200_measure_proximity, > .set_power_state =3D vcnl4200_set_power_state, > - .channels =3D vcnl4000_channels, > - .num_channels =3D ARRAY_SIZE(vcnl4000_channels), > - .info =3D &vcnl4000_info, > + .channels =3D vcnl4040_channels, > + .num_channels =3D ARRAY_SIZE(vcnl4040_channels), > + .info =3D &vcnl4040_info, > .irq_support =3D false, > }, > [VCNL4200] =3D { > -- > 2.30.2 >=20