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

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

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

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

Jonathan writes:

First set of IIO new device support, features and cleanup for the 4.12 cycle.

Quite a bit of outreachy activity here with a driver from a current intern
and a number of cleanup patches as part of the next round.

Getting a pull request in early this cycle as it's looking like another large
cycle for IIO.

New device support
* adxl345
  - initial device support. Note, once complete support is done the intent
    is to superceded the driver in input/misc.
  - bindings.
  - conversion from i2c direct calls to regmap and driver split.
  - spi support.
* chromeos light and proximity.
  - new driver.
* devantech srf04 ultrasonic ranger
  - new driver with device tree bindings.
* hid temperature
  - new driver for environemntal temperature support from hid devices.
* max30102 oximeter
  - new driver with device tree bindings.
* st lsm6dsx
  - refactor and addition of device support for lsm6dsl and lsm6ds3h.

Staging graduation
* isl29028 including copyright notice update to reflect Brian's work.
* lpc32xx_adc.
* spear adc. It's not perfect and there are some datasheet disagreements, but
  it works and is good enough to graduate.

New features
* documentation
  - abi docs for in_proximity_sampling_frequency_available.
  - generalise counting direction ABI docs as a second driver is going to
  use them.
* hid-sensor-prox
  - Add support for HID_USAGE_SENSOR_HUMAN_PRESENCE if used on a particular
  device.
* isl29028
  - runtime pm.
* meson-saradc
  - switch from polling to interrupt mode and improved read_raw_sample function
  to avoid unnecessary loop.
* tmp007
  - interrupt and threshold event support.

Cleanups and minor fixes
* ad2s1210
  - permissions to octal.
* ad7192
  - permissions to octal.
  - use BIT macro.
* ad9832
  - merge header definitions into source file.
* ad9834
  - merge header definitions into source file.
* ade7753
  - merge header definitions into source file.
  - cleanup include ordering.
* ade7854
  - simplify return logic.
* adis16201
  - merge header definitions into source file.
  - rename _core.c to .c as there is nothing else.
* adis16203
  - merge header definitions into source file.
  - rename _core.c to .c as there is nothing else.
* adis16209
  - merge header definitions into source file.
  - rename _core.c to .c as there is nothing else.
* adis16240
  - permissions to octal.
  - merge header definitions into source file.
  - rename _core.c to .c as there is nothing else.
* adt7136
  - permissions to octal.
* cio-dac
  - set missing parent device.
* documentation
  - update version numbers on sysfs ABI for counter bits that didn't quite.
  make 4.9.
* isl29028
  - mdelay to msleep.
  - incorrrect sleep time when taking first proximity reading.
* lmp91000
  - set missing parent device.
* lpc32xx
  - Consistent prefixes for defines.
  - rename local state structure to _state.
* max30100
  - set missing parent device.
* max30102
  - set missing parent device.
* maxim-thermocouple
  - set missing parent device.
* meter driver header
  - permissions to octal.
* pulsedlight-lidar-lite-v2
  - set missing parent device.
* quad-8
  - set missing parent device.
* st104
  - set missing parent device.

Other
* Mailmap
  - update Matt Ranostay's email address to the Konsolko one.
parents cc4e33d9 2df79e1b
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -109,6 +109,7 @@ Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@osg.samsung.com>
Mauro Carvalho Chehab <mchehab@kernel.org> <mchehab@s-opensource.com>
Matt Ranostay <mranostay@gmail.com> Matthew Ranostay <mranostay@embeddedalley.com>
Matt Ranostay <mranostay@gmail.com> <matt.ranostay@intel.com>
Matt Ranostay <matt.ranostay@konsulko.com> <matt@ranostay.consulting>
Mayuresh Janorkar <mayur@ti.com>
Michael Buesch <m@bues.ch>
Michel Dänzer <michel@tungstengraphics.com>
+17 −2
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ Description:
		then it is to be found in the base device directory.

What:		/sys/bus/iio/devices/iio:deviceX/sampling_frequency_available
What:		/sys/bus/iio/devices/iio:deviceX/in_proximity_sampling_frequency_available
What:		/sys/.../iio:deviceX/buffer/sampling_frequency_available
What:		/sys/bus/iio/devices/triggerX/sampling_frequency_available
KernelVersion:	2.6.35
@@ -1593,7 +1594,7 @@ Description:
		can be processed to siemens per meter.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_raw
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Raw counter device counts from channel Y. For quadrature
@@ -1601,10 +1602,24 @@ Description:
		the counts of a single quadrature signal phase from channel Y.

What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_raw
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Raw counter device index value from channel Y. This attribute
		provides an absolute positional reference (e.g. a pulse once per
		revolution) which may be used to home positional systems as
		required.

What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available
KernelVersion:	4.12
Contact:	linux-iio@vger.kernel.org
Description:
		A list of possible counting directions which are:
		- "up"	: counter device is increasing.
		- "down": counter device is decreasing.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_direction
KernelVersion:	4.12
Contact:	linux-iio@vger.kernel.org
Description:
		Raw counter device counters direction for channel Y.
+8 −16
Original line number Diff line number Diff line
What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_direction_available
What:		/sys/bus/iio/devices/iio:deviceX/in_count_count_mode_available
What:		/sys/bus/iio/devices/iio:deviceX/in_count_noise_error_available
What:		/sys/bus/iio/devices/iio:deviceX/in_count_quadrature_mode_available
What:		/sys/bus/iio/devices/iio:deviceX/in_index_index_polarity_available
What:		/sys/bus/iio/devices/iio:deviceX/in_index_synchronous_mode_available
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Discrete set of available values for the respective counter
		configuration are listed in this file.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_direction
KernelVersion:	4.9
Contact:	linux-iio@vger.kernel.org
Description:
		Read-only attribute that indicates whether the counter for
		channel Y is counting up or down.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_count_mode
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Count mode for channel Y. Four count modes are available:
@@ -52,7 +44,7 @@ Description:
			continuously throughout.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_noise_error
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Read-only attribute that indicates whether excessive noise is
@@ -60,14 +52,14 @@ Description:
		irrelevant in non-quadrature clock mode.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_preset
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		If the counter device supports preset registers, the preset
		count for channel Y is provided by this attribute.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_quadrature_mode
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Configure channel Y counter for non-quadrature or quadrature
@@ -88,7 +80,7 @@ Description:
			decoded for UP/DN clock.

What:		/sys/bus/iio/devices/iio:deviceX/in_countY_set_to_preset_on_index
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Whether to set channel Y counter with channel Y preset value
@@ -96,14 +88,14 @@ Description:
		Valid attribute values are boolean.

What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_index_polarity
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Active level of channel Y index input; irrelevant in
		non-synchronous load mode.

What:		/sys/bus/iio/devices/iio:deviceX/in_indexY_synchronous_mode
KernelVersion:	4.9
KernelVersion:	4.10
Contact:	linux-iio@vger.kernel.org
Description:
		Configure channel Y counter for non-synchronous or synchronous
+38 −0
Original line number Diff line number Diff line
Analog Devices ADXL345 3-Axis, +/-(2g/4g/8g/16g) Digital Accelerometer

http://www.analog.com/en/products/mems/accelerometers/adxl345.html

Required properties:
 - compatible : should be "adi,adxl345"
 - reg : the I2C address or SPI chip select number of the sensor

Required properties for SPI bus usage:
 - spi-max-frequency : set maximum clock frequency, must be 5000000
 - spi-cpol and spi-cpha : must be defined for adxl345 to enable SPI mode 3

Optional properties:
 - interrupt-parent : phandle to the parent interrupt controller as documented
   in Documentation/devicetree/bindings/interrupt-controller/interrupts.txt
 - interrupts: interrupt mapping for IRQ as documented in
   Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

Example for a I2C device node:

	accelerometer@2a {
		compatible = "adi,adxl345";
		reg = <0x53>;
		interrupt-parent = <&gpio1>;
		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
	};

Example for a SPI device node:

	accelerometer@0 {
		compatible = "adi,adxl345";
		reg = <0>;
		spi-max-frequency = <5000000>;
		spi-cpol;
		spi-cpha;
		interrupt-parent = <&gpio1>;
		interrupts = <0 IRQ_TYPE_LEVEL_HIGH>;
	};
+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Required properties:
			- "amlogic,meson-gxm-saradc" for GXM
		along with the generic "amlogic,meson-saradc"
- reg:		the physical base address and length of the registers
- interrupts:	the interrupt indicating end of sampling
- clocks:	phandle and clock identifier (see clock-names)
- clock-names:	mandatory clocks:
			- "clkin" for the reference clock (typically XTAL)
@@ -23,6 +24,7 @@ Example:
		compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";
		#io-channel-cells = <1>;
		reg = <0x0 0x8680 0x0 0x34>;
		interrupts = <GIC_SPI 73 IRQ_TYPE_EDGE_RISING>;
		clocks = <&xtal>,
			 <&clkc CLKID_SAR_ADC>,
			 <&clkc CLKID_SANA>,
Loading