Commit 315f7e15 authored Jun 20, 2022 by Greg Kroah-Hartman

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

Merge tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-next

Jonathan writes:

1st set of IIO fixes for the 5.19 cycle.

Most of these have been in next for a long time. Unfortunately there
was one stray patch in the branch (wasn't a fix), so I've just rebased
to remove that.

* testing
- Fix a missing MODULE_LICENSE() warning by restricting possible build
configs.
* Various drivers
- Fix ordering of iio_get_trigger() being called before
iio_trigger_register()
* adi,admv1014
- Fix dubious x & !y warning.
* adi,axi-adc
- Fix missing of_node_put() in error and normal paths.
* aspeed,adc
- Add missing of_node_put()
* fsl,mma8452
- Fix broken probing from device tree.
- Drop check on return value of i2c write to device to cause reset as
ACK will be missing (device reset before sending it).
* fsl,vf610
- Fix documentation of in_conversion_mode ABI.
* iio-trig-sysfs
- Ensure irq work has finished before freeing the trigger.
* invensense,mpu3050
- Disable regulators in error path.
* invensense,icm42600
- Fix collision of enum value of 0 with error path where 0 is no match.
* renesas,rzg2l_Adc
- Add missing fwnode_handle_put() in error path.
* rescale
- Fix a boolean logic bug for detection of raw + scale affecting an
obscure corner case.
* semtech,sx9324
- Check return value of read of pin_defs
* st,stm32-adc:
- Fix interaction across ADC instances for some supported devices.
- Drop false spurious IRQ messages.
- Fix calibration value handling. If we can't calibrate don't expose the
vref_int channel.
- Fix maximum clock rate for stm32pm15x
* ti,ads131e08
- Add missing fwnode_handle_put() in error paths.
* xilinx,ams
- Fix variable checked for error from platform_get_irq()
* x-powers,axp288
- Overide TS_PIN bias current for boards where it is not correctly
initialized.
* yamaha,yas530
- Fix inverted check on calibration data being all zeros.

* tag 'iio-fixes-for-5.19a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (26 commits)
iio:proximity:sx9324: Check ret value of device_property_read_u32_array()
iio: accel: mma8452: ignore the return value of reset operation
iio: adc: stm32: fix maximum clock rate for stm32mp15x
iio: adc: stm32: fix vrefint wrong calibration value handling
iio: imu: inv_icm42600: Fix broken icm42600 (chip id 0 value)
iio: adc: vf610: fix conversion mode sysfs node name
iio: adc: adi-axi-adc: Fix refcount leak in adi_axi_adc_attach_client
iio: test: fix missing MODULE_LICENSE for IIO_RESCALE=m
iio:humidity:hts221: rearrange iio trigger get and register
iio:chemical:ccs811: rearrange iio trigger get and register
iio:accel:mxc4005: rearrange iio trigger get and register
iio:accel:kxcjk-1013: rearrange iio trigger get and register
iio:accel:bma180: rearrange iio trigger get and register
iio: afe: rescale: Fix boolean logic bug
iio: adc: aspeed: Fix refcount leak in aspeed_adc_set_trim_data
iio: adc: stm32: Fix IRQs on STM32F4 by removing custom spurious IRQs message
iio: adc: stm32: Fix ADCs iteration in irq handler
iio: adc: ti-ads131e08: add missing fwnode_handle_put() in ads131e08_alloc_channels()
iio: adc: rzg2l_adc: add missing fwnode_handle_put() in rzg2l_adc_parse_properties()
iio: trigger: sysfs: fix use-after-free on remove
...

parents a111daf0 70171ed6

Documentation/ABI/testing/sysfs-bus-iio-vf610

+1 −1

Original line number	Diff line number	Diff line
		What: /sys/bus/iio/devices/iio:deviceX/conversion_mode
		What: /sys/bus/iio/devices/iio:deviceX/in_conversion_mode
		KernelVersion: 4.2
		Contact: linux-iio@vger.kernel.org
		Description:

drivers/iio/accel/bma180.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1006,11 +1006,12 @@ static int bma180_probe(struct i2c_client *client,

		data->trig->ops = &bma180_trigger_ops;
		iio_trigger_set_drvdata(data->trig, indio_dev);
		indio_dev->trig = iio_trigger_get(data->trig);

		ret = iio_trigger_register(data->trig);
		if (ret)
		goto err_trigger_free;

		indio_dev->trig = iio_trigger_get(data->trig);
		}

		ret = iio_triggered_buffer_setup(indio_dev, NULL,

drivers/iio/accel/kxcjk-1013.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -1554,12 +1554,12 @@ static int kxcjk1013_probe(struct i2c_client *client,

		data->dready_trig->ops = &kxcjk1013_trigger_ops;
		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
		indio_dev->trig = data->dready_trig;
		iio_trigger_get(indio_dev->trig);
		ret = iio_trigger_register(data->dready_trig);
		if (ret)
		goto err_poweroff;

		indio_dev->trig = iio_trigger_get(data->dready_trig);

		data->motion_trig->ops = &kxcjk1013_trigger_ops;
		iio_trigger_set_drvdata(data->motion_trig, indio_dev);
		ret = iio_trigger_register(data->motion_trig);

drivers/iio/accel/mma8452.c

+14 −8

Original line number	Diff line number	Diff line
		@@ -1511,10 +1511,14 @@ static int mma8452_reset(struct i2c_client *client)
		int i;
		int ret;

		ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG2,
		/*
		* Find on fxls8471, after config reset bit, it reset immediately,
		* and will not give ACK, so here do not check the return value.
		* The following code will read the reset register, and check whether
		* this reset works.
		*/
		i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG2,
		MMA8452_CTRL_REG2_RST);
		if (ret < 0)
		return ret;

		for (i = 0; i < 10; i++) {
		usleep_range(100, 200);
		@@ -1557,12 +1561,14 @@ static int mma8452_probe(struct i2c_client *client,
		mutex_init(&data->lock);

		data->chip_info = device_get_match_data(&client->dev);
		if (!data->chip_info && id) {
		if (!data->chip_info) {
		if (id) {
		data->chip_info = &mma_chip_info_table[id->driver_data];
		} else {
		dev_err(&client->dev, "unknown device model\n");
		return -ENODEV;
		}
		}

		ret = iio_read_mount_matrix(&client->dev, &data->orientation);
		if (ret)

drivers/iio/accel/mxc4005.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -456,8 +456,6 @@ static int mxc4005_probe(struct i2c_client *client,

		data->dready_trig->ops = &mxc4005_trigger_ops;
		iio_trigger_set_drvdata(data->dready_trig, indio_dev);
		indio_dev->trig = data->dready_trig;
		iio_trigger_get(indio_dev->trig);
		ret = devm_iio_trigger_register(&client->dev,
		data->dready_trig);
		if (ret) {
		@@ -465,6 +463,8 @@ static int mxc4005_probe(struct i2c_client *client,
		"failed to register trigger\n");
		return ret;
		}

		indio_dev->trig = iio_trigger_get(data->dready_trig);
		}

		return devm_iio_device_register(&client->dev, indio_dev);