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

Merge tag 'iio-fixes-for-4.0c' of... 

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

Jonathan writes:

3rd set of IIO fixes for the 4.0 cycle.

* A double free occured on an error path in due to an event registration issue.
  The fix is the minimal change rather than possibly reworking this area of
  the core to give a more elegant solution (future work).
* A number of drivers were directly accessing indio_dev->buffer->scan_mask
  to identify the currently enabled channel set.  This may not be correct
  if we have additional clients on the push interface.  The correct option
  is indio_dev->active_scan_mask. This is fixed.
* bmc150 had incorrectly specified sampling frequency (a datasheet confusion
  as they are specified in terms of bandwith - e.g. half the sampling
  frequency).
* hmc5843 wasn't setting it's name and hence the name attribute was
  returning an empty string.
* inv_mpu6050 wasn't clearing the locally held timestamp buffer when the
  hardware fifo was reset. Also an inconsistency existed in the interface
  for the scale of the channels.  Magic numbers were written but real ones
  were used for the reads.  Now uses real numbers (i.e. not array indexes)
  for both.
* fix a missing dependency in the dummy driver. Previously shielded from
  the autobuilders by an earlier build error.
parents bc465aa9 c1b03ab5

drivers/iio/accel/bma180.c

+1 −1
Original line number Diff line number Diff line
@@ -659,7 +659,7 @@ static irqreturn_t bma180_trigger_handler(int irq, void *p) 


	mutex_lock(&data->mutex);



	for_each_set_bit(bit, indio_dev->buffer->scan_mask,

	for_each_set_bit(bit, indio_dev->active_scan_mask,

			 indio_dev->masklength) {

		ret = bma180_get_data_reg(data, bit);

		if (ret < 0) {

drivers/iio/accel/bmc150-accel.c

+10 −10
Original line number Diff line number Diff line
@@ -168,14 +168,14 @@ static const struct { 
	int val;

	int val2;

	u8 bw_bits;

} bmc150_accel_samp_freq_table[] = { {7, 810000, 0x08},

				     {15, 630000, 0x09},

				     {31, 250000, 0x0A},

				     {62, 500000, 0x0B},

				     {125, 0, 0x0C},

				     {250, 0, 0x0D},

				     {500, 0, 0x0E},

				     {1000, 0, 0x0F} };

} bmc150_accel_samp_freq_table[] = { {15, 620000, 0x08},

				     {31, 260000, 0x09},

				     {62, 500000, 0x0A},

				     {125, 0, 0x0B},

				     {250, 0, 0x0C},

				     {500, 0, 0x0D},

				     {1000, 0, 0x0E},

				     {2000, 0, 0x0F} };



static const struct {

	int bw_bits;
@@ -840,7 +840,7 @@ static int bmc150_accel_validate_trigger(struct iio_dev *indio_dev, 
}



static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(

		"7.810000 15.630000 31.250000 62.500000 125 250 500 1000");

		"15.620000 31.260000 62.50000 125 250 500 1000 2000");



static struct attribute *bmc150_accel_attributes[] = {

	&iio_const_attr_sampling_frequency_available.dev_attr.attr,
@@ -986,7 +986,7 @@ static irqreturn_t bmc150_accel_trigger_handler(int irq, void *p) 
	int bit, ret, i = 0;



	mutex_lock(&data->mutex);

	for_each_set_bit(bit, indio_dev->buffer->scan_mask,

	for_each_set_bit(bit, indio_dev->active_scan_mask,

			 indio_dev->masklength) {

		ret = i2c_smbus_read_word_data(data->client,

					       BMC150_ACCEL_AXIS_TO_REG(bit));

drivers/iio/accel/kxcjk-1013.c

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ static irqreturn_t kxcjk1013_trigger_handler(int irq, void *p) 


	mutex_lock(&data->mutex);



	for_each_set_bit(bit, indio_dev->buffer->scan_mask,

	for_each_set_bit(bit, indio_dev->active_scan_mask,

			 indio_dev->masklength) {

		ret = kxcjk1013_get_acc_reg(data, bit);

		if (ret < 0) {

drivers/iio/adc/at91_adc.c

+2 −3
Original line number Diff line number Diff line
@@ -544,7 +544,6 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
{

	struct iio_dev *idev = iio_trigger_get_drvdata(trig);

	struct at91_adc_state *st = iio_priv(idev);

	struct iio_buffer *buffer = idev->buffer;

	struct at91_adc_reg_desc *reg = st->registers;

	u32 status = at91_adc_readl(st, reg->trigger_register);

	int value;
@@ -564,7 +563,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
		at91_adc_writel(st, reg->trigger_register,

				status | value);



		for_each_set_bit(bit, buffer->scan_mask,

		for_each_set_bit(bit, idev->active_scan_mask,

				 st->num_channels) {

			struct iio_chan_spec const *chan = idev->channels + bit;

			at91_adc_writel(st, AT91_ADC_CHER,
@@ -579,7 +578,7 @@ static int at91_adc_configure_trigger(struct iio_trigger *trig, bool state) 
		at91_adc_writel(st, reg->trigger_register,

				status & ~value);



		for_each_set_bit(bit, buffer->scan_mask,

		for_each_set_bit(bit, idev->active_scan_mask,

				 st->num_channels) {

			struct iio_chan_spec const *chan = idev->channels + bit;

			at91_adc_writel(st, AT91_ADC_CHDR,

drivers/iio/adc/ti_am335x_adc.c

+1 −2
Original line number Diff line number Diff line
@@ -188,12 +188,11 @@ static int tiadc_buffer_preenable(struct iio_dev *indio_dev) 
static int tiadc_buffer_postenable(struct iio_dev *indio_dev)

{

	struct tiadc_device *adc_dev = iio_priv(indio_dev);

	struct iio_buffer *buffer = indio_dev->buffer;

	unsigned int enb = 0;

	u8 bit;



	tiadc_step_config(indio_dev);

	for_each_set_bit(bit, buffer->scan_mask, adc_dev->channels)

	for_each_set_bit(bit, indio_dev->active_scan_mask, adc_dev->channels)

		enb |= (get_adc_step_bit(adc_dev, bit) << 1);

	adc_dev->buffer_en_ch_steps = enb;

CRA Git | Maintained and supported by SUSTech CRA and CCSE