leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

iio: imu: adis: Add irq flag variable

Browse Source 
There are some ADIS devices that can configure the data ready pin
polarity. Hence, we cannot hardcode our IRQ mask as IRQF_TRIGGER_RISING
since we might want to have it as IRQF_TRIGGER_FALLING.

Signed-off-by: Nuno Sá <nuno.sa@analog.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Nuno Sá
2020-04-13 10:24:41 +02:00
committed by Jonathan Cameron
parent fec86c6b83
commit 698211065d
2 changed files with 33 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/iio/imu/adis_trigger.c
View File

@@ -34,6 +34,27 @@ static void adis_trigger_setup(struct adis *adis)
iio_trigger_set_drvdata(adis->trig, adis); iio_trigger_set_drvdata(adis->trig, adis);
} }
static int adis_validate_irq_flag(struct adis *adis)
{
/*
* Typically this devices have data ready either on the rising edge or
* on the falling edge of the data ready pin. This checks enforces that
* one of those is set in the drivers... It defaults to
* IRQF_TRIGGER_RISING for backward compatibility wiht devices that
* don't support changing the pin polarity.
*/
if (!adis->irq_flag) {
adis->irq_flag = IRQF_TRIGGER_RISING;
return 0;
} else if (adis->irq_flag != IRQF_TRIGGER_RISING &&
adis->irq_flag != IRQF_TRIGGER_FALLING) {
dev_err(&adis->spi->dev, "Invalid IRQ mask: %08lx\n",
adis->irq_flag);
return -EINVAL;
}
return 0;
}
/** /**
* adis_probe_trigger() - Sets up trigger for a adis device * adis_probe_trigger() - Sets up trigger for a adis device
* @adis: The adis device * @adis: The adis device
@@ -54,9 +75,13 @@ int adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
adis_trigger_setup(adis); adis_trigger_setup(adis);
ret = adis_validate_irq_flag(adis);
if (ret)
return ret;
ret = request_irq(adis->spi->irq, ret = request_irq(adis->spi->irq,
&iio_trigger_generic_data_rdy_poll, &iio_trigger_generic_data_rdy_poll,
IRQF_TRIGGER_RISING, adis->irq_flag,
indio_dev->name, indio_dev->name,
adis->trig); adis->trig);
if (ret) if (ret)
@@ -96,9 +121,13 @@ int devm_adis_probe_trigger(struct adis *adis, struct iio_dev *indio_dev)
adis_trigger_setup(adis); adis_trigger_setup(adis);
ret = adis_validate_irq_flag(adis);
if (ret)
return ret;
ret = devm_request_irq(&adis->spi->dev, adis->spi->irq, ret = devm_request_irq(&adis->spi->dev, adis->spi->irq,
&iio_trigger_generic_data_rdy_poll, &iio_trigger_generic_data_rdy_poll,
IRQF_TRIGGER_RISING, adis->irq_flag,
indio_dev->name, indio_dev->name,
adis->trig); adis->trig);
if (ret) if (ret)

2
include/linux/iio/imu/adis.h
View File

@@ -87,6 +87,7 @@ struct adis_data {
* @msg: SPI message object * @msg: SPI message object
* @xfer: SPI transfer objects to be used for a @msg * @xfer: SPI transfer objects to be used for a @msg
* @current_page: Some ADIS devices have registers, this selects current page * @current_page: Some ADIS devices have registers, this selects current page
* @irq_flag: IRQ handling flags as passed to request_irq()
* @buffer: Data buffer for information read from the device * @buffer: Data buffer for information read from the device
* @tx: DMA safe TX buffer for SPI transfers * @tx: DMA safe TX buffer for SPI transfers
* @rx: DMA safe RX buffer for SPI transfers * @rx: DMA safe RX buffer for SPI transfers
@@ -113,6 +114,7 @@ struct adis {
struct spi_message msg; struct spi_message msg;
struct spi_transfer *xfer; struct spi_transfer *xfer;
unsigned int current_page; unsigned int current_page;
unsigned long irq_flag;
void *buffer; void *buffer;
uint8_t tx[10] ____cacheline_aligned; uint8_t tx[10] ____cacheline_aligned;