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

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

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

Jonathan writes:

First round of new IIO drivers and cleanups for the 3.11 cycle.

1) New driver for MCP3204/08 12 bit ADCs
2) Move the sysfs trigger out of staging.  This has been pretty clean for a
   long time so lets finally move it out.
3) New functionality for the ak8975 magnetometer (DT and data ready interrupt
   handling)
4) Use devm_ioremap_resource in exynos_adc.  We have 3 separate versions of
   this patch proposed but this one got there first.
5) A couple of other tiny fixes.
parents 735ae539 c619653d

Documentation/devicetree/bindings/iio/magnetometer/ak8975.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* AsahiKASEI AK8975 magnetometer sensor



Required properties:



  - compatible : should be "asahi-kasei,ak8975"

  - reg : the I2C address of the magnetometer



Optional properties:



  - gpios : should be device tree identifier of the magnetometer DRDY pin



Example:



ak8975@0c {

        compatible = "asahi-kasei,ak8975";

        reg = <0x0c>;

        gpios = <&gpj0 7 0>;

};

drivers/iio/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -70,5 +70,8 @@ source "drivers/iio/gyro/Kconfig" 
source "drivers/iio/imu/Kconfig"

source "drivers/iio/light/Kconfig"

source "drivers/iio/magnetometer/Kconfig"

if IIO_TRIGGER

   source "drivers/iio/trigger/Kconfig"

endif #IIO_TRIGGER



endif # IIO

drivers/iio/Makefile

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

obj-y += light/

obj-y += magnetometer/

obj-y += trigger/

drivers/iio/accel/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ config IIO_ST_ACCEL_3AXIS 
	select IIO_ST_ACCEL_I2C_3AXIS if (I2C)

	select IIO_ST_ACCEL_SPI_3AXIS if (SPI_MASTER)

	select IIO_TRIGGERED_BUFFER if (IIO_BUFFER)

	select IIO_ST_ACCEL_BUFFER if (IIO_TRIGGERED_BUFFER)

	help

	  Say yes here to build support for STMicroelectronics accelerometers:

	  LSM303DLH, LSM303DLHC, LIS3DH, LSM330D, LSM330DL, LSM330DLC,

drivers/iio/adc/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -133,6 +133,16 @@ config MAX1363 
	  max11646, max11647) Provides direct access via sysfs and buffered

	  data via the iio dev interface.



config MCP320X

	tristate "Microchip Technology MCP3204/08"

	depends on SPI

	help

	  Say yes here to build support for Microchip Technology's MCP3204 or

	  MCP3208 analog to digital converter.



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

	  called mcp320x.



config TI_ADC081C

	tristate "Texas Instruments ADC081C021/027"

	depends on I2C