From nobody Thu Mar 5 08:21:45 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 147B02DB7AA; Mon, 16 Feb 2026 17:10:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771261854; cv=none; b=TKuBvs7iZGCdQek1KTJmDV9EhUeyD4zpyeWWV/j4HmQd7Xj+1Ap3OrnUG6J0RNoBnbpxQGRhZ6YU3GD4CJqFGcD3sACyBpdGyAaacNVs8zyDkjWYidVKYpBVrIVkmIRlpnvLRfdzLev7yz7oJDw5j7axbvis6B+QjpA5+zgCSeE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771261854; c=relaxed/simple; bh=Gft/y2lgJMBF0wVW6kCN3YyuV/wW/cUnsAeKbjqhCzY=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=liwNZXqn1QGSNvmiODnwFvJvLCydyLGi0myh8ZnPtxtnfU1Qh/7oYXiIIM1HUHbUbgm3nrtjDxYOlW37XvStB09jZ7+MiEhjnXT4gC24b7KwASB7qjMLVxbWoctYWM7ZlIvG8yYKCcFo58mFxgMVbaYXu/CwuzvCxH7ayNw8t/0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=MpFEqs44; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="MpFEqs44" Received: by smtp.kernel.org (Postfix) with ESMTPS id E36FAC2BC9E; Mon, 16 Feb 2026 17:10:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1771261853; bh=Gft/y2lgJMBF0wVW6kCN3YyuV/wW/cUnsAeKbjqhCzY=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=MpFEqs44DM7j8meDT9EDmnAXJOtQzuitDRhBsowR0++kfcfCIjffVaAdw4sTYQfLu FrctHaAhzRpPt423q05uilIy/Zcu5y5CvzHygHStQ/vn0QC4tDcATOq7TxcxfnOaQ7 MPYQAULxL98Lo56w4FKZ21Ixn23vXsXKoKU8IG06P/xTr70I8z5nKUl2t7AZQFWM29 i62WGSEa43Vyb1u1XKhMEWZpmtPTFJ2SrvfA+K7ah1uRmADJtzQRxAdTdP2S887iUj RN4U0CumMfqrUyEQ6mR4cQdw/1e0sGNbS0eM4XSOEd4CGTkAWLq3Xrhd9ARArapVan ClRgggOafNK+w== Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id D9D43E81A5A; Mon, 16 Feb 2026 17:10:53 +0000 (UTC) From: Rodrigo Alencar via B4 Relay Date: Mon, 16 Feb 2026 17:10:52 +0000 Subject: [PATCH v5 08/11] iio: amplifiers: ad8366: prepare for device-tree support Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20260216-iio-ad8366-update-v5-8-7e6091357d02@analog.com> References: <20260216-iio-ad8366-update-v5-0-7e6091357d02@analog.com> In-Reply-To: <20260216-iio-ad8366-update-v5-0-7e6091357d02@analog.com> To: linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org, devicetree@vger.kernel.org Cc: Michael Hennerich , Lars-Peter Clausen , Jonathan Cameron , David Lechner , Andy Shevchenko , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Rodrigo Alencar X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1771261851; l=7333; i=rodrigo.alencar@analog.com; s=default; h=from:subject:message-id; bh=hSZQX2mkk9eZiJBBsoEhy14crUmqrrRn00xfVskn5rs=; b=vsxbpm/bMqghD4anjr+u0EE+VOjz65Sqd0blJ91liDTdalvC7DekiOYygbMmWykKCeznh0faA QOLSMs2JJ9ZBV4rvK/xIPFvFAvbRpWl6LO87gzGm/td6Hi473MrhS/i X-Developer-Key: i=rodrigo.alencar@analog.com; a=ed25519; pk=ULeHbgU/OYh/PG/4anHDfLgldFItQHAhOktYRVLMFRo= X-Endpoint-Received: by B4 Relay for rodrigo.alencar@analog.com/default with auth_id=561 X-Original-From: Rodrigo Alencar Reply-To: rodrigo.alencar@analog.com From: Rodrigo Alencar Drop switch case on the enum ID in favor of extended chip info table, containing: - gain_step, indicating with sign the start of the code range; - num_channels, to indicate the number IIO channels; - pack_code() function to describe how SPI buffer is populated; Which allowed for a simplified read_raw() and write_raw() callbacks. The probe() function was adjusted accordingly. The linux/array_size.h include is removed as number of channels is provided by chip info table. Signed-off-by: Rodrigo Alencar --- drivers/iio/amplifiers/ad8366.c | 134 +++++++++++++-----------------------= ---- 1 file changed, 44 insertions(+), 90 deletions(-) diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad836= 6.c index 8b3d6825423e..22eb6c9bb0f6 100644 --- a/drivers/iio/amplifiers/ad8366.c +++ b/drivers/iio/amplifiers/ad8366.c @@ -11,7 +11,6 @@ * Copyright 2012-2019 Analog Devices Inc. */ =20 -#include #include #include #include @@ -26,6 +25,7 @@ #include #include #include +#include =20 #include =20 @@ -40,13 +40,16 @@ enum ad8366_type { struct ad8366_info { int gain_min; int gain_max; + int gain_step; + size_t num_channels; + size_t (*pack_code)(const unsigned char *code, size_t num_channels, + unsigned char *data); }; =20 struct ad8366_state { struct spi_device *spi; struct mutex lock; /* protect sensor state */ unsigned char ch[2]; - enum ad8366_type type; const struct ad8366_info *info; /* * DMA (thus cache coherency maintenance) may require the @@ -55,60 +58,61 @@ struct ad8366_state { unsigned char data[2] __aligned(IIO_DMA_MINALIGN); }; =20 +static size_t ad8366_pack_code(const unsigned char *code, size_t num_chann= els, + unsigned char *data) +{ + u8 ch_a =3D bitrev8(code[0]) >> 2; + u8 ch_b =3D bitrev8(code[1]) >> 2; + + put_unaligned_be16((ch_b << 6) | ch_a, &data[0]); + return sizeof(__be16); +} + static const struct ad8366_info ad8366_infos[] =3D { [ID_AD8366] =3D { .gain_min =3D 4500, .gain_max =3D 20500, + .gain_step =3D 253, + .num_channels =3D 2, + .pack_code =3D ad8366_pack_code, }, [ID_ADA4961] =3D { .gain_min =3D -6000, .gain_max =3D 15000, + .gain_step =3D -1000, + .num_channels =3D 1, }, [ID_ADL5240] =3D { .gain_min =3D -11500, .gain_max =3D 20000, + .gain_step =3D 500, + .num_channels =3D 1, }, [ID_HMC792] =3D { .gain_min =3D -15750, .gain_max =3D 0, + .gain_step =3D 250, + .num_channels =3D 1, }, [ID_HMC1119] =3D { .gain_min =3D -31750, .gain_max =3D 0, + .gain_step =3D -250, + .num_channels =3D 1, }, }; =20 -static int ad8366_write(struct iio_dev *indio_dev, - unsigned char ch_a, unsigned char ch_b) +static int ad8366_write_code(struct ad8366_state *st) { - struct ad8366_state *st =3D iio_priv(indio_dev); - int ret; + const struct ad8366_info *inf =3D st->info; + size_t len =3D 1; =20 - switch (st->type) { - case ID_AD8366: - ch_a =3D bitrev8(ch_a & 0x3F); - ch_b =3D bitrev8(ch_b & 0x3F); + if (inf->pack_code) + len =3D inf->pack_code(st->ch, inf->num_channels, st->data); + else + st->data[0] =3D st->ch[0]; =20 - st->data[0] =3D ch_b >> 4; - st->data[1] =3D (ch_b << 4) | (ch_a >> 2); - break; - case ID_ADA4961: - st->data[0] =3D ch_a & 0x1F; - break; - case ID_ADL5240: - st->data[0] =3D (ch_a & 0x3F); - break; - case ID_HMC792: - case ID_HMC1119: - st->data[0] =3D ch_a; - break; - } - - ret =3D spi_write(st->spi, st->data, indio_dev->num_channels); - if (ret < 0) - dev_err(&indio_dev->dev, "write failed (%d)", ret); - - return ret; + return spi_write(st->spi, st->data, len); } =20 static int ad8366_read_raw(struct iio_dev *indio_dev, @@ -118,6 +122,7 @@ static int ad8366_read_raw(struct iio_dev *indio_dev, long m) { struct ad8366_state *st =3D iio_priv(indio_dev); + const struct ad8366_info *inf =3D st->info; int ret; int code, gain =3D 0; =20 @@ -125,25 +130,8 @@ static int ad8366_read_raw(struct iio_dev *indio_dev, switch (m) { case IIO_CHAN_INFO_HARDWAREGAIN: code =3D st->ch[chan->channel]; - - switch (st->type) { - case ID_AD8366: - gain =3D code * 253 + 4500; - break; - case ID_ADA4961: - gain =3D 15000 - code * 1000; - break; - case ID_ADL5240: - gain =3D 20000 - 31500 + code * 500; - break; - case ID_HMC792: - gain =3D -1 * code * 500; - break; - case ID_HMC1119: - gain =3D -1 * code * 250; - break; - } - + gain =3D inf->gain_step > 0 ? inf->gain_min : inf->gain_max; + gain +=3D inf->gain_step * code; /* Values in dB */ *val =3D gain / 1000; *val2 =3D (gain % 1000) * 1000; @@ -178,29 +166,14 @@ static int ad8366_write_raw(struct iio_dev *indio_dev, if (gain > inf->gain_max || gain < inf->gain_min) return -EINVAL; =20 - switch (st->type) { - case ID_AD8366: - code =3D (gain - 4500) / 253; - break; - case ID_ADA4961: - code =3D (15000 - gain) / 1000; - break; - case ID_ADL5240: - code =3D ((gain - 500 - 20000) / 500) & 0x3F; - break; - case ID_HMC792: - code =3D (abs(gain) / 500) & 0x3F; - break; - case ID_HMC1119: - code =3D (abs(gain) / 250) & 0x7F; - break; - } + gain -=3D inf->gain_step > 0 ? inf->gain_min : inf->gain_max; + code =3D DIV_ROUND_CLOSEST(gain, inf->gain_step); =20 mutex_lock(&st->lock); switch (mask) { case IIO_CHAN_INFO_HARDWAREGAIN: st->ch[chan->channel] =3D code; - ret =3D ad8366_write(indio_dev, st->ch[0], st->ch[1]); + ret =3D ad8366_write_code(st); break; default: ret =3D -EINVAL; @@ -241,10 +214,6 @@ static const struct iio_chan_spec ad8366_channels[] = =3D { AD8366_CHAN(1), }; =20 -static const struct iio_chan_spec ada4961_channels[] =3D { - AD8366_CHAN(0), -}; - static int ad8366_probe(struct spi_device *spi) { struct device *dev =3D &spi->dev; @@ -268,35 +237,20 @@ static int ad8366_probe(struct spi_device *spi) return dev_err_probe(dev, ret, "Failed to get regulator\n"); =20 st->spi =3D spi; - st->type =3D spi_get_device_id(spi)->driver_data; - - switch (st->type) { - case ID_AD8366: - indio_dev->channels =3D ad8366_channels; - indio_dev->num_channels =3D ARRAY_SIZE(ad8366_channels); - break; - case ID_ADA4961: - case ID_ADL5240: - case ID_HMC792: - case ID_HMC1119: - indio_dev->channels =3D ada4961_channels; - indio_dev->num_channels =3D ARRAY_SIZE(ada4961_channels); - break; - default: - return dev_err_probe(dev, -EINVAL, "Invalid device ID\n"); - } + st->info =3D &ad8366_infos[spi_get_device_id(spi)->driver_data]; =20 rstc =3D devm_reset_control_get_optional_exclusive_deasserted(dev, NULL); if (IS_ERR(rstc)) return dev_err_probe(dev, PTR_ERR(rstc), "Failed to get reset controller\n"); =20 - st->info =3D &ad8366_infos[st->type]; indio_dev->name =3D spi_get_device_id(spi)->name; indio_dev->info =3D &ad8366_info; indio_dev->modes =3D INDIO_DIRECT_MODE; + indio_dev->channels =3D ad8366_channels; + indio_dev->num_channels =3D st->info->num_channels; =20 - ret =3D ad8366_write(indio_dev, 0, 0); + ret =3D ad8366_write_code(st); if (ret < 0) return dev_err_probe(dev, ret, "failed to write initial gain\n"); =20 --=20 2.43.0