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

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

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

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

Jonathan writes:

First found of IIO fixes for the 3.15 cycle.

* Fix the platform data support for the at91 adc driver.
* A couple of related follow up patches get the support working again
  for at91sam9260 and at91sam9g45 as the earlier patch results in a device
  name change.
* A default timer value in the at91 adc driver was bonkers.  Make it sane.
* Fix incorrect reporting of the integration time for the cm32181 light sensor
* Fix a missing break in the ad2s1200 driver which would have give a false
  error return.
* Make sure buffer scan mask queries from userspace return 0/1 rather than
  a fairly random value depending on their implementation of test_bit
* Fix leak of the i2c client and a null pointer dereference in the cm36651
  driver.
* Fix a build warning on avr32 for the mxs-lradc (not exactly a critical
  combination - but the issue was real).
parents a798c10f e036f71e

arch/arm/mach-at91/at91sam9260_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -1296,7 +1296,7 @@ static struct resource adc_resources[] = { 
};



static struct platform_device at91_adc_device = {

	.name		= "at91_adc",

	.name		= "at91sam9260-adc",

	.id		= -1,

	.dev		= {

				.platform_data		= &adc_data,

arch/arm/mach-at91/at91sam9g45_devices.c

+1 −1
Original line number Diff line number Diff line
@@ -1204,7 +1204,7 @@ static struct resource adc_resources[] = { 
};



static struct platform_device at91_adc_device = {

	.name		= "at91_adc",

	.name		= "at91sam9g45-adc",

	.id		= -1,

	.dev		= {

				.platform_data	= &adc_data,

drivers/iio/adc/at91_adc.c

+27 −6
Original line number Diff line number Diff line
@@ -765,14 +765,17 @@ static int at91_adc_probe_pdata(struct at91_adc_state *st, 
	if (!pdata)

		return -EINVAL;



	st->caps = (struct at91_adc_caps *)

			platform_get_device_id(pdev)->driver_data;



	st->use_external = pdata->use_external_triggers;

	st->vref_mv = pdata->vref;

	st->channels_mask = pdata->channels_used;

	st->num_channels = pdata->num_channels;

	st->num_channels = st->caps->num_channels;

	st->startup_time = pdata->startup_time;

	st->trigger_number = pdata->trigger_number;

	st->trigger_list = pdata->trigger_list;

	st->registers = pdata->registers;

	st->registers = &st->caps->registers;



	return 0;

}
@@ -1004,8 +1007,11 @@ static int at91_adc_probe(struct platform_device *pdev) 
	 * the best converted final value between two channels selection

	 * The formula thus is : Sample and Hold Time = (shtim + 1) / ADCClock

	 */

	shtim = round_up((st->sample_hold_time * adc_clk_khz /

			  1000) - 1, 1);

	if (st->sample_hold_time > 0)

		shtim = round_up((st->sample_hold_time * adc_clk_khz / 1000)

				 - 1, 1);

	else

		shtim = 0;



	reg = AT91_ADC_PRESCAL_(prsc) & st->registers->mr_prescal_mask;

	reg |= AT91_ADC_STARTUP_(ticks) & st->registers->mr_startup_mask;
@@ -1101,7 +1107,6 @@ static int at91_adc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_OF

static struct at91_adc_caps at91sam9260_caps = {

	.calc_startup_ticks = calc_startup_ticks_9260,

	.num_channels = 4,
@@ -1154,11 +1159,27 @@ static const struct of_device_id at91_adc_dt_ids[] = { 
	{},

};

MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);

#endif



static const struct platform_device_id at91_adc_ids[] = {

	{

		.name = "at91sam9260-adc",

		.driver_data = (unsigned long)&at91sam9260_caps,

	}, {

		.name = "at91sam9g45-adc",

		.driver_data = (unsigned long)&at91sam9g45_caps,

	}, {

		.name = "at91sam9x5-adc",

		.driver_data = (unsigned long)&at91sam9x5_caps,

	}, {

		/* terminator */

	}

};

MODULE_DEVICE_TABLE(platform, at91_adc_ids);



static struct platform_driver at91_adc_driver = {

	.probe = at91_adc_probe,

	.remove = at91_adc_remove,

	.id_table = at91_adc_ids,

	.driver = {

		   .name = DRIVER_NAME,

		   .of_match_table = of_match_ptr(at91_adc_dt_ids),

drivers/iio/industrialio-buffer.c

+4 −2
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static ssize_t iio_scan_el_show(struct device *dev, 
	int ret;

	struct iio_dev *indio_dev = dev_to_iio_dev(dev);



	ret = test_bit(to_iio_dev_attr(attr)->address,

	/* Ensure ret is 0 or 1. */

	ret = !!test_bit(to_iio_dev_attr(attr)->address,

		       indio_dev->buffer->scan_mask);



	return sprintf(buf, "%d\n", ret);
@@ -862,7 +863,8 @@ int iio_scan_mask_query(struct iio_dev *indio_dev, 
	if (!buffer->scan_mask)

		return 0;



	return test_bit(bit, buffer->scan_mask);

	/* Ensure return value is 0 or 1. */

	return !!test_bit(bit, buffer->scan_mask);

};

EXPORT_SYMBOL_GPL(iio_scan_mask_query);

drivers/iio/light/cm32181.c

+1 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static int cm32181_read_raw(struct iio_dev *indio_dev, 
		*val = cm32181->calibscale;

		return IIO_VAL_INT;

	case IIO_CHAN_INFO_INT_TIME:

		*val = 0;

		ret = cm32181_read_als_it(cm32181, val2);

		return ret;

	}