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

Commit a50094a4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull IIO and staging fixes from Greg KH:
 "Here are a number of IIO and staging bugfixes for 4.7-rc4.

  Nothing huge, the normal amount of iio driver fixes, and some small
  staging driver bugfixes for some reported problems (2 are reverts of
  patches that went into 4.7-rc1).  All have been in linux-next with no
  reported issues"

* tag 'staging-4.7-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (24 commits)
  Revert "Staging: rtl8188eu: rtw_efuse: Use sizeof type *pointer instead of sizeof type."
  Revert "Staging: drivers: rtl8188eu: use sizeof(*ptr) instead of sizeof(struct)"
  staging: lustre: lnet: Don't access NULL NI on failure path
  iio: hudmidity: hdc100x: fix incorrect shifting and scaling
  iio: light apds9960: Add the missing dev.parent
  iio: Fix error handling in iio_trigger_attach_poll_func
  iio: st_sensors: Disable DRDY at init time
  iio: st_sensors: Init trigger before irq request
  iio: st_sensors: switch to a threaded interrupt
  iio: light: bh1780: assign a static name
  iio: bh1780: dereference the client properly
  iio: humidity: hdc100x: fix IIO_TEMP channel reporting
  iio:st_pressure: fix sampling gains (bring inline with ABI)
  iio: proximity: as3935: fix buffer stack trashing
  iio: proximity: as3935: remove triggered buffer processing
  iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output
  max44000: Remove scale from proximity
  iio: humidity: am2315: Remove a stray unlock
  iio: humidity: hdc100x: correct humidity integration time mask
  iio: pressure: bmp280: fix error message for wrong chip id
  ...
parents 607117a1 bc8201e3

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,