Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03cce00b authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-fixes-for-4.7a' of... 

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

Jonathan writes:

First round of iio fixes for the 4.7 cycle.

A slightly bumper set due to travel delaying the pull request and a fair few
issues with the recent merge window patches.  Patches all over the place.
The st-sensors one is probably the most involved, but definitly solves the
issues seen.  Note there are some other issues around that handler
(and the fact that a lot of boards tie a level interrupt chip to an
edge interrupt only irq chip).  These are not regressions however, so
will turn up the slow route.

* core
  - iio_trigger_attach_pollfunc had some really badly wrong error handling.
  Another nasty triggered whilst chasing down issues with the st sensors
  rework below.
* ad5592r
  - fix an off by one error when allocating channels.
* am2315
  - a stray mutex unlock before we ever take the lock.
* apds9960
  - missing a parent in the driver model (which should be the i2c device).
  Result is it doesn't turn up under /sys/bus/i2c/devices which some
  userspace code uses for repeatable device identification.
* as3935
  - ABI usage bug which meant a processed value was reported as raw. Now
    reporting scale as well to ensure userspace has the info it needs.
  - Don't return processed value via the buffer - it doesn't conform to
    the ABI and will overflow in some cases.
  - Fix a wrongly sized buffer which would overflow trashing part of the
    stack.  Also move it onto the heap as part of the fix.
* bh1780
  - a missing return after write in debugfs lead to an incorrect read and
    a null pointer dereference.
  - dereferencing the wrong pointer in suspend and resume leading to
    unpredictable results.
  - assign a static name to avoid accidentally ending up with no name if
    loaded via device tree.
* bmi160
  - output data rate for the accelerometer was incorrectly reported. Fix it.
  - writing the output data rate was also wrong due to reverse parameters.
* bmp280
  - error message for wrong chip ID gave the wrong expected value.
* hdc100x
  - mask for writing the integration time was wrong allowin g us to get
  'stuck' in a particular value with no way back.
  - temperature reported in celsius rather than millicelsius as per the
  ABI.
  - Get rid of some incorrect data shifting which lead to readings being
  rather incorrect.
* max44000
  - drop scale attribute for proximity as it is an unscaled value (depends
    on what is in range rather than anything knowable at the detector).
* st-pressure
  - ABI compliance fixes - units were wrong.
* st-sensors
  - We introduced some nasty issues with the recent switch over to a
  a somewhat threaded handler in that we broke using a software trigger
  with these devices.  Now do it properly.  It's a larger patch than ideal
  for a fix, but the logic is straight forward.
  - Make sure the trigger is initialized before requesting the interrupt.
  This matters now the interrupt can be shared. Before it was ugly and wrong
  but short of flakey hardware could not be triggered.
  - Hammer down the dataready pin at boot - otherwise with really
  unlucky timing things could get interestingly wedged requiring a hard power
  down of the chip.
parents af8c34ce 94bef000

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

+1 −1
Original line number Diff line number Diff line 
What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw

What		/sys/bus/iio/devices/iio:deviceX/in_proximity_input

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

drivers/iio/accel/st_accel_buffer.c

+1 −1
Original line number Diff line number Diff line
@@ -91,7 +91,7 @@ static const struct iio_buffer_setup_ops st_accel_buffer_setup_ops = { 


int st_accel_allocate_ring(struct iio_dev *indio_dev)

{

	return iio_triggered_buffer_setup(indio_dev, &iio_pollfunc_store_time,

	return iio_triggered_buffer_setup(indio_dev, NULL,

		&st_sensors_trigger_handler, &st_accel_buffer_setup_ops);

}

drivers/iio/accel/st_accel_core.c

+1 −0
Original line number Diff line number Diff line
@@ -741,6 +741,7 @@ static const struct iio_info accel_info = { 
static const struct iio_trigger_ops st_accel_trigger_ops = {

	.owner = THIS_MODULE,

	.set_trigger_state = ST_ACCEL_TRIGGER_SET_STATE,

	.validate_device = st_sensors_validate_device,

};

#define ST_ACCEL_TRIGGER_OPS (&st_accel_trigger_ops)

#else

drivers/iio/common/st_sensors/st_sensors_buffer.c

+7 −18
Original line number Diff line number Diff line
@@ -57,31 +57,20 @@ irqreturn_t st_sensors_trigger_handler(int irq, void *p) 
	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->indio_dev;

	struct st_sensor_data *sdata = iio_priv(indio_dev);

	s64 timestamp;



	/* If we have a status register, check if this IRQ came from us */

	if (sdata->sensor_settings->drdy_irq.addr_stat_drdy) {

		u8 status;



		len = sdata->tf->read_byte(&sdata->tb, sdata->dev,

			   sdata->sensor_settings->drdy_irq.addr_stat_drdy,

			   &status);

		if (len < 0)

			dev_err(sdata->dev, "could not read channel status\n");



		/*

		 * If this was not caused by any channels on this sensor,

		 * return IRQ_NONE

		 */

		if (!(status & (u8)indio_dev->active_scan_mask[0]))

			return IRQ_NONE;

	}

	/* If we do timetamping here, do it before reading the values */

	if (sdata->hw_irq_trigger)

		timestamp = sdata->hw_timestamp;

	else

		timestamp = iio_get_time_ns();



	len = st_sensors_get_buffer_element(indio_dev, sdata->buffer_data);

	if (len < 0)

		goto st_sensors_get_buffer_element_error;



	iio_push_to_buffers_with_timestamp(indio_dev, sdata->buffer_data,

		pf->timestamp);

					   timestamp);



st_sensors_get_buffer_element_error:

	iio_trigger_notify_done(indio_dev->trig);

drivers/iio/common/st_sensors/st_sensors_core.c

+8 −0
Original line number Diff line number Diff line
@@ -363,6 +363,11 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev, 
	if (err < 0)

		return err;



	/* Disable DRDY, this might be still be enabled after reboot. */

	err = st_sensors_set_dataready_irq(indio_dev, false);

	if (err < 0)

		return err;



	if (sdata->current_fullscale) {

		err = st_sensors_set_fullscale(indio_dev,

						sdata->current_fullscale->num);
@@ -424,6 +429,9 @@ int st_sensors_set_dataready_irq(struct iio_dev *indio_dev, bool enable) 
	else

		drdy_mask = sdata->sensor_settings->drdy_irq.mask_int2;



	/* Flag to the poll function that the hardware trigger is in use */

	sdata->hw_irq_trigger = enable;



	/* Enable/Disable the interrupt generator for data ready. */

	err = st_sensors_write_data_with_mask(indio_dev,

					sdata->sensor_settings->drdy_irq.addr,