Commit 3bd14829 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO fixes from Greg KH:
 "Here are a number of small staging and IIO driver fixes for 5.6-rc7

  Nothing major here, just resolutions for some reported problems:
   - iio bugfixes for a number of different drivers
   - greybus loopback_test fixes
   - wfx driver fixes

  All of these have been in linux-next with no reported issues"

* tag 'staging-5.6-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: rtl8188eu: Add device id for MERCUSYS MW150US v2
  staging: greybus: loopback_test: fix potential path truncations
  staging: greybus: loopback_test: fix potential path truncation
  staging: greybus: loopback_test: fix poll-mask build breakage
  staging: wfx: fix RCU usage between hif_join() and ieee80211_bss_get_ie()
  staging: wfx: fix RCU usage in wfx_join_finalize()
  staging: wfx: make warning about pending frame less scary
  staging: wfx: fix lines ending with a comma instead of a semicolon
  staging: wfx: fix warning about freeing in-use mutex during device unregister
  staging/speakup: fix get_word non-space look-ahead
  iio: ping: set pa_laser_ping_cfg in of_ping_match
  iio: chemical: sps30: fix missing triggered buffer dependency
  iio: st_sensors: remap SMO8840 to LIS2DH12
  iio: light: vcnl4000: update sampling periods for vcnl4040
  iio: light: vcnl4000: update sampling periods for vcnl4200
  iio: accel: adxl372: Set iio_chan BE
  iio: magnetometer: ak8974: Fix negative raw values in sysfs
  iio: trigger: stm32-timer: disable master mode when stopping
  iio: adc: stm32-dfsdm: fix sleep in atomic context
  iio: adc: at91-sama5d2_adc: fix differential channels in triggered mode
parents b07c2e76 14800df6

drivers/iio/accel/adxl372.c

+1 −0
Original line number Diff line number Diff line
@@ -237,6 +237,7 @@ static const struct adxl372_axis_lookup adxl372_axis_lookup_table[] = { 
		.realbits = 12,						\

		.storagebits = 16,					\

		.shift = 4,						\

		.endianness = IIO_BE,					\

	},								\

}

drivers/iio/accel/st_accel_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -110,7 +110,7 @@ MODULE_DEVICE_TABLE(of, st_accel_of_match); 


#ifdef CONFIG_ACPI

static const struct acpi_device_id st_accel_acpi_match[] = {

	{"SMO8840", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},

	{"SMO8840", (kernel_ulong_t)LIS2DH12_ACCEL_DEV_NAME},

	{"SMO8A90", (kernel_ulong_t)LNG2DM_ACCEL_DEV_NAME},

	{ },

};

drivers/iio/adc/at91-sama5d2_adc.c

+15 −0
Original line number Diff line number Diff line
@@ -723,6 +723,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 


	for_each_set_bit(bit, indio->active_scan_mask, indio->num_channels) {

		struct iio_chan_spec const *chan = at91_adc_chan_get(indio, bit);

		u32 cor;



		if (!chan)

			continue;
@@ -731,6 +732,20 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
		    chan->type == IIO_PRESSURE)

			continue;



		if (state) {

			cor = at91_adc_readl(st, AT91_SAMA5D2_COR);



			if (chan->differential)

				cor |= (BIT(chan->channel) |

					BIT(chan->channel2)) <<

					AT91_SAMA5D2_COR_DIFF_OFFSET;

			else

				cor &= ~(BIT(chan->channel) <<

				       AT91_SAMA5D2_COR_DIFF_OFFSET);



			at91_adc_writel(st, AT91_SAMA5D2_COR, cor);

		}



		if (state) {

			at91_adc_writel(st, AT91_SAMA5D2_CHER,

					BIT(chan->channel));

drivers/iio/adc/stm32-dfsdm-adc.c

+10 −33
Original line number Diff line number Diff line
@@ -842,31 +842,6 @@ static inline void stm32_dfsdm_process_data(struct stm32_dfsdm_adc *adc, 
	}

}



static irqreturn_t stm32_dfsdm_adc_trigger_handler(int irq, void *p)

{

	struct iio_poll_func *pf = p;

	struct iio_dev *indio_dev = pf->indio_dev;

	struct stm32_dfsdm_adc *adc = iio_priv(indio_dev);

	int available = stm32_dfsdm_adc_dma_residue(adc);



	while (available >= indio_dev->scan_bytes) {

		s32 *buffer = (s32 *)&adc->rx_buf[adc->bufi];



		stm32_dfsdm_process_data(adc, buffer);



		iio_push_to_buffers_with_timestamp(indio_dev, buffer,

						   pf->timestamp);

		available -= indio_dev->scan_bytes;

		adc->bufi += indio_dev->scan_bytes;

		if (adc->bufi >= adc->buf_sz)

			adc->bufi = 0;

	}



	iio_trigger_notify_done(indio_dev->trig);



	return IRQ_HANDLED;

}



static void stm32_dfsdm_dma_buffer_done(void *data)

{

	struct iio_dev *indio_dev = data;
@@ -874,11 +849,6 @@ static void stm32_dfsdm_dma_buffer_done(void *data) 
	int available = stm32_dfsdm_adc_dma_residue(adc);

	size_t old_pos;



	if (indio_dev->currentmode & INDIO_BUFFER_TRIGGERED) {

		iio_trigger_poll_chained(indio_dev->trig);

		return;

	}



	/*

	 * FIXME: In Kernel interface does not support cyclic DMA buffer,and

	 * offers only an interface to push data samples per samples.
@@ -906,7 +876,15 @@ static void stm32_dfsdm_dma_buffer_done(void *data) 
			adc->bufi = 0;

			old_pos = 0;

		}

		/* regular iio buffer without trigger */

		/*

		 * In DMA mode the trigger services of IIO are not used

		 * (e.g. no call to iio_trigger_poll).

		 * Calling irq handler associated to the hardware trigger is not

		 * relevant as the conversions have already been done. Data

		 * transfers are performed directly in DMA callback instead.

		 * This implementation avoids to call trigger irq handler that

		 * may sleep, in an atomic context (DMA irq handler context).

		 */

		if (adc->dev_data->type == DFSDM_IIO)

			iio_push_to_buffers(indio_dev, buffer);

	}
@@ -1536,8 +1514,7 @@ static int stm32_dfsdm_adc_init(struct iio_dev *indio_dev) 
	}



	ret = iio_triggered_buffer_setup(indio_dev,

					 &iio_pollfunc_store_time,

					 &stm32_dfsdm_adc_trigger_handler,

					 &iio_pollfunc_store_time, NULL,

					 &stm32_dfsdm_buffer_setup_ops);

	if (ret) {

		stm32_dfsdm_dma_release(indio_dev);

drivers/iio/chemical/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ config SPS30 
	tristate "SPS30 particulate matter sensor"

	depends on I2C

	select CRC8

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	help

	  Say Y here to build support for the Sensirion SPS30 particulate

	  matter sensor.

CRA Git | Maintained and supported by SUSTech CRA and CCSE