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

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

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

Jonathan writes:

First set of fixes for IIO in the 5.5 cycle.

Mixture of old things people have just hit, and a few late breaking
issues with things that went in during the merge window.

Being sent promptly to resolve potential DT breakage causing
issues for binding test builds.

* ad7606
  - Avoid reading extra data from the device over what was intended.
* ad7124
  - Enable the internal reference when in use.
* ad7292
  - Fix up license for newly added binding.  Better to not have this go
    out in a release with more limited header than intended.
  - Fix a constraint on number of channels.
* ad7949
  - Fix an issue which can result in readouts being from the wrong channel.
* hdc100x
  - Fix wrong ABI usage (units) for relative humidity channel.
* intel mrfld
  - Allocate right amount of private data (currently allocating too much).
* ltc2983
  - Avoid a potential issue with machine endianness and wrong length device
    tree read.
* max1027
  - Clean up leak of an iio_trigger on probe failure.
* max9611
  - Ensure we sleep long enough to successfully initialize the sensor.
* mpu6050
  - Fix wrong ABI usage (units) for temperature channel.
* st_accel
  - Fix an unused variable warning.
* st_lsm6dsx
  - Fix decimation factor issue that can lead to missaligned datasets
    (and hence garbage)
  - Fix an issue with how we track enabled fifo channels.
  - Avoid powering off the device if wake up events are enabled.

* tag 'iio-fixes-for-5.5a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio:
  iio: adc: max9611: Fix too short conversion time delay
  iio: ad7949: fix channels mixups
  iio: imu: st_lsm6dsx: do not power-off accel if events are enabled
  iio: imu: st_lsm6dsx: track hw FIFO buffering with fifo_mask
  iio: imu: st_lsm6dsx: fix decimation factor estimation
  iio: imu: inv_mpu6050: fix temperature reporting using bad unit
  iio: humidity: hdc100x: fix IIO_HUMIDITYRELATIVE channel reporting
  iio: adc: max1027: fix not unregistered iio trigger
  iio: adc: intel_mrfld_adc: Allocating too much data in probe()
  iio: adc: ad7124: Enable internal reference
  dt-bindings: iio: adc: ad7292: fix constraint over channel quantity
  dt-bindings: iio: adc: ad7292: Update SPDX identifier
  iio: temperature: ltc2983: fix u32 read into a unsigned long long
  iio: st_accel: Fix unused variable warning
  iio: adc: ad7606: fix reading unnecessary data from device
parents e42617b8 9fd229c4

Documentation/devicetree/bindings/iio/adc/adi,ad7292.yaml

+3 −2
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/iio/adc/adi,ad7292.yaml#
@@ -53,6 +53,7 @@ patternProperties: 
        description: |

          The channel number. It can have up to 8 channels numbered from 0 to 7.

        items:

          - minimum: 0

            maximum: 7



      diff-channels:

drivers/iio/accel/st_accel_core.c

+6 −2
Original line number Diff line number Diff line
@@ -992,6 +992,7 @@ static const struct iio_trigger_ops st_accel_trigger_ops = { 
#define ST_ACCEL_TRIGGER_OPS NULL

#endif



#ifdef CONFIG_ACPI

static const struct iio_mount_matrix *

get_mount_matrix(const struct iio_dev *indio_dev,

		 const struct iio_chan_spec *chan)
@@ -1012,7 +1013,6 @@ static const struct iio_chan_spec_ext_info mount_matrix_ext_info[] = { 
static int apply_acpi_orientation(struct iio_dev *indio_dev,

				  struct iio_chan_spec *channels)

{

#ifdef CONFIG_ACPI

	struct st_sensor_data *adata = iio_priv(indio_dev);

	struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};

	struct acpi_device *adev;
@@ -1140,10 +1140,14 @@ static int apply_acpi_orientation(struct iio_dev *indio_dev, 
out:

	kfree(buffer.pointer);

	return ret;

}

#else /* !CONFIG_ACPI */

static int apply_acpi_orientation(struct iio_dev *indio_dev,

				  struct iio_chan_spec *channels)

{

	return 0;

#endif

}

#endif



/*

 * st_accel_get_settings() - get sensor settings from device name

drivers/iio/adc/ad7124.c

+6 −1
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#define AD7124_STATUS_POR_FLAG_MSK	BIT(4)



/* AD7124_ADC_CONTROL */

#define AD7124_ADC_CTRL_REF_EN_MSK	BIT(8)

#define AD7124_ADC_CTRL_REF_EN(x)	FIELD_PREP(AD7124_ADC_CTRL_REF_EN_MSK, x)

#define AD7124_ADC_CTRL_PWR_MSK	GENMASK(7, 6)

#define AD7124_ADC_CTRL_PWR(x)		FIELD_PREP(AD7124_ADC_CTRL_PWR_MSK, x)

#define AD7124_ADC_CTRL_MODE_MSK	GENMASK(5, 2)
@@ -424,7 +426,10 @@ static int ad7124_init_channel_vref(struct ad7124_state *st, 
		break;

	case AD7124_INT_REF:

		st->channel_config[channel_number].vref_mv = 2500;

		break;

		st->adc_control &= ~AD7124_ADC_CTRL_REF_EN_MSK;

		st->adc_control |= AD7124_ADC_CTRL_REF_EN(1);

		return ad_sd_write_reg(&st->sd, AD7124_ADC_CONTROL,

				      2, st->adc_control);

	default:

		dev_err(&st->sd.spi->dev, "Invalid reference %d\n", refsel);

		return -EINVAL;

drivers/iio/adc/ad7606.c

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ static int ad7606_reg_access(struct iio_dev *indio_dev, 


static int ad7606_read_samples(struct ad7606_state *st)

{

	unsigned int num = st->chip_info->num_channels;

	unsigned int num = st->chip_info->num_channels - 1;

	u16 *data = st->data;

	int ret;

drivers/iio/adc/ad7949.c

+17 −5
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, 
				   unsigned int channel)

{

	int ret;

	int i;

	int bits_per_word = ad7949_adc->resolution;

	int mask = GENMASK(ad7949_adc->resolution, 0);

	struct spi_message msg;
@@ -100,12 +101,23 @@ static int ad7949_spi_read_channel(struct ad7949_adc_chip *ad7949_adc, int *val, 
		},

	};



	/*

	 * 1: write CFG for sample N and read old data (sample N-2)

	 * 2: if CFG was not changed since sample N-1 then we'll get good data

	 *    at the next xfer, so we bail out now, otherwise we write something

	 *    and we read garbage (sample N-1 configuration).

	 */

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

		ret = ad7949_spi_write_cfg(ad7949_adc,

					   channel << AD7949_OFFSET_CHANNEL_SEL,

					   AD7949_MASK_CHANNEL_SEL);

		if (ret)

			return ret;

		if (channel == ad7949_adc->current_channel)

			break;

	}



	/* 3: write something and read actual data */

	ad7949_adc->buffer = 0;

	spi_message_init_with_transfers(&msg, tx, 1);

	ret = spi_sync(ad7949_adc->spi, &msg);