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

Merge tag 'iio-for-3.11b' of... 

Merge tag 'iio-for-3.11b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

Second round of IIO new stuff and cleanups for the 3.11 cycle.

1) Pressure sensor support in the st sensors driver - LPS331AP currently.
2) Graduation of generic interrupt from staging with some related cleanup.
3) A number of platform_set_drvdata on remove removals.
4) 2 conditional build changes to prevent device tree structures from being
   built in when device tree isn't enabled.  These just save a bit of space
   rather than being strictly required at the moment.
5) A couple of strict_strtoul -> kstrtoul conversions.
parents 877ea664 78f304d0

drivers/iio/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -73,5 +73,6 @@ source "drivers/iio/magnetometer/Kconfig" 
if IIO_TRIGGER

   source "drivers/iio/trigger/Kconfig"

endif #IIO_TRIGGER

source "drivers/iio/pressure/Kconfig"



endif # IIO

drivers/iio/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -22,3 +22,4 @@ obj-y += imu/ 
obj-y += light/

obj-y += magnetometer/

obj-y += trigger/

obj-y += pressure/

drivers/iio/accel/st_accel_core.c

+27 −12
Original line number Diff line number Diff line
@@ -26,6 +26,8 @@ 
#include <linux/iio/common/st_sensors.h>

#include "st_accel.h"



#define ST_ACCEL_NUMBER_DATA_CHANNELS		3



/* DEFAULT VALUE FOR SENSORS */

#define ST_ACCEL_DEFAULT_OUT_X_L_ADDR		0x28

#define ST_ACCEL_DEFAULT_OUT_Y_L_ADDR		0x2a
@@ -125,22 +127,34 @@ 
#define ST_ACCEL_3_MULTIREAD_BIT		false



static const struct iio_chan_spec st_accel_12bit_channels[] = {

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,

		ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,

		ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,

		ST_SENSORS_DEFAULT_12_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 12, 16,

			ST_ACCEL_DEFAULT_OUT_X_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 12, 16,

			ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 12, 16,

			ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),

	IIO_CHAN_SOFT_TIMESTAMP(3)

};



static const struct iio_chan_spec st_accel_16bit_channels[] = {

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_X, IIO_MOD_X, IIO_LE,

		ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_X_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Y, IIO_MOD_Y, IIO_LE,

		ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL, ST_SENSORS_SCAN_Z, IIO_MOD_Z, IIO_LE,

		ST_SENSORS_DEFAULT_16_REALBITS, ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_X, 1, IIO_MOD_X, 's', IIO_LE, 16, 16,

			ST_ACCEL_DEFAULT_OUT_X_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_Y, 1, IIO_MOD_Y, 's', IIO_LE, 16, 16,

			ST_ACCEL_DEFAULT_OUT_Y_L_ADDR),

	ST_SENSORS_LSM_CHANNELS(IIO_ACCEL,

			BIT(IIO_CHAN_INFO_RAW) | BIT(IIO_CHAN_INFO_SCALE),

			ST_SENSORS_SCAN_Z, 1, IIO_MOD_Z, 's', IIO_LE, 16, 16,

			ST_ACCEL_DEFAULT_OUT_Z_L_ADDR),

	IIO_CHAN_SOFT_TIMESTAMP(3)

};
@@ -442,6 +456,7 @@ int st_accel_common_probe(struct iio_dev *indio_dev) 
	if (err < 0)

		goto st_accel_common_probe_error;



	adata->num_data_channels = ST_ACCEL_NUMBER_DATA_CHANNELS;

	adata->multiread_bit = adata->sensor->multi_read_bit;

	indio_dev->channels = adata->sensor->ch;

	indio_dev->num_channels = ST_SENSORS_NUMBER_ALL_CHANNELS;

drivers/iio/adc/at91_adc.c

+2 −0
Original line number Diff line number Diff line
@@ -774,11 +774,13 @@ static int at91_adc_remove(struct platform_device *pdev) 
	return 0;

}



#ifdef CONFIG_OF

static const struct of_device_id at91_adc_dt_ids[] = {

	{ .compatible = "atmel,at91sam9260-adc" },

	{},

};

MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);

#endif



static struct platform_driver at91_adc_driver = {

	.probe = at91_adc_probe,

drivers/iio/adc/max1363.c

+1 −1
Original line number Diff line number Diff line
@@ -660,7 +660,7 @@ static ssize_t max1363_monitor_store_freq(struct device *dev, 
	unsigned long val;

	bool found = false;



	ret = strict_strtoul(buf, 10, &val);

	ret = kstrtoul(buf, 10, &val);

	if (ret)

		return -EINVAL;

	for (i = 0; i < ARRAY_SIZE(max1363_monitor_speeds); i++)