From 2387aa8bbc0a3500a6f6df6fee5bdf3fad0fcf98 Mon Sep 17 00:00:00 2001 From: Tom Knot Date: Mon, 9 Jul 2018 11:22:57 +0200 Subject: [PATCH] Fixed secondary AO --- modules/unipi/src/unipi_iio.c | 2 +- modules/unipi/src/unipi_spi.c | 2 +- version.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/unipi/src/unipi_iio.c b/modules/unipi/src/unipi_iio.c index 7ff68b8..7a229cf 100644 --- a/modules/unipi/src/unipi_iio.c +++ b/modules/unipi/src/unipi_iio.c @@ -175,7 +175,7 @@ int neuronspi_iio_sec_ai_read_raw(struct iio_dev *indio_dev, struct iio_chan_spe int neuronspi_iio_sec_ao_write_raw(struct iio_dev *indio_dev, struct iio_chan_spec const *ch, int val, int val2, long mask) { if (ch->type == IIO_VOLTAGE) { - neuronspi_spi_iio_stm_ao_set_voltage(indio_dev, ch, val, val2, mask); + neuronspi_spi_iio_sec_ao_set_voltage(indio_dev, ch, val, val2, mask); return 0; } else { return -EINVAL; diff --git a/modules/unipi/src/unipi_spi.c b/modules/unipi/src/unipi_spi.c index dbe5251..ef17ae9 100644 --- a/modules/unipi/src/unipi_spi.c +++ b/modules/unipi/src/unipi_spi.c @@ -523,8 +523,8 @@ void neuronspi_spi_iio_sec_ao_set_voltage(struct iio_dev *indio_dev, struct iio_ struct neuronspi_analog_data *ao_data = iio_priv(indio_dev); struct spi_device *spi = ao_data->parent; struct neuronspi_driver_data *n_spi = spi_get_drvdata(spi); - u32 sec_true_val = (val * 2) / 5; if (val > 10000) val = 10000; + u32 sec_true_val = (val * 2) / 5; regmap_write(n_spi->reg_map, n_spi->regstart_table->stm_ao_val_reg + ao_data->index, sec_true_val); } diff --git a/version.txt b/version.txt index 200a061..691bd4a 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:86(27aaaf9) LatestCommit:Wed Jul 4 15:26:29 CEST 2018 +Repository:neuron-kernel ActiveBranch:[uart_timeout] PrecedingRelease:v.0.12 PrecedingRevision:87(d5eb80b) LatestCommit:Mon Jul 9 11:22:58 CEST 2018 -- 2.34.1