Merge tag 'iio-fixes-for-5.2b' of... (d7a5417b) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/counter/Kconfig

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -51,6 +51,7 @@ config STM32_LPTIMER_CNT

	config FTM_QUADDEC		config FTM_QUADDEC
	tristate "Flex Timer Module Quadrature decoder driver"		tristate "Flex Timer Module Quadrature decoder driver"
			depends on HAS_IOMEM && OF
	help		help
	Select this option to enable the Flex Timer Quadrature decoder		Select this option to enable the Flex Timer Quadrature decoder
	driver.		driver.

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -270,6 +270,7 @@ struct st_lsm6dsx_sensor {
	* @conf_lock: Mutex to prevent concurrent FIFO configuration update.		* @conf_lock: Mutex to prevent concurrent FIFO configuration update.
	* @page_lock: Mutex to prevent concurrent memory page configuration.		* @page_lock: Mutex to prevent concurrent memory page configuration.
	* @fifo_mode: FIFO operating mode supported by the device.		* @fifo_mode: FIFO operating mode supported by the device.
			* @suspend_mask: Suspended sensor bitmask.
	* @enable_mask: Enabled sensor bitmask.		* @enable_mask: Enabled sensor bitmask.
	* @ts_sip: Total number of timestamp samples in a given pattern.		* @ts_sip: Total number of timestamp samples in a given pattern.
	* @sip: Total number of samples (acc/gyro/ts) in a given pattern.		* @sip: Total number of samples (acc/gyro/ts) in a given pattern.
	@@ -287,6 +288,7 @@ struct st_lsm6dsx_hw {
	struct mutex page_lock;		struct mutex page_lock;

	enum st_lsm6dsx_fifo_mode fifo_mode;		enum st_lsm6dsx_fifo_mode fifo_mode;
			u8 suspend_mask;
	u8 enable_mask;		u8 enable_mask;
	u8 ts_sip;		u8 ts_sip;
	u8 sip;		u8 sip;

drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c

+17 −8

Original line number	Original line	Diff line number	Diff line
	@@ -1109,8 +1109,6 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev)
	{		{
	struct st_lsm6dsx_hw *hw = dev_get_drvdata(dev);		struct st_lsm6dsx_hw *hw = dev_get_drvdata(dev);
	struct st_lsm6dsx_sensor *sensor;		struct st_lsm6dsx_sensor *sensor;
	const struct st_lsm6dsx_reg *reg;
	unsigned int data;
	int i, err = 0;		int i, err = 0;

	for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {		for (i = 0; i < ST_LSM6DSX_ID_MAX; i++) {
	@@ -1121,12 +1119,16 @@ static int __maybe_unused st_lsm6dsx_suspend(struct device *dev)
	if (!(hw->enable_mask & BIT(sensor->id)))		if (!(hw->enable_mask & BIT(sensor->id)))
	continue;		continue;

	reg = &st_lsm6dsx_odr_table[sensor->id].reg;		if (sensor->id == ST_LSM6DSX_ID_EXT0 \|\|
	data = ST_LSM6DSX_SHIFT_VAL(0, reg->mask);		sensor->id == ST_LSM6DSX_ID_EXT1 \|\|
	err = st_lsm6dsx_update_bits_locked(hw, reg->addr, reg->mask,		sensor->id == ST_LSM6DSX_ID_EXT2)
	data);		err = st_lsm6dsx_shub_set_enable(sensor, false);
			else
			err = st_lsm6dsx_sensor_set_enable(sensor, false);
	if (err < 0)		if (err < 0)
	return err;		return err;

			hw->suspend_mask \|= BIT(sensor->id);
	}		}

	if (hw->fifo_mode != ST_LSM6DSX_FIFO_BYPASS)		if (hw->fifo_mode != ST_LSM6DSX_FIFO_BYPASS)
	@@ -1146,12 +1148,19 @@ static int __maybe_unused st_lsm6dsx_resume(struct device *dev)
	continue;		continue;

	sensor = iio_priv(hw->iio_devs[i]);		sensor = iio_priv(hw->iio_devs[i]);
	if (!(hw->enable_mask & BIT(sensor->id)))		if (!(hw->suspend_mask & BIT(sensor->id)))
	continue;		continue;

	err = st_lsm6dsx_set_odr(sensor, sensor->odr);		if (sensor->id == ST_LSM6DSX_ID_EXT0 \|\|
			sensor->id == ST_LSM6DSX_ID_EXT1 \|\|
			sensor->id == ST_LSM6DSX_ID_EXT2)
			err = st_lsm6dsx_shub_set_enable(sensor, true);
			else
			err = st_lsm6dsx_sensor_set_enable(sensor, true);
	if (err < 0)		if (err < 0)
	return err;		return err;

			hw->suspend_mask &= ~BIT(sensor->id);
	}		}

	if (hw->enable_mask)		if (hw->enable_mask)

drivers/iio/temperature/mlx90632.c

+7 −2

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,8 @@
	/* Magic constants */		/* Magic constants */
	#define MLX90632_ID_MEDICAL 0x0105 /* EEPROM DSPv5 Medical device id */		#define MLX90632_ID_MEDICAL 0x0105 /* EEPROM DSPv5 Medical device id */
	#define MLX90632_ID_CONSUMER 0x0205 /* EEPROM DSPv5 Consumer device id */		#define MLX90632_ID_CONSUMER 0x0205 /* EEPROM DSPv5 Consumer device id */
			#define MLX90632_DSP_VERSION 5 /* DSP version */
			#define MLX90632_DSP_MASK GENMASK(7, 0) /* DSP version in EE_VERSION */
	#define MLX90632_RESET_CMD 0x0006 /* Reset sensor (address or global) */		#define MLX90632_RESET_CMD 0x0006 /* Reset sensor (address or global) */
	#define MLX90632_REF_12 12LL /*< ResCtrlRef value of Ch 1 or Ch 2 /		#define MLX90632_REF_12 12LL /*< ResCtrlRef value of Ch 1 or Ch 2 /
	#define MLX90632_REF_3 12LL /*< ResCtrlRef value of Channel 3 /		#define MLX90632_REF_3 12LL /*< ResCtrlRef value of Channel 3 /
	@@ -667,10 +669,13 @@ static int mlx90632_probe(struct i2c_client *client,
	} else if (read == MLX90632_ID_CONSUMER) {		} else if (read == MLX90632_ID_CONSUMER) {
	dev_dbg(&client->dev,		dev_dbg(&client->dev,
	"Detected Consumer EEPROM calibration %x\n", read);		"Detected Consumer EEPROM calibration %x\n", read);
			} else if ((read & MLX90632_DSP_MASK) == MLX90632_DSP_VERSION) {
			dev_dbg(&client->dev,
			"Detected Unknown EEPROM calibration %x\n", read);
	} else {		} else {
	dev_err(&client->dev,		dev_err(&client->dev,
	"EEPROM version mismatch %x (expected %x or %x)\n",		"Wrong DSP version %x (expected %x)\n",
	read, MLX90632_ID_CONSUMER, MLX90632_ID_MEDICAL);		read, MLX90632_DSP_VERSION);
	return -EPROTONOSUPPORT;		return -EPROTONOSUPPORT;
	}		}

drivers/staging/iio/addac/adt7316.c

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -6,7 +6,8 @@
	*/		*/

	#include <linux/interrupt.h>		#include <linux/interrupt.h>
	#include <linux/gpio.h>		#include <linux/gpio/consumer.h>
			#include <linux/irq.h>
	#include <linux/workqueue.h>		#include <linux/workqueue.h>
	#include <linux/device.h>		#include <linux/device.h>
	#include <linux/kernel.h>		#include <linux/kernel.h>