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

Merge tag 'iio-fixes-5.14a' of... 

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

Jonathan writes:

First set of fixes for IIO in the 5.14 cycle

adi,adis:
 - Ensure GPIO pin direction set explicitly in driver.
fxls8952af:
 - Fix use of ret when not initialized.
 - Fix issue with use of module symbol from built in.
hdc100x:
 - Add a margin to conversion time as some parts run to slowly.
palmas-adc:
 - Fix a wrong exit condition that leads to adc period always being set
   to maximum value.
st,sensors:
 - Drop a wrong restriction on number of interrupts in dt binding.
ti-ads7950:
 - Ensure CS deasserted after channel read.

* tag 'iio-fixes-5.14a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: adc: Fix incorrect exit of for-loop
  iio: humidity: hdc100x: Add margin to the conversion time
  dt-bindings: iio: st: Remove wrong items length check
  iio: accel: fxls8962af: fix i2c dependency
  iio: adis: set GPIO reset pin direction
  iio: adc: ti-ads7950: Ensure CS is deasserted after reading channels
  iio: accel: fxls8962af: fix potential use of uninitialized symbol
parents 36a21d51 5afc1540

Documentation/devicetree/bindings/iio/st,st-sensors.yaml

+0 −41
Original line number Diff line number Diff line
@@ -152,47 +152,6 @@ allOf: 
          maxItems: 1

        st,drdy-int-pin: false



  - if:

      properties:

        compatible:

          enum:

            # Two intertial interrupts i.e. accelerometer/gyro interrupts

            - st,h3lis331dl-accel

            - st,l3g4200d-gyro

            - st,l3g4is-gyro

            - st,l3gd20-gyro

            - st,l3gd20h-gyro

            - st,lis2de12

            - st,lis2dw12

            - st,lis2hh12

            - st,lis2dh12-accel

            - st,lis331dl-accel

            - st,lis331dlh-accel

            - st,lis3de

            - st,lis3dh-accel

            - st,lis3dhh

            - st,lis3mdl-magn

            - st,lng2dm-accel

            - st,lps331ap-press

            - st,lsm303agr-accel

            - st,lsm303dlh-accel

            - st,lsm303dlhc-accel

            - st,lsm303dlm-accel

            - st,lsm330-accel

            - st,lsm330-gyro

            - st,lsm330d-accel

            - st,lsm330d-gyro

            - st,lsm330dl-accel

            - st,lsm330dl-gyro

            - st,lsm330dlc-accel

            - st,lsm330dlc-gyro

            - st,lsm9ds0-gyro

            - st,lsm9ds1-magn

    then:

      properties:

        interrupts:

          maxItems: 2



required:

  - compatible

  - reg

drivers/iio/accel/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ config DMARD10 


config FXLS8962AF

	tristate

	depends on I2C || !I2C # cannot be built-in for modular I2C



config FXLS8962AF_I2C

	tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer I2C Driver"
@@ -247,6 +248,7 @@ config FXLS8962AF_I2C 
config FXLS8962AF_SPI

	tristate "NXP FXLS8962AF/FXLS8964AF Accelerometer SPI Driver"

	depends on SPI

	depends on I2C || !I2C

	select FXLS8962AF

	select REGMAP_SPI

	help

drivers/iio/accel/fxls8962af-core.c

+1 −1
Original line number Diff line number Diff line
@@ -637,7 +637,7 @@ static int fxls8962af_i2c_raw_read_errata3(struct fxls8962af_data *data, 
			return ret;

	}



	return ret;

	return 0;

}



static int fxls8962af_fifo_transfer(struct fxls8962af_data *data,

drivers/iio/adc/palmas_gpadc.c

+2 −2
Original line number Diff line number Diff line
@@ -664,8 +664,8 @@ static int palmas_adc_wakeup_configure(struct palmas_gpadc *adc) 


	adc_period = adc->auto_conversion_period;

	for (i = 0; i < 16; ++i) {

		if (((1000 * (1 << i)) / 32) < adc_period)

			continue;

		if (((1000 * (1 << i)) / 32) >= adc_period)

			break;

	}

	if (i > 0)

		i--;

drivers/iio/adc/ti-ads7950.c

+0 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ static int ti_ads7950_probe(struct spi_device *spi) 
	st->ring_xfer.tx_buf = &st->tx_buf[0];

	st->ring_xfer.rx_buf = &st->rx_buf[0];

	/* len will be set later */

	st->ring_xfer.cs_change = true;



	spi_message_add_tail(&st->ring_xfer, &st->ring_msg);