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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 05B8BC04AAF for ; Sat, 18 May 2019 10:08:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CD8D020B7C for ; Sat, 18 May 2019 10:08:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558174080; bh=sUB5hovs/rIf/1+OYH5HuM1pm0D1fXyH9bo/DU9kax4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=x/dhj5+bNe9BEmcQKAt7dMz8ejvv7sIKxfnp1x3l55yK1FRnAkQXLWIFOyU7/FV44 b3yPskYfuZnJSB2F9rpKJBwlb1cc7SFFq/MfRDPf8BaZVJmAw4WoLGPvk7NKiLGr8f EHTp14PcXDUswbU7am96NDgUTh1oXZ54+He3Effw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727366AbfERKH4 (ORCPT ); Sat, 18 May 2019 06:07:56 -0400 Received: from mail.kernel.org ([198.145.29.99]:34876 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726050AbfERKH4 (ORCPT ); Sat, 18 May 2019 06:07:56 -0400 Received: from archlinux (cpc91196-cmbg18-2-0-cust659.5-4.cable.virginm.net [81.96.234.148]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A642420882; Sat, 18 May 2019 10:07:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1558174074; bh=sUB5hovs/rIf/1+OYH5HuM1pm0D1fXyH9bo/DU9kax4=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=SuqC8lJYndA+qDxIEQ3UiU5TI/vXjU4XgPEfDmaA2NcL+3dWoPt/KkRVJfJCfFhPn LHvvS7X59ccHhiLMSJeWH1kQVNQ3kcG+IY65WuytW+H5XOIyd7PBwrCqc8oIMI8mC6 1QIGK1lhcfel4EcuqCkJui64jtNlGt7JwzJVn+5M= Date: Sat, 18 May 2019 11:07:49 +0100 From: Jonathan Cameron To: Beniamin Bia Cc: , , , , , , , , , , , Subject: Re: [PATCH 2/5] iio: adc: ad7606: Add software configuration Message-ID: <20190518110749.080c7a04@archlinux> In-Reply-To: <20190516143208.19294-2-beniamin.bia@analog.com> References: <20190516143208.19294-1-beniamin.bia@analog.com> <20190516143208.19294-2-beniamin.bia@analog.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable Sender: linux-iio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-iio@vger.kernel.org On Thu, 16 May 2019 17:32:05 +0300 Beniamin Bia wrote: > Because this driver will support multiple configurations for software, > the software configuration was made generic. >=20 > Signed-off-by: Beniamin Bia Applied to the togreg branch of iio.git and pushed out as testing for the autobuilders to play with it. Thanks Jonathan > --- > drivers/iio/adc/ad7606.c | 40 +++++++++++++++++++++++++++++++++++++--- > drivers/iio/adc/ad7606.h | 2 ++ > 2 files changed, 39 insertions(+), 3 deletions(-) >=20 > diff --git a/drivers/iio/adc/ad7606.c b/drivers/iio/adc/ad7606.c > index c66ff22f32d2..aba0fd123a51 100644 > --- a/drivers/iio/adc/ad7606.c > +++ b/drivers/iio/adc/ad7606.c > @@ -140,7 +140,7 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, > int *val2, > long m) > { > - int ret; > + int ret, ch =3D 0; > struct ad7606_state *st =3D iio_priv(indio_dev); > =20 > switch (m) { > @@ -157,8 +157,10 @@ static int ad7606_read_raw(struct iio_dev *indio_dev, > *val =3D (short)ret; > return IIO_VAL_INT; > case IIO_CHAN_INFO_SCALE: > + if (st->sw_mode_en) > + ch =3D chan->address; > *val =3D 0; > - *val2 =3D st->scale_avail[st->range[0]]; > + *val2 =3D st->scale_avail[st->range[ch]]; > return IIO_VAL_INT_PLUS_MICRO; > case IIO_CHAN_INFO_OVERSAMPLING_RATIO: > *val =3D st->oversampling; > @@ -233,7 +235,9 @@ static int ad7606_write_raw(struct iio_dev *indio_dev, > case IIO_CHAN_INFO_SCALE: > mutex_lock(&st->lock); > i =3D find_closest(val2, st->scale_avail, st->num_scales); > - ret =3D st->write_scale(indio_dev, chan->address, i); > + if (st->sw_mode_en) > + ch =3D chan->address; > + ret =3D st->write_scale(indio_dev, ch, i); > if (ret < 0) { > mutex_unlock(&st->lock); > return ret; > @@ -616,6 +620,36 @@ int ad7606_probe(struct device *dev, int irq, void _= _iomem *base_address, > st->write_scale =3D ad7606_write_scale_hw; > st->write_os =3D ad7606_write_os_hw; > =20 > + if (st->chip_info->sw_mode_config) > + st->sw_mode_en =3D device_property_present(st->dev, > + "adi,sw-mode"); > + > + if (st->sw_mode_en) { > + /* After reset, in software mode, =C2=B110 V is set by default */ > + memset32(st->range, 2, ARRAY_SIZE(st->range)); > + indio_dev->info =3D &ad7606_info_os_and_range; > + > + /* > + * In software mode, the range gpio has no longer its function. > + * Instead, the scale can be configured individually for each > + * channel from the range registers. > + */ > + if (st->chip_info->write_scale_sw) > + st->write_scale =3D st->chip_info->write_scale_sw; > + > + /* > + * In software mode, the oversampling is no longer configured > + * with GPIO pins. Instead, the oversampling can be configured > + * in configuratiion register. > + */ > + if (st->chip_info->write_os_sw) > + st->write_os =3D st->chip_info->write_os_sw; > + > + ret =3D st->chip_info->sw_mode_config(indio_dev); > + if (ret < 0) > + return ret; > + } > + > st->trig =3D devm_iio_trigger_alloc(dev, "%s-dev%d", > indio_dev->name, indio_dev->id); > if (!st->trig) > diff --git a/drivers/iio/adc/ad7606.h b/drivers/iio/adc/ad7606.h > index 143c30163df9..d8a509c2c428 100644 > --- a/drivers/iio/adc/ad7606.h > +++ b/drivers/iio/adc/ad7606.h > @@ -43,6 +43,7 @@ struct ad7606_chip_info { > * @range voltage range selection, selects which scale to apply > * @oversampling oversampling selection > * @base_address address from where to read data in parallel operation > + * @sw_mode_en software mode enabled > * @scale_avail pointer to the array which stores the available scales > * @num_scales number of elements stored in the scale_avail array > * @oversampling_avail pointer to the array which stores the available > @@ -71,6 +72,7 @@ struct ad7606_state { > unsigned int range[16]; > unsigned int oversampling; > void __iomem *base_address; > + bool sw_mode_en; > const unsigned int *scale_avail; > unsigned int num_scales; > const unsigned int *oversampling_avail;