Commit 47df986b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging driver fixes from Greg KH:
 "Here are some IIO and staging driver fixes for 4.0-rc3.

  Details are in the shortlog, nothing major, mostly IIO fixes for
  reported issues.

  All have been in linux-next successfully"

* tag 'staging-4.0-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (23 commits)
  staging: comedi: adv_pci1710: fix AI INSN_READ for non-zero channel
  staging: comedi: vmk80xx: remove "firmware version" kernel messages
  staging: comedi: comedi_isadma: fix "stalled" detect in comedi_isadma_disable_on_sample()
  iio: ak8975: fix AK09911 dependencies
  iio: common: ssp_sensors: Protect PM-only functions to kill warning
  IIO: si7020: Allocate correct amount of memory in devm_iio_device_alloc
  Revert "iio:humidity:si7020: fix pointer to i2c client"
  iio: light: gp2ap020a00f: Select REGMAP_I2C
  iio: light: jsa1212: Select REGMAP_I2C
  iio: ad5686: fix optional reference voltage declaration
  iio:adc:mcp3422 Fix incorrect scales table
  iio: mxs-lradc: fix iio channel map regression
  iio: imu: adis16400: Fix sign extension
  staging: iio: ad2s1200: Fix sign extension
  iio: mxs-lradc: only update the buffer when its conversions have finished
  iio: mxs-lradc: make ADC reads not unschedule touchscreen conversions
  iio: mxs-lradc: make ADC reads not disable touchscreen interrupts
  iio: mxs-lradc: separate touchscreen and buffer virtual channels
  iio: imu: inv_mpu6050: Prevent dereferencing NULL
  iio: iadc: wait_for_completion_timeout time in jiffies
  ...
parents 29191c7f abe46b89

drivers/iio/adc/mcp3422.c

+4 −13
Original line number Diff line number Diff line
@@ -58,20 +58,11 @@ 
		.info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SAMP_FREQ), \

	}



/* LSB is in nV to eliminate floating point */

static const u32 rates_to_lsb[] = {1000000, 250000, 62500, 15625};



/*

 *  scales calculated as:

 *  rates_to_lsb[sample_rate] / (1 << pga);

 *  pga is 1 for 0, 2

 */



static const int mcp3422_scales[4][4] = {

	{ 1000000, 250000, 62500, 15625 },

	{ 500000 , 125000, 31250, 7812 },

	{ 250000 , 62500 , 15625, 3906 },

	{ 125000 , 31250 , 7812 , 1953 } };

	{ 1000000, 500000, 250000, 125000 },

	{ 250000 , 125000, 62500 , 31250  },

	{ 62500  , 31250 , 15625 , 7812   },

	{ 15625  , 7812  , 3906  , 1953   } };



/* Constant msleep times for data acquisitions */

static const int mcp3422_read_times[4] = {

drivers/iio/adc/qcom-spmi-iadc.c

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ static int iadc_do_conversion(struct iadc_chip *iadc, int chan, u16 *data) 
	if (iadc->poll_eoc) {

		ret = iadc_poll_wait_eoc(iadc, wait);

	} else {

		ret = wait_for_completion_timeout(&iadc->complete, wait);

		ret = wait_for_completion_timeout(&iadc->complete,

			usecs_to_jiffies(wait));

		if (!ret)

			ret = -ETIMEDOUT;

		else

drivers/iio/common/ssp_sensors/ssp_dev.c

+2 −0
Original line number Diff line number Diff line
@@ -640,6 +640,7 @@ static int ssp_remove(struct spi_device *spi) 
	return 0;

}



#ifdef CONFIG_PM_SLEEP

static int ssp_suspend(struct device *dev)

{

	int ret;
@@ -688,6 +689,7 @@ static int ssp_resume(struct device *dev) 


	return 0;

}

#endif /* CONFIG_PM_SLEEP */



static const struct dev_pm_ops ssp_pm_ops = {

	SET_SYSTEM_SLEEP_PM_OPS(ssp_suspend, ssp_resume)

drivers/iio/dac/ad5686.c

+1 −1
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ static int ad5686_probe(struct spi_device *spi) 
	st = iio_priv(indio_dev);

	spi_set_drvdata(spi, indio_dev);



	st->reg = devm_regulator_get(&spi->dev, "vcc");

	st->reg = devm_regulator_get_optional(&spi->dev, "vcc");

	if (!IS_ERR(st->reg)) {

		ret = regulator_enable(st->reg);

		if (ret)

drivers/iio/humidity/dht11.c

+41 −28
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
#include <linux/wait.h>

#include <linux/bitops.h>

#include <linux/completion.h>

#include <linux/mutex.h>

#include <linux/delay.h>

#include <linux/gpio.h>

#include <linux/of_gpio.h>
@@ -39,8 +40,12 @@ 


#define DHT11_DATA_VALID_TIME	2000000000  /* 2s in ns */



#define DHT11_EDGES_PREAMBLE 4

#define DHT11_EDGES_PREAMBLE 2

#define DHT11_BITS_PER_READ 40

/*

 * Note that when reading the sensor actually 84 edges are detected, but

 * since the last edge is not significant, we only store 83:

 */

#define DHT11_EDGES_PER_READ (2*DHT11_BITS_PER_READ + DHT11_EDGES_PREAMBLE + 1)



/* Data transmission timing (nano seconds) */
@@ -57,6 +62,7 @@ struct dht11 { 
	int				irq;



	struct completion		completion;

	struct mutex			lock;



	s64				timestamp;

	int				temperature;
@@ -88,7 +94,7 @@ static int dht11_decode(struct dht11 *dht11, int offset) 
	unsigned char temp_int, temp_dec, hum_int, hum_dec, checksum;



	/* Calculate timestamp resolution */

	for (i = 0; i < dht11->num_edges; ++i) {

	for (i = 1; i < dht11->num_edges; ++i) {

		t = dht11->edges[i].ts - dht11->edges[i-1].ts;

		if (t > 0 && t < timeres)

			timeres = t;
@@ -138,6 +144,27 @@ static int dht11_decode(struct dht11 *dht11, int offset) 
	return 0;

}



/*

 * IRQ handler called on GPIO edges

 */

static irqreturn_t dht11_handle_irq(int irq, void *data)

{

	struct iio_dev *iio = data;

	struct dht11 *dht11 = iio_priv(iio);



	/* TODO: Consider making the handler safe for IRQ sharing */

	if (dht11->num_edges < DHT11_EDGES_PER_READ && dht11->num_edges >= 0) {

		dht11->edges[dht11->num_edges].ts = iio_get_time_ns();

		dht11->edges[dht11->num_edges++].value =

						gpio_get_value(dht11->gpio);



		if (dht11->num_edges >= DHT11_EDGES_PER_READ)

			complete(&dht11->completion);

	}



	return IRQ_HANDLED;

}



static int dht11_read_raw(struct iio_dev *iio_dev,

			const struct iio_chan_spec *chan,

			int *val, int *val2, long m)
@@ -145,6 +172,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev, 
	struct dht11 *dht11 = iio_priv(iio_dev);

	int ret;



	mutex_lock(&dht11->lock);

	if (dht11->timestamp + DHT11_DATA_VALID_TIME < iio_get_time_ns()) {

		reinit_completion(&dht11->completion);
@@ -157,8 +185,17 @@ static int dht11_read_raw(struct iio_dev *iio_dev, 
		if (ret)

			goto err;



		ret = request_irq(dht11->irq, dht11_handle_irq,

				  IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				  iio_dev->name, iio_dev);

		if (ret)

			goto err;



		ret = wait_for_completion_killable_timeout(&dht11->completion,

								 HZ);



		free_irq(dht11->irq, iio_dev);



		if (ret == 0 && dht11->num_edges < DHT11_EDGES_PER_READ - 1) {

			dev_err(&iio_dev->dev,

					"Only %d signal edges detected\n",
@@ -185,6 +222,7 @@ static int dht11_read_raw(struct iio_dev *iio_dev, 
		ret = -EINVAL;

err:

	dht11->num_edges = -1;

	mutex_unlock(&dht11->lock);

	return ret;

}
@@ -193,27 +231,6 @@ static const struct iio_info dht11_iio_info = { 
	.read_raw		= dht11_read_raw,

};



/*

 * IRQ handler called on GPIO edges

*/

static irqreturn_t dht11_handle_irq(int irq, void *data)

{

	struct iio_dev *iio = data;

	struct dht11 *dht11 = iio_priv(iio);



	/* TODO: Consider making the handler safe for IRQ sharing */

	if (dht11->num_edges < DHT11_EDGES_PER_READ && dht11->num_edges >= 0) {

		dht11->edges[dht11->num_edges].ts = iio_get_time_ns();

		dht11->edges[dht11->num_edges++].value =

						gpio_get_value(dht11->gpio);



		if (dht11->num_edges >= DHT11_EDGES_PER_READ)

			complete(&dht11->completion);

	}



	return IRQ_HANDLED;

}



static const struct iio_chan_spec dht11_chan_spec[] = {

	{ .type = IIO_TEMP,

		.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED), },
@@ -256,11 +273,6 @@ static int dht11_probe(struct platform_device *pdev) 
		dev_err(dev, "GPIO %d has no interrupt\n", dht11->gpio);

		return -EINVAL;

	}

	ret = devm_request_irq(dev, dht11->irq, dht11_handle_irq,

				IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING,

				pdev->name, iio);

	if (ret)

		return ret;



	dht11->timestamp = iio_get_time_ns() - DHT11_DATA_VALID_TIME - 1;

	dht11->num_edges = -1;
@@ -268,6 +280,7 @@ static int dht11_probe(struct platform_device *pdev) 
	platform_set_drvdata(pdev, iio);



	init_completion(&dht11->completion);

	mutex_init(&dht11->lock);

	iio->name = pdev->name;

	iio->dev.parent = &pdev->dev;

	iio->info = &dht11_iio_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE