Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for adaq776x-1 series and add missing features #2587

Open
wants to merge 9 commits into
base: main
Choose a base branch
from
Open

Add support for adaq776x-1 series and add missing features #2587

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cfcf83f
iio: adc: ad7768-1: add missing IIO attributes
PopPaul2021 Feb 22, 2024
ec71173
iio: adc: ad7768-1: add support for ADAQ776x-1
jonathanns Mar 14, 2024
b21a7fd
iio: adc: ad7768-1: fix MOSI idle state
jonathanns Aug 8, 2024
1e2202c
iio: adc: ad7768-1: Use new spi-engine implementation
jonathanns Aug 26, 2024
3b64cf2
arm: dts: zynq-zed-adv7511-ad7768-1-evb: Fix sync-in GPIO number and add
jonathanns Aug 26, 2024
dce6e5a
arm: dts: Add device tree for ADAQ7767-1 on ZedBoard
jonathanns Aug 26, 2024
9ca6733
arm: dts: Add device tree for ADAQ7768-1 on ZedBoard
jonathanns Aug 26, 2024
9a4ca47
arm: dts: Add device tree for ADAQ7769-1 on ZedBoard
jonathanns Aug 26, 2024
9432dff
dt-bindings: iio: adc: ad7768-1: add new supported parts and properties
jonathanns Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 14 additions & 9 deletions drivers/iio/adc/ad7768-1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
*
* Copyright 2017 Analog Devices Inc.
*/
#include "linux/byteorder/little_endian.h"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this seems like an header being auto added by clangd 😅

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Indeed, i will check this out

#include <linux/bitfield.h>
#include <linux/clk.h>
#include <linux/delay.h>
Expand All @@ -20,7 +21,7 @@
#include <linux/regulator/consumer.h>
#include <linux/sysfs.h>
#include <linux/spi/spi.h>
#include <linux/spi/spi-engine.h>
#include <linux/spi/spi-engine-ex.h>
#include <linux/util_macros.h>
#include <linux/units.h>
#include <linux/rational.h>
Expand Down Expand Up @@ -444,7 +445,7 @@ struct ad7768_state {
*/
union {
unsigned char buf[6];
__be32 word;
__le32 word;
struct {
__be32 chan;
s64 timestamp;
Expand All @@ -458,16 +459,16 @@ static int ad7768_spi_reg_read(struct ad7768_state *st, unsigned int addr,
struct spi_transfer xfer = {
.rx_buf = st->data.buf,
.len = len + 1,
.bits_per_word = (len == 3 ? 32 : 16),
};
unsigned char tx_data[4];
int ret;

tx_data[0] = AD7768_RD_FLAG_MSK(addr);
xfer.tx_buf = tx_data;
ret = spi_sync_transfer(st->spi, &xfer, 1);
if (ret < 0)
return ret;
*data = (len == 1 ? st->data.buf[0] : st->data.word);
*data = (len == 1 ? st->data.buf[1] : cpu_to_be32(st->data.word));
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are the above changes needed?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It is necessary for the new spi-engine integration

return ret;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unrelated change...

}

Expand All @@ -478,7 +479,6 @@ static int ad7768_spi_reg_write(struct ad7768_state *st,
struct spi_transfer xfer = {
.rx_buf = st->data.buf,
.len = 2,
.bits_per_word = 16,
};
unsigned char tx_data[2];
tx_data[0] = AD7768_WR_FLAG_MSK(addr);
Expand Down Expand Up @@ -1214,12 +1214,16 @@ static int ad7768_buffer_postenable(struct iio_dev *indio_dev)
st->offload_xfer.rx_buf = rx_data;
spi_message_init_with_transfers(&st->offload_msg, &st->offload_xfer, 1);

ret = spi_optimize_message(st->spi, &st->offload_msg);
if (ret < 0)
return ret;

spi_bus_lock(st->spi->master);

ret = spi_engine_offload_load_msg(st->spi, &st->offload_msg);
ret = spi_engine_ex_offload_load_msg(st->spi, &st->offload_msg);
if (ret < 0)
return ret;
spi_engine_offload_enable(st->spi, true);
spi_engine_ex_offload_enable(st->spi, true);
}

return ret;
Expand All @@ -1231,9 +1235,10 @@ static int ad7768_buffer_predisable(struct iio_dev *indio_dev)
unsigned int regval;

if (st->spi_is_dma_mapped) {
spi_engine_offload_enable(st->spi, false);
spi_engine_ex_offload_enable(st->spi, false);
spi_bus_unlock(st->spi->master);
}
spi_unoptimize_message(&st->offload_msg);

/*
* To exit continuous read mode, perform a single read of the ADC_DATA
Expand Down Expand Up @@ -1445,7 +1450,7 @@ static int ad7768_probe(struct spi_device *spi)
return PTR_ERR(st->mclk);

st->mclk_freq = clk_get_rate(st->mclk);
st->spi_is_dma_mapped = spi_engine_offload_supported(spi);
st->spi_is_dma_mapped = spi_engine_ex_offload_supported(spi);
st->irq = spi->irq;
st->vref = regulator_get_voltage(st->regulator);

Expand Down