1 files changed, 8 insertions, 4 deletions

diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
index dae8d1a9038e..52d7517b342e 100644
--- a/drivers/staging/iio/adc/mxs-lradc.c
+++ b/drivers/staging/iio/adc/mxs-lradc.c
@@ -846,6 +846,14 @@ static int mxs_lradc_read_single(struct iio_dev *iio_dev, int chan, int *val)
                         LRADC_CTRL1);
         mxs_lradc_reg_clear(lradc, 0xff, LRADC_CTRL0);
 
+        /* Enable / disable the divider per requirement */
+        if (test_bit(chan, &lradc->is_divided))
+                mxs_lradc_reg_set(lradc, 1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
+                        LRADC_CTRL2);
+        else
+                mxs_lradc_reg_clear(lradc,
+                        1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET, LRADC_CTRL2);
+
         /* Clean the slot's previous content, then set new one. */
         mxs_lradc_reg_clear(lradc, LRADC_CTRL4_LRADCSELECT_MASK(0),
                         LRADC_CTRL4);
@@ -961,15 +969,11 @@ static int mxs_lradc_write_raw(struct iio_dev *iio_dev,
                 if (val == scale_avail[MXS_LRADC_DIV_DISABLED].integer &&
                     val2 == scale_avail[MXS_LRADC_DIV_DISABLED].nano) {
                         /* divider by two disabled */
-                        writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
-                               lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_CLR);
                         clear_bit(chan->channel, &lradc->is_divided);
                         ret = 0;
                 } else if (val == scale_avail[MXS_LRADC_DIV_ENABLED].integer &&
                            val2 == scale_avail[MXS_LRADC_DIV_ENABLED].nano) {
                         /* divider by two enabled */
-                        writel(1 << LRADC_CTRL2_DIVIDE_BY_TWO_OFFSET,
-                               lradc->base + LRADC_CTRL2 + STMP_OFFSET_REG_SET);
                         set_bit(chan->channel, &lradc->is_divided);
                         ret = 0;
                 }