Commit 8eb6dcf9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver fixes from Greg KH:
 "Here are some staging driver fixes, well, really all just IIO driver
  fixes, for 4.0-rc6.  They fix issues that have been reported with
  these drivers.

  All of these patches have been in linux-next for a while"

* tag 'staging-4.0-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
  iio: imu: Use iio_trigger_get for indio_dev->trig assignment
  iio: adc: vf610: use ADC clock within specification
  iio/adc/cc10001_adc.c: Fix !HAS_IOMEM build
  iio: core: Fix double free.
  iio:inv-mpu6050: Fix inconsistency for the scale channel
  staging: iio: dummy: Fix undefined symbol build error
  iio: inv_mpu6050: Clear timestamps fifo while resetting hardware fifo
  staging: iio: hmc5843: Set iio name property in sysfs
  iio: bmc150: change sampling frequency
  iio: fix drivers that check buffer->scan_mask
parents eca8258b dce5bdfe

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/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -137,7 +137,8 @@ config AXP288_ADC 


config CC10001_ADC

	tristate "Cosmic Circuits 10001 ADC driver"

	depends on HAS_IOMEM || HAVE_CLK || REGULATOR

	depends on HAVE_CLK || REGULATOR

	depends on HAS_IOMEM

	select IIO_BUFFER

	select IIO_TRIGGERED_BUFFER

	help

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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE