Commit dd95f186 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/iio fixes from Greg KH:
 "Here are some Staging and IIO driver fixes for 4.13-rc5.

  Nothing major, just a number of small fixes for reported issues. All
  of these have been in linux-next for a while now with no reported
  issues. Full details are in the shortlog"

* tag 'staging-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  staging: comedi: comedi_fops: do not call blocking ops when !TASK_RUNNING
  iio: aspeed-adc: wait for initial sequence.
  iio: accel: bmc150: Always restore device to normal mode after suspend-resume
  staging:iio:resolver:ad2s1210 fix negative IIO_ANGL_VEL read
  iio: adc: axp288: Fix the GPADC pin reading often wrongly returning 0
  iio: adc: vf610_adc: Fix VALT selection value for REFSEL bits
  iio: accel: st_accel: add SPI-3wire support
  iio: adc: Revert "axp288: Drop bogus AXP288_ADC_TS_PIN_CTRL register modifications"
  iio: adc: sun4i-gpadc-iio: fix unbalanced irq enable/disable
  iio: pressure: st_pressure_core: disable multiread by default for LPS22HB
  iio: light: tsl2563: use correct event code
parents 10cec917 cef98864

drivers/iio/accel/bmc150-accel-core.c

+1 −8
Original line number Diff line number Diff line
@@ -193,7 +193,6 @@ struct bmc150_accel_data { 
	struct regmap *regmap;

	int irq;

	struct bmc150_accel_interrupt interrupts[BMC150_ACCEL_INTERRUPTS];

	atomic_t active_intr;

	struct bmc150_accel_trigger triggers[BMC150_ACCEL_TRIGGERS];

	struct mutex mutex;

	u8 fifo_mode, watermark;
@@ -493,11 +492,6 @@ static int bmc150_accel_set_interrupt(struct bmc150_accel_data *data, int i, 
		goto out_fix_power_state;

	}



	if (state)

		atomic_inc(&data->active_intr);

	else

		atomic_dec(&data->active_intr);



	return 0;



out_fix_power_state:
@@ -1710,7 +1704,6 @@ static int bmc150_accel_resume(struct device *dev) 
	struct bmc150_accel_data *data = iio_priv(indio_dev);



	mutex_lock(&data->mutex);

	if (atomic_read(&data->active_intr))

	bmc150_accel_set_mode(data, BMC150_ACCEL_SLEEP_MODE_NORMAL, 0);

	bmc150_accel_fifo_set_mode(data);

	mutex_unlock(&data->mutex);

drivers/iio/accel/st_accel_core.c

+32 −0
Original line number Diff line number Diff line
@@ -166,6 +166,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_ihl = 0x02,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x23,

			.value = BIT(0),

		},

		.multi_read_bit = true,

		.bootime = 2,

	},
@@ -234,6 +238,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_od = 0x40,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x23,

			.value = BIT(0),

		},

		.multi_read_bit = true,

		.bootime = 2,

	},
@@ -316,6 +324,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
				.en_mask = 0x08,

			},

		},

		.sim = {

			.addr = 0x24,

			.value = BIT(0),

		},

		.multi_read_bit = false,

		.bootime = 2,

	},
@@ -379,6 +391,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_int1 = 0x04,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x21,

			.value = BIT(1),

		},

		.multi_read_bit = true,

		.bootime = 2, /* guess */

	},
@@ -437,6 +453,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_od = 0x40,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x21,

			.value = BIT(7),

		},

		.multi_read_bit = false,

		.bootime = 2, /* guess */

	},
@@ -499,6 +519,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.addr_ihl = 0x22,

			.mask_ihl = 0x80,

		},

		.sim = {

			.addr = 0x23,

			.value = BIT(0),

		},

		.multi_read_bit = true,

		.bootime = 2,

	},
@@ -547,6 +571,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_int1 = 0x04,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x21,

			.value = BIT(1),

		},

		.multi_read_bit = false,

		.bootime = 2,

	},
@@ -614,6 +642,10 @@ static const struct st_sensor_settings st_accel_sensors_settings[] = { 
			.mask_ihl = 0x02,

			.addr_stat_drdy = ST_SENSORS_DEFAULT_STAT_ADDR,

		},

		.sim = {

			.addr = 0x23,

			.value = BIT(0),

		},

		.multi_read_bit = true,

		.bootime = 2,

	},

drivers/iio/adc/aspeed_adc.c

+26 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 


#include <linux/iio/iio.h>

#include <linux/iio/driver.h>

#include <linux/iopoll.h>



#define ASPEED_RESOLUTION_BITS		10

#define ASPEED_CLOCKS_PER_SAMPLE	12
@@ -38,11 +39,17 @@ 


#define ASPEED_ENGINE_ENABLE		BIT(0)



#define ASPEED_ADC_CTRL_INIT_RDY	BIT(8)



#define ASPEED_ADC_INIT_POLLING_TIME	500

#define ASPEED_ADC_INIT_TIMEOUT		500000



struct aspeed_adc_model_data {

	const char *model_name;

	unsigned int min_sampling_rate;	// Hz

	unsigned int max_sampling_rate;	// Hz

	unsigned int vref_voltage;	// mV

	bool wait_init_sequence;

};



struct aspeed_adc_data {
@@ -211,6 +218,24 @@ static int aspeed_adc_probe(struct platform_device *pdev) 
		goto scaler_error;

	}



	model_data = of_device_get_match_data(&pdev->dev);



	if (model_data->wait_init_sequence) {

		/* Enable engine in normal mode. */

		writel(ASPEED_OPERATION_MODE_NORMAL | ASPEED_ENGINE_ENABLE,

		       data->base + ASPEED_REG_ENGINE_CONTROL);



		/* Wait for initial sequence complete. */

		ret = readl_poll_timeout(data->base + ASPEED_REG_ENGINE_CONTROL,

					 adc_engine_control_reg_val,

					 adc_engine_control_reg_val &

					 ASPEED_ADC_CTRL_INIT_RDY,

					 ASPEED_ADC_INIT_POLLING_TIME,

					 ASPEED_ADC_INIT_TIMEOUT);

		if (ret)

			goto scaler_error;

	}



	/* Start all channels in normal mode. */

	ret = clk_prepare_enable(data->clk_scaler->clk);

	if (ret)
@@ -274,6 +299,7 @@ static const struct aspeed_adc_model_data ast2500_model_data = { 
	.vref_voltage = 1800, // mV

	.min_sampling_rate = 1,

	.max_sampling_rate = 1000000,

	.wait_init_sequence = true,

};



static const struct of_device_id aspeed_adc_matches[] = {

drivers/iio/adc/axp288_adc.c

+41 −1
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <linux/iio/driver.h>



#define AXP288_ADC_EN_MASK		0xF1

#define AXP288_ADC_TS_PIN_GPADC		0xF2

#define AXP288_ADC_TS_PIN_ON		0xF3



enum axp288_adc_id {

	AXP288_ADC_TS,
@@ -121,6 +123,26 @@ static int axp288_adc_read_channel(int *val, unsigned long address, 
	return IIO_VAL_INT;

}



static int axp288_adc_set_ts(struct regmap *regmap, unsigned int mode,

				unsigned long address)

{

	int ret;



	/* channels other than GPADC do not need to switch TS pin */

	if (address != AXP288_GP_ADC_H)

		return 0;



	ret = regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, mode);

	if (ret)

		return ret;



	/* When switching to the GPADC pin give things some time to settle */

	if (mode == AXP288_ADC_TS_PIN_GPADC)

		usleep_range(6000, 10000);



	return 0;

}



static int axp288_adc_read_raw(struct iio_dev *indio_dev,

			struct iio_chan_spec const *chan,

			int *val, int *val2, long mask)
@@ -131,7 +153,16 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, 
	mutex_lock(&indio_dev->mlock);

	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_GPADC,

					chan->address)) {

			dev_err(&indio_dev->dev, "GPADC mode\n");

			ret = -EINVAL;

			break;

		}

		ret = axp288_adc_read_channel(val, chan->address, info->regmap);

		if (axp288_adc_set_ts(info->regmap, AXP288_ADC_TS_PIN_ON,

						chan->address))

			dev_err(&indio_dev->dev, "TS pin restore\n");

		break;

	default:

		ret = -EINVAL;
@@ -141,6 +172,15 @@ static int axp288_adc_read_raw(struct iio_dev *indio_dev, 
	return ret;

}



static int axp288_adc_set_state(struct regmap *regmap)

{

	/* ADC should be always enabled for internal FG to function */

	if (regmap_write(regmap, AXP288_ADC_TS_PIN_CTRL, AXP288_ADC_TS_PIN_ON))

		return -EIO;



	return regmap_write(regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK);

}



static const struct iio_info axp288_adc_iio_info = {

	.read_raw = &axp288_adc_read_raw,

	.driver_module = THIS_MODULE,
@@ -169,7 +209,7 @@ static int axp288_adc_probe(struct platform_device *pdev) 
	 * Set ADC to enabled state at all time, including system suspend.

	 * otherwise internal fuel gauge functionality may be affected.

	 */

	ret = regmap_write(info->regmap, AXP20X_ADC_EN1, AXP288_ADC_EN_MASK);

	ret = axp288_adc_set_state(axp20x->regmap);

	if (ret) {

		dev_err(&pdev->dev, "unable to enable ADC device\n");

		return ret;

drivers/iio/adc/sun4i-gpadc-iio.c

+1 −2
Original line number Diff line number Diff line
@@ -256,6 +256,7 @@ static int sun4i_gpadc_read(struct iio_dev *indio_dev, int channel, int *val, 


err:

	pm_runtime_put_autosuspend(indio_dev->dev.parent);

	disable_irq(irq);

	mutex_unlock(&info->mutex);



	return ret;
@@ -365,7 +366,6 @@ static irqreturn_t sun4i_gpadc_temp_data_irq_handler(int irq, void *dev_id) 
		complete(&info->completion);



out:

	disable_irq_nosync(info->temp_data_irq);

	return IRQ_HANDLED;

}
@@ -380,7 +380,6 @@ static irqreturn_t sun4i_gpadc_fifo_data_irq_handler(int irq, void *dev_id) 
		complete(&info->completion);



out:

	disable_irq_nosync(info->fifo_data_irq);

	return IRQ_HANDLED;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE