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

Commit 6ea17ed1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

  Most of these are minor IIO fixes of reported issues, along with one
  network driver fix to resolve an issue. And a MAINTAINERS update with
  a new mailing list. All of these, except the MAINTAINERS file update,
  have been in linux-next with no reported issues (the MAINTAINERS patch
  happened on Friday...)"

* tag 'staging-4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  MAINTAINERS: add greybus subsystem mailing list
  staging: octeon: Call SET_NETDEV_DEV()
  iio: accel: st_accel: fix LIS3LV02 reading and scaling
  iio: common: st_sensors: fix channel data parsing
  iio: max44000: correct value in illuminance_integration_time_available
  iio: adc: TI_AM335X_ADC should depend on HAS_DMA
  iio: bmi160: Fix time needed to sleep after command execution
  iio: 104-quad-8: Fix active level mismatch for the preset enable option
  iio: 104-quad-8: Fix off-by-one errors when addressing IOR
  iio: 104-quad-8: Fix index control configuration
parents ea07b862 01d0f715

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5507,6 +5507,7 @@ M: Alex Elder <elder@kernel.org> 
M:	Greg Kroah-Hartman <gregkh@linuxfoundation.org>

S:	Maintained

F:	drivers/staging/greybus/

L:	greybus-dev@lists.linaro.org



GREYBUS AUDIO PROTOCOLS DRIVERS

M:	Vaibhav Agarwal <vaibhav.sr@gmail.com>

drivers/iio/accel/st_accel_core.c

+10 −2
Original line number Diff line number Diff line
@@ -353,12 +353,12 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
				[0] = {

					.num = ST_ACCEL_FS_AVL_2G,

					.value = 0x00,

					.gain = IIO_G_TO_M_S_2(1024),

					.gain = IIO_G_TO_M_S_2(1000),

				},

				[1] = {

					.num = ST_ACCEL_FS_AVL_6G,

					.value = 0x01,

					.gain = IIO_G_TO_M_S_2(340),

					.gain = IIO_G_TO_M_S_2(3000),

				},

			},

		},
@@ -366,6 +366,14 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.addr = 0x21,

			.mask = 0x40,

		},

		/*

		 * Data Alignment Setting - needs to be set to get

		 * left-justified data like all other sensors.

		 */

		.das = {

			.addr = 0x21,

			.mask = 0x01,

		},

		.drdy_irq = {

			.addr = 0x21,

			.mask_int1 = 0x04,

drivers/iio/adc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -561,7 +561,7 @@ config TI_ADS8688 


config TI_AM335X_ADC

	tristate "TI's AM335X ADC driver"

	depends on MFD_TI_AM335X_TSCADC

	depends on MFD_TI_AM335X_TSCADC && HAS_DMA

	select IIO_BUFFER

	select IIO_KFIFO_BUF

	help

drivers/iio/common/st_sensors/st_sensors_buffer.c

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,9 @@ static int st_sensors_get_buffer_element(struct iio_dev *indio_dev, u8 *buf) 


	for_each_set_bit(i, indio_dev->active_scan_mask, num_data_channels) {

		const struct iio_chan_spec *channel = &indio_dev->channels[i];

		unsigned int bytes_to_read = channel->scan_type.realbits >> 3;

		unsigned int bytes_to_read =

			DIV_ROUND_UP(channel->scan_type.realbits +

				     channel->scan_type.shift, 8);

		unsigned int storage_bytes =

			channel->scan_type.storagebits >> 3;

drivers/iio/common/st_sensors/st_sensors_core.c

+12 −1
Original line number Diff line number Diff line
@@ -401,6 +401,15 @@ int st_sensors_init_sensor(struct iio_dev *indio_dev, 
			return err;

	}



	/* set DAS */

	if (sdata->sensor_settings->das.addr) {

		err = st_sensors_write_data_with_mask(indio_dev,

					sdata->sensor_settings->das.addr,

					sdata->sensor_settings->das.mask, 1);

		if (err < 0)

			return err;

	}



	if (sdata->int_pin_open_drain) {

		dev_info(&indio_dev->dev,

			 "set interrupt line to open drain mode\n");
@@ -483,8 +492,10 @@ static int st_sensors_read_axis_data(struct iio_dev *indio_dev, 
	int err;

	u8 *outdata;

	struct st_sensor_data *sdata = iio_priv(indio_dev);

	unsigned int byte_for_channel = ch->scan_type.realbits >> 3;

	unsigned int byte_for_channel;



	byte_for_channel = DIV_ROUND_UP(ch->scan_type.realbits +

					ch->scan_type.shift, 8);

	outdata = kmalloc(byte_for_channel, GFP_KERNEL);

	if (!outdata)

		return -ENOMEM;