From nobody Mon Feb 9 19:05:05 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 D3FE733BBCB; Mon, 26 Jan 2026 14:01:53 +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=1769436113; cv=none; b=HOrMc8gmOrQHjHYmj2hQBun1qTcySP/n1bbL4SALLJ6JBfRlGTqZjv/mgL+KYivcj5apTO66IAC/2G1VPzSZRR+2EbrUn/FKX1GpsTHSevni3Lb5dBZxCdcx2bJzGGRImtotXOlURaqypN9RC7JUzlG4NRs0yxR+mLX0RmIISgU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769436113; c=relaxed/simple; bh=RE+ZfgECqSmAtddy46Bf4SfXaAmm7UsS6vY1rlFwuhk=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=EYVzDQMyOdnZggkACgD1BPYXGMG2I/FyMSzkBLKgu8eOau4k62XgO1JkJ3bKg3dW4Xq4jtUjPn3F+bYpgvBx4B99SaBAuXDfcWJAHqH/hqEvFKuzQM3AOiPG15Mo2N7L1XK5zCvSSjv8o/9soce5tkV1UmNMOnDTCI3bXrjUB9s= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=e6/646VA; 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="e6/646VA" Received: by smtp.kernel.org (Postfix) with ESMTPS id 968E7C2BCB5; Mon, 26 Jan 2026 14:01:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1769436113; bh=RE+ZfgECqSmAtddy46Bf4SfXaAmm7UsS6vY1rlFwuhk=; h=From:Date:Subject:References:In-Reply-To:To:Cc:Reply-To:From; b=e6/646VADqi7nopZ8OV5kyED0TJIVBhn99hukhSaVN9olcSj3ObHM17KJvY5uYqal nCrau3AGjEaHx/oJ6s7dsGuxfLcLnj2od1JxSOLT4piKR4m8ccFiwpE9C+I3E+3oTQ 8bOa7KfZUGnAJFQ+dJuw+NQRORB6G+iAYNElmD1d4L/RKh9fW9SJXho7S+kwMvoqoH X+kuaNngZznfUiEWiUxdXIngjL7b3Zy3M9h2yxTSnltTfT8BmiZRYZZTsWAf4kf6ml rMdlXivBlCn8KXi6NN/0LE7pIBMxjZsuUUx8/W9jGjh8FsmYoTO4SuXYo038gAGlBd RQhHYD5qMQbtQ== 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 89A54D13C1D; Mon, 26 Jan 2026 14:01:53 +0000 (UTC) From: Rodrigo Alencar via B4 Relay Date: Mon, 26 Jan 2026 13:51:05 +0000 Subject: [PATCH v2 4/6] iio: amplifiers: ad8366: add 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: <20260126-iio-ad8366-update-v2-4-c9a4d31aeb01@analog.com> References: <20260126-iio-ad8366-update-v2-0-c9a4d31aeb01@analog.com> In-Reply-To: <20260126-iio-ad8366-update-v2-0-c9a4d31aeb01@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=1769436111; l=10446; i=rodrigo.alencar@analog.com; s=default; h=from:subject:message-id; bh=BlhuFj3wy+WCVV4cdkTh82AUdgR5J3RfyGbE+fBPHkI=; b=g2v3Zi/49Ave97BBzPEONFJMzj6pe/w6jUZYWJMDIBQeHJQsHjP2JCBdL2ZH6vTdialugsjnU YHj0x5NtKx+CDUK9294AsBS6M5c0vqq/2DNThq/rYCjB/I3LEsCYql4 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 Add device-tree support by dropping 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; With this, switch cases on the device type were dropped: - probe() function adjusted accordingly; - Simplified read_raw() and write_raw() callbacks; - mutex_lock()/mutex_unlock() replaced for guard(mutex)() to allow moving to early returns; Signed-off-by: Rodrigo Alencar --- drivers/iio/amplifiers/ad8366.c | 259 +++++++++++++++++-------------------= ---- 1 file changed, 107 insertions(+), 152 deletions(-) diff --git a/drivers/iio/amplifiers/ad8366.c b/drivers/iio/amplifiers/ad836= 6.c index 0f3fc79ebbf3..134188db2e15 100644 --- a/drivers/iio/amplifiers/ad8366.c +++ b/drivers/iio/amplifiers/ad8366.c @@ -11,6 +11,7 @@ * Copyright 2012-2019 Analog Devices Inc. */ =20 +#include #include #include #include @@ -20,22 +21,20 @@ #include #include #include +#include #include =20 #include #include =20 -enum ad8366_type { - ID_AD8366, - ID_ADA4961, - ID_ADL5240, - ID_HMC792, - ID_HMC1119, -}; +struct ad8366_state; =20 struct ad8366_info { int gain_min; int gain_max; + int gain_step; + int num_channels; + size_t (*pack_code)(struct ad8366_state *st); }; =20 struct ad8366_state { @@ -43,7 +42,6 @@ struct ad8366_state { struct mutex lock; /* protect sensor state */ struct gpio_desc *reset_gpio; unsigned char ch[2]; - enum ad8366_type type; const struct ad8366_info *info; /* * DMA (thus cache coherency maintenance) may require the @@ -52,108 +50,91 @@ struct ad8366_state { unsigned char data[2] __aligned(IIO_DMA_MINALIGN); }; =20 -static const struct ad8366_info ad8366_infos[] =3D { - [ID_AD8366] =3D { - .gain_min =3D 4500, - .gain_max =3D 20500, - }, - [ID_ADA4961] =3D { - .gain_min =3D -6000, - .gain_max =3D 15000, - }, - [ID_ADL5240] =3D { - .gain_min =3D -11500, - .gain_max =3D 20000, - }, - [ID_HMC792] =3D { - .gain_min =3D -15750, - .gain_max =3D 0, - }, - [ID_HMC1119] =3D { - .gain_min =3D -31750, - .gain_max =3D 0, - }, +static size_t ad8366_pack_code(struct ad8366_state *st) +{ + u8 ch_a =3D bitrev8(st->ch[0] & 0x3F); + u8 ch_b =3D bitrev8(st->ch[1] & 0x3F); + + st->data[0] =3D ch_b >> 4; + st->data[1] =3D (ch_b << 4) | (ch_a >> 2); + return 2; +} + +static size_t simple_pack_code(struct ad8366_state *st) +{ + st->data[0] =3D st->ch[0]; + return 1; +} + +static const struct ad8366_info ad8366_chip_info =3D { + .gain_min =3D 4500, + .gain_max =3D 20500, + .gain_step =3D 253, + .num_channels =3D 2, + .pack_code =3D ad8366_pack_code, }; =20 -static int ad8366_write(struct iio_dev *indio_dev, - unsigned char ch_a, unsigned char ch_b) +static const struct ad8366_info ada4961_chip_info =3D { + .gain_min =3D -6000, + .gain_max =3D 15000, + .gain_step =3D -1000, + .num_channels =3D 1, + .pack_code =3D simple_pack_code, +}; + +static const struct ad8366_info adl5240_chip_info =3D { + .gain_min =3D -11500, + .gain_max =3D 20000, + .gain_step =3D 500, + .num_channels =3D 1, + .pack_code =3D simple_pack_code, +}; + +static const struct ad8366_info hmc792_chip_info =3D { + .gain_min =3D -15750, + .gain_max =3D 0, + .gain_step =3D 250, + .num_channels =3D 1, + .pack_code =3D simple_pack_code, +}; + +static const struct ad8366_info hmc1119_chip_info =3D { + .gain_min =3D -31750, + .gain_max =3D 0, + .gain_step =3D -250, + .num_channels =3D 1, + .pack_code =3D simple_pack_code, +}; + +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; =20 - switch (st->type) { - case ID_AD8366: - ch_a =3D bitrev8(ch_a & 0x3F); - ch_b =3D bitrev8(ch_b & 0x3F); - - 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, inf->pack_code(st)); } =20 static int ad8366_read_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, int *val, int *val2, - long m) + long mask) { struct ad8366_state *st =3D iio_priv(indio_dev); - int ret; - int code, gain =3D 0; + const struct ad8366_info *inf =3D st->info; + int gain =3D inf->gain_step > 0 ? inf->gain_min : inf->gain_max; =20 - mutex_lock(&st->lock); - switch (m) { + guard(mutex)(&st->lock); + + switch (mask) { 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; - } - - /* Values in dB */ + gain +=3D inf->gain_step * st->ch[chan->channel]; *val =3D gain / 1000; *val2 =3D (gain % 1000) * 1000; - - ret =3D IIO_VAL_INT_PLUS_MICRO_DB; - break; + return IIO_VAL_INT_PLUS_MICRO_DB; default: - ret =3D -EINVAL; + return -EINVAL; } - mutex_unlock(&st->lock); - - return ret; -}; +} =20 static int ad8366_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *chan, @@ -163,10 +144,8 @@ static int ad8366_write_raw(struct iio_dev *indio_dev, { struct ad8366_state *st =3D iio_priv(indio_dev); const struct ad8366_info *inf =3D st->info; - int code =3D 0, gain; - int ret; + int code, gain, gain_base; =20 - /* Values in dB */ if (val < 0) gain =3D (val * 1000) - (val2 / 1000); else @@ -175,36 +154,18 @@ 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_base =3D inf->gain_step > 0 ? inf->gain_min : inf->gain_max; + code =3D DIV_ROUND_CLOSEST(gain - gain_base, inf->gain_step); + + guard(mutex)(&st->lock); =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]); - break; + return ad8366_write_code(st); default: - ret =3D -EINVAL; + return -EINVAL; } - mutex_unlock(&st->lock); - - return ret; } =20 static int ad8366_write_raw_get_fmt(struct iio_dev *indio_dev, @@ -238,10 +199,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; @@ -264,35 +221,22 @@ static int ad8366_probe(struct spi_device *spi) return ret; =20 st->spi =3D spi; - st->type =3D spi_get_device_id(spi)->driver_data; + st->info =3D spi_get_device_match_data(spi); + if (!st->info) + return dev_err_probe(dev, -EINVAL, "Invalid device info\n"); =20 - 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: - st->reset_gpio =3D devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); - if (IS_ERR(st->reset_gpio)) - return dev_err_probe(dev, PTR_ERR(st->reset_gpio), - "Failed to get reset GPIO\n"); + st->reset_gpio =3D devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH); + if (IS_ERR(st->reset_gpio)) + return dev_err_probe(dev, PTR_ERR(st->reset_gpio), + "Failed to get reset GPIO\n"); =20 - 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[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 @@ -300,18 +244,29 @@ static int ad8366_probe(struct spi_device *spi) } =20 static const struct spi_device_id ad8366_id[] =3D { - {"ad8366", ID_AD8366}, - {"ada4961", ID_ADA4961}, - {"adl5240", ID_ADL5240}, - {"hmc792a", ID_HMC792}, - {"hmc1119", ID_HMC1119}, + {"ad8366", (kernel_ulong_t)&ad8366_chip_info}, + {"ada4961", (kernel_ulong_t)&ada4961_chip_info}, + {"adl5240", (kernel_ulong_t)&adl5240_chip_info}, + {"hmc792a", (kernel_ulong_t)&hmc792_chip_info}, + {"hmc1119", (kernel_ulong_t)&hmc1119_chip_info}, { } }; MODULE_DEVICE_TABLE(spi, ad8366_id); =20 +static const struct of_device_id ad8366_of_match[] =3D { + { .compatible =3D "adi,ad8366", .data =3D &ad8366_chip_info }, + { .compatible =3D "adi,ada4961", .data =3D &ada4961_chip_info }, + { .compatible =3D "adi,adl5240", .data =3D &adl5240_chip_info }, + { .compatible =3D "adi,hmc792a", .data =3D &hmc792_chip_info }, + { .compatible =3D "adi,hmc1119", .data =3D &hmc1119_chip_info }, + { } +}; +MODULE_DEVICE_TABLE(of, ad8366_of_match); + static struct spi_driver ad8366_driver =3D { .driver =3D { - .name =3D KBUILD_MODNAME, + .name =3D KBUILD_MODNAME, + .of_match_table =3D ad8366_of_match, }, .probe =3D ad8366_probe, .id_table =3D ad8366_id, --=20 2.43.0