Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

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

Jonathan writes:

First round of IIO fixes for the 4.14 cycle

Note this includes fixes from recent merge window.  As such the tree
is based on top of a prior staging/staging-next tree.

* iio core
  - return and error for a failed read_reg debugfs call rather than
    eating the error.
* ad7192
  - Use the dedicated reset function in the ad_sigma_delta library
    instead of an spi transfer with the data on the stack which
    could cause problems with DMA.
* ad7793
  - Implement a dedicate reset function in the ad_sigma_delta library
    and use it to correctly reset this part.
* bme280
  - ctrl_reg write must occur after any register writes
  for updates to take effect.
* mcp320x
  - negative voltage readout was broken.
  - Fix an oops on module unload due to spi_set_drvdata not being called
    in probe.
* st_magn
  - Fix the data ready line configuration for the lis3mdl. It is not
    configurable so the st_magn core was assuming it didn't exist
    and so wasn't consuming interrupts resulting in an unhandled
    interrupt.
* stm32-adc
  - off by one error on max channels checking.
* stm32-timer
  - preset should not be buffered - reorganising register writes avoids
  this.
  - fix a corner case in which write preset goes wrong when a timer is
  used first as a trigger then as a counter with preset. Odd case but
  you never know.
* ti-ads1015
  - Fix setting of comparator polarity by fixing bitfield definition.
* twl4030
  - Error path handling fix to cleanup in event of regulator
    registration failure.
  - Disable the vusb3v1 regulator correctly in error handling
  - Don't paper over a regulator enable failure.
parents ec141219 f790923f

drivers/iio/adc/ad7793.c

+2 −2
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ static int ad7793_setup(struct iio_dev *indio_dev, 
	unsigned int vref_mv)

{

	struct ad7793_state *st = iio_priv(indio_dev);

	int i, ret = -1;

	int i, ret;

	unsigned long long scale_uv;

	u32 id;
@@ -266,7 +266,7 @@ static int ad7793_setup(struct iio_dev *indio_dev, 
		return ret;



	/* reset the serial interface */

	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));

	ret = ad_sd_reset(&st->sd, 32);

	if (ret < 0)

		goto out;

	usleep_range(500, 2000); /* Wait for at least 500us */

drivers/iio/adc/ad_sigma_delta.c

+28 −0
Original line number Diff line number Diff line
@@ -177,6 +177,34 @@ int ad_sd_read_reg(struct ad_sigma_delta *sigma_delta, 
}

EXPORT_SYMBOL_GPL(ad_sd_read_reg);



/**

 * ad_sd_reset() - Reset the serial interface

 *

 * @sigma_delta: The sigma delta device

 * @reset_length: Number of SCLKs with DIN = 1

 *

 * Returns 0 on success, an error code otherwise.

 **/

int ad_sd_reset(struct ad_sigma_delta *sigma_delta,

	unsigned int reset_length)

{

	uint8_t *buf;

	unsigned int size;

	int ret;



	size = DIV_ROUND_UP(reset_length, 8);

	buf = kcalloc(size, sizeof(*buf), GFP_KERNEL);

	if (!buf)

		return -ENOMEM;



	memset(buf, 0xff, size);

	ret = spi_write(sigma_delta->spi, buf, size);

	kfree(buf);



	return ret;

}

EXPORT_SYMBOL_GPL(ad_sd_reset);



static int ad_sd_calibrate(struct ad_sigma_delta *sigma_delta,

	unsigned int mode, unsigned int channel)

{

drivers/iio/adc/mcp320x.c

+16 −9
Original line number Diff line number Diff line
@@ -17,6 +17,8 @@ 
 * MCP3204

 * MCP3208

 * ------------

 * 13 bit converter

 * MCP3301

 *

 * Datasheet can be found here:

 * http://ww1.microchip.com/downloads/en/DeviceDoc/21293C.pdf  mcp3001
@@ -96,7 +98,7 @@ static int mcp320x_channel_to_tx_data(int device_index, 
}



static int mcp320x_adc_conversion(struct mcp320x *adc, u8 channel,

				  bool differential, int device_index)

				  bool differential, int device_index, int *val)

{

	int ret;
@@ -117,19 +119,25 @@ static int mcp320x_adc_conversion(struct mcp320x *adc, u8 channel, 


	switch (device_index) {

	case mcp3001:

		return (adc->rx_buf[0] << 5 | adc->rx_buf[1] >> 3);

		*val = (adc->rx_buf[0] << 5 | adc->rx_buf[1] >> 3);

		return 0;

	case mcp3002:

	case mcp3004:

	case mcp3008:

		return (adc->rx_buf[0] << 2 | adc->rx_buf[1] >> 6);

		*val = (adc->rx_buf[0] << 2 | adc->rx_buf[1] >> 6);

		return 0;

	case mcp3201:

		return (adc->rx_buf[0] << 7 | adc->rx_buf[1] >> 1);

		*val = (adc->rx_buf[0] << 7 | adc->rx_buf[1] >> 1);

		return 0;

	case mcp3202:

	case mcp3204:

	case mcp3208:

		return (adc->rx_buf[0] << 4 | adc->rx_buf[1] >> 4);

		*val = (adc->rx_buf[0] << 4 | adc->rx_buf[1] >> 4);

		return 0;

	case mcp3301:

		return sign_extend32((adc->rx_buf[0] & 0x1f) << 8 | adc->rx_buf[1], 12);

		*val = sign_extend32((adc->rx_buf[0] & 0x1f) << 8

				    | adc->rx_buf[1], 12);

		return 0;

	default:

		return -EINVAL;

	}
@@ -150,12 +158,10 @@ static int mcp320x_read_raw(struct iio_dev *indio_dev, 
	switch (mask) {

	case IIO_CHAN_INFO_RAW:

		ret = mcp320x_adc_conversion(adc, channel->address,

			channel->differential, device_index);



			channel->differential, device_index, val);

		if (ret < 0)

			goto out;



		*val = ret;

		ret = IIO_VAL_INT;

		break;
@@ -312,6 +318,7 @@ static int mcp320x_probe(struct spi_device *spi) 
	indio_dev->name = spi_get_device_id(spi)->name;

	indio_dev->modes = INDIO_DIRECT_MODE;

	indio_dev->info = &mcp320x_info;

	spi_set_drvdata(spi, indio_dev);



	chip_info = &mcp320x_chip_infos[spi_get_device_id(spi)->driver_data];

	indio_dev->channels = chip_info->channels;

drivers/iio/adc/stm32-adc.c

+1 −1
Original line number Diff line number Diff line
@@ -1666,7 +1666,7 @@ static int stm32_adc_chan_of_init(struct iio_dev *indio_dev) 


	num_channels = of_property_count_u32_elems(node, "st,adc-channels");

	if (num_channels < 0 ||

	    num_channels >= adc_info->max_channels) {

	    num_channels > adc_info->max_channels) {

		dev_err(&indio_dev->dev, "Bad st,adc-channels?\n");

		return num_channels < 0 ? num_channels : -EINVAL;

	}

drivers/iio/adc/ti-ads1015.c

+5 −3
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 


#define ADS1015_CFG_COMP_QUE_MASK	GENMASK(1, 0)

#define ADS1015_CFG_COMP_LAT_MASK	BIT(2)

#define ADS1015_CFG_COMP_POL_MASK	BIT(2)

#define ADS1015_CFG_COMP_POL_MASK	BIT(3)

#define ADS1015_CFG_COMP_MODE_MASK	BIT(4)

#define ADS1015_CFG_DR_MASK	GENMASK(7, 5)

#define ADS1015_CFG_MOD_MASK	BIT(8)
@@ -1017,10 +1017,12 @@ static int ads1015_probe(struct i2c_client *client, 


		switch (irq_trig) {

		case IRQF_TRIGGER_LOW:

			cfg_comp |= ADS1015_CFG_COMP_POL_LOW;

			cfg_comp |= ADS1015_CFG_COMP_POL_LOW <<

					ADS1015_CFG_COMP_POL_SHIFT;

			break;

		case IRQF_TRIGGER_HIGH:

			cfg_comp |= ADS1015_CFG_COMP_POL_HIGH;

			cfg_comp |= ADS1015_CFG_COMP_POL_HIGH <<

					ADS1015_CFG_COMP_POL_SHIFT;

			break;

		default:

			return -EINVAL;