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

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

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

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

Jonathan writes:

First round of IIO new driver, functionality and cleanups for the 3.16 cycle.

New device support
* AS3935 Lightning Sensor
* MCP3426/7/8 support added to the existing MCP3422 ADC driver
* AK8963 support in the AK8975 driver
* MPU6500 support in the MPU6050 driver (the functionality that is different
  is mostly not supported yet in either part).

Staging Graduations
* AD799x ADC

New functionality
* ACPI enumeration for the ak8975 driver

Cleanup / tweaks
* Use snprintf as a matter of good practice in a few additional places.
* Document *_mean_raw attributes.  These have been there a while, but were
  undocumented.
* Add an in kernel interface to get the mean values.
* Bug in the length of the event info mask that by coincidence wasn't yet
  actually causing any problems.
* itg3000 drop an unreachable return statement.
* spear_adc cleanups (heading for a staging graduation but a few more
  issues showed up in the review of these patches).
* Exynos ADC dependencies changed so it is only built when Exynos is present
  or COMPILE_TEST and OF are set.
* tsl2583 cleanups.
* Some cut and paste typos in the comments of various drivers still in staging.
* Couple of minor improvements to the ST sensor drivers.
parents 58612c60 ea7e586b

Documentation/ABI/testing/sysfs-bus-iio

+8 −0
Original line number Diff line number Diff line
@@ -210,6 +210,14 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Scaled humidity measurement in milli percent.



What:		/sys/bus/iio/devices/iio:deviceX/in_X_mean_raw

KernelVersion:	3.5

Contact:	linux-iio@vger.kernel.org

Description:

		Averaged raw measurement from channel X. The number of values

		used for averaging is device specific. The converting rules for

		normal raw values also applies to the averaged raw values.



What:		/sys/bus/iio/devices/iio:deviceX/in_accel_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_x_offset

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

0 → 100644
+16 −0
Original line number Diff line number Diff line 
What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Get the current distance in meters of storm (1km steps)

		1000-40000 = distance in meters



What		/sys/bus/iio/devices/iio:deviceX/sensor_sensitivity

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

		14 = outdoors

Documentation/devicetree/bindings/iio/proximity/as3935.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Austrian Microsystems AS3935 Franklin lightning sensor device driver



Required properties:

	- compatible: must be "ams,as3935"

	- reg: SPI chip select number for the device

	- spi-cpha: SPI Mode 1. Refer to spi/spi-bus.txt for generic SPI

	slave node bindings.

	- interrupt-parent : should be the phandle for the interrupt controller

	- interrupts : the sole interrupt generated by the device



	Refer to interrupt-controller/interrupts.txt for generic

	interrupt client node bindings.



Optional properties:

	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	  value 0 - 120pF. This will require using the calibration data from

	  the manufacturer.



Example:



as3935@0 {

	compatible = "ams,as3935";

	reg = <0>;

	spi-cpha;

	interrupt-parent = <&gpio1>;

	interrupts = <16 1>;

	ams,tuning-capacitor-pf = <80>;

};

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ allwinner Allwinner Technology Co., Ltd. 
altr	Altera Corp.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

amd	Advanced Micro Devices (AMD), Inc.

ams	AMS AG

amstaos	AMS-Taos Inc.

apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

drivers/iio/Kconfig

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

endif #IIO_TRIGGER

source "drivers/iio/pressure/Kconfig"

source "drivers/iio/proximity/Kconfig"

source "drivers/iio/temperature/Kconfig"



endif # IIO