From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Wed, 18 Nov 2015 21:15:50 +0000 (-0800)
Subject: Merge tag 'iio-fixes-for-4.4a' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/jic23... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~5476^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=819db468b26797d9f53d547dd2a9fe94859a16e0;p=mirror_ubuntu-zesty-kernel.git

Merge tag 'iio-fixes-for-4.4a' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-linus

Jonathan writes:

First set of IIO fixes for the 4.4 cycle.

This set does not include those for issues introduced during the merge
window.  Fixes of those will follow in a future series.

* ad5064
  - Make sure the local i2c_write returns 0 on success rather than the
    number of bytes transfered.  Otherwise we report an error on all writes.
  - Fix a shift for ad5629 and ad5669 which gives incorrect DAC output on
    these parts.
* ad7793
  - The product ID on the datasheet is wrong.  Fix it in the driver.
* IIO_DUMMY_EVGEN
  - select IRQ_WORK as a dependency.
* lpc32xx
  - make sure clock is prepared before enabling.
* si7020
  - data byte order was reversed. Fix it.
* vf610
  - Internal temperature calculation was wrong if a different
    reference voltage was used.  Now use a linear interpolation
    function to make it work over the full range.
  - Fix a division by zero in the case of a device tree property
    not being present (same issue two fixes).
* xilinx XADC
  - VREFN scale was wrong - fix it.
---

819db468b26797d9f53d547dd2a9fe94859a16e0
diff --cc drivers/staging/iio/adc/lpc32xx_adc.c
index d11c54b72186,ef6d0b0ccf55..b51f237cd817
--- a/drivers/staging/iio/adc/lpc32xx_adc.c
+++ b/drivers/staging/iio/adc/lpc32xx_adc.c
@@@ -76,15 -76,15 +76,15 @@@ static int lpc32xx_read_raw(struct iio_
  
  	if (mask == IIO_CHAN_INFO_RAW) {
  		mutex_lock(&indio_dev->mlock);
- 		clk_enable(info->clk);
+ 		clk_prepare_enable(info->clk);
  		/* Measurement setup */
  		__raw_writel(AD_INTERNAL | (chan->address) | AD_REFp | AD_REFm,
 -			LPC32XX_ADC_SELECT(info->adc_base));
 +			     LPC32XX_ADC_SELECT(info->adc_base));
  		/* Trigger conversion */
  		__raw_writel(AD_PDN_CTRL | AD_STROBE,
 -			LPC32XX_ADC_CTRL(info->adc_base));
 +			     LPC32XX_ADC_CTRL(info->adc_base));
  		wait_for_completion(&info->completion); /* set by ISR */
- 		clk_disable(info->clk);
+ 		clk_disable_unprepare(info->clk);
  		*val = info->value;
  		mutex_unlock(&indio_dev->mlock);