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

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

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

Jonathan writes:

Second round of new drivers, features and cleanups for IIO in the 3.12 cycle.

New driver:

1) tmp006 IR thermopile driver.  This is an unusual temperature sensor
   and was taken in to IIO with the knowledge and agreement of a hwmon
   maintainer.
   It measures remote temperature using infrared emissions.
   I guess taking this may mean we have to fight off submissions of
   devices much more suited to hwmon but such is life and we end up
   doing this from time to time already.

2) twl6030 adc driver.

Cleanups:

1) More devm_* cleanups following on from the introduction of
   devm_iio_device_alloc.  Mostly an heroic effort from
   Sachin Kamat!

2) Introduce devm_iio_trigger_alloc etc to handle trigger
   allocation and deallocation in a managed fashion.  There
   aren't as many instances of triggers as devices, but this
   will allow futher reduction in error patch complexity in
   some of our most complex drivers making it a very good thing.
3) Trivial removal of unused defines in adjd_s311

4) Drop some write_raw_get_fmt callbacks where they were only
   returning the default value.

5) Change mxs-lradc realbits to 12.  Whilst an 18bit register
   is used on the device, in its current mode only 12 bits of
   useful data are returned.  For now the packing is unchanged
   in the buffer and this change mainly effects the input support
   in the driver.
parents 9c6cd3b3 cc566fd5

Documentation/driver-model/devres.txt

+2 −0
Original line number Diff line number Diff line
@@ -240,6 +240,8 @@ MEM 
IIO

  devm_iio_device_alloc()

  devm_iio_device_free()

  devm_iio_trigger_alloc()

  devm_iio_trigger_free()



IO region

  devm_request_region()

drivers/iio/Kconfig

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

endif #IIO_TRIGGER

source "drivers/iio/pressure/Kconfig"

source "drivers/iio/temperature/Kconfig"



endif # IIO

drivers/iio/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -21,5 +21,6 @@ obj-y += frequency/ 
obj-y += imu/

obj-y += light/

obj-y += magnetometer/

obj-y += trigger/

obj-y += pressure/

obj-y += temperature/

obj-y += trigger/

drivers/iio/accel/hid-sensor-accel-3d.c

+0 −8
Original line number Diff line number Diff line
@@ -175,18 +175,10 @@ static int accel_3d_write_raw(struct iio_dev *indio_dev, 
	return ret;

}



static int accel_3d_write_raw_get_fmt(struct iio_dev *indio_dev,

			       struct iio_chan_spec const *chan,

			       long mask)

{

	return IIO_VAL_INT_PLUS_MICRO;

}



static const struct iio_info accel_3d_info = {

	.driver_module = THIS_MODULE,

	.read_raw = &accel_3d_read_raw,

	.write_raw = &accel_3d_write_raw,

	.write_raw_get_fmt = &accel_3d_write_raw_get_fmt,

};



/* Function to push data to buffer */

drivers/iio/adc/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -171,6 +171,20 @@ config TI_AM335X_ADC 
	  Say yes here to build support for Texas Instruments ADC

	  driver which is also a MFD client.



config TWL6030_GPADC

	tristate "TWL6030 GPADC (General Purpose A/D Converter) Support"

	depends on TWL4030_CORE

	default n

	help

	  Say yes here if you want support for the TWL6030/TWL6032 General

	  Purpose A/D Converter. This will add support for battery type

	  detection, battery voltage and temperature measurement, die

	  temperature measurement, system supply voltage, audio accessory,

	  USB ID detection.



	  This driver can also be built as a module. If so, the module will be

	  called twl6030-gpadc.



config VIPERBOARD_ADC

	tristate "Viperboard ADC support"

	depends on MFD_VIPERBOARD && USB