Fixed secondary AO

diff --git a/modules/unipi/src/unipi_iio.c b/modules/unipi/src/unipi_iio.c
index 7ff68b81b94f4bfe023c9b71cecca93e2aeb7fb8..7a229cfe3395aae33fb2b78922e6a8f12eb40b27 100644 (file)
--- 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 dbe5251bfd6cb25b4c6c971577a2472ca9d83042..ef17ae9b51e9dcdf520cf99b293ceb0b291d9aae 100644 (file)
--- 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 200a061a85d7238ed1a3e7067c8e09323081010f..691bd4a07cf251cd7dd4d365caeaa9ea6d9b8b13 100644 (file)
--- 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