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

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

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

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

Jonathan writes:

First set of new device support, features and cleanups for IIO in the 4.13 cycle

Two entirely new drivers in here plus the usual range of cleanups and features.

New device support
* ad5064
  - add ltc2631, ltc2633 and ltc2635 support.
* bma180
  - trivial support for bma250e (new id)
* hid-sensor-rotation
  - add relative orientation and geometric orientation support.
* isl29028
  - add isl29030 support (its effectively the same part from a driver point of
  view)
* maxim_thermocouple
  - add max31856 id.
* meson-saradc
  - add meson8b SoC adc support.
* ti-adc084s021
  - new driver and bindings.
* ti-adc108s102
  - new driver and bindings.

Staging graduations
* isl29028

Features
* bma180
  - ACPI enumeration for BMA250E which is used in various x86 tablets.
* hi8453
  - add raw access rather than only events.
* hid-sensor-hub
  - Implement batch mode in which we can set a threshold on the amount of time
  between data coming from the fifos.  This is the first device to do this
  rather than use a watershed on the number of samples.
* hts221
  - power management support
* lsm6dsx
  - add system power management support.
* rpr0521
  - sampling frequency read / write
* stm32-trigger
  - add support for TRG02 triggers.
* tsl2583
  - runtime power management support.

Cleanups
* core
  - inkern: fix a double unlock in iio_read_available_channel_raw when raw
  value doesn't appear to be raw (error path).
  - fixup accidental sizeof pointer in iio_device_add_mask_type.
* docs
  - fix an accidental duplicated line in sysfs-bus-iio-meas-spec.
* tools
  - use local include/uapi headers to ensure always up to date.
  - increase length of allowed trigger names.
* ad9834
  - symbolic to octal permissions.
* ade7753
  - symbolic to octal permissions.
  - fix indentation
* ade7754
  - symbolic to octal permissions.
* ade7758
  - symbolic to octal permissions.
- ade7854
  - symbolic to octal permissions.
* as3935
  - move out of storm check to given consistent results for raw and processed
  values.
* bmp280
  - fix bme280 naming in Kconfig help.
* hi8435
  - avoid garbage on event after enable.
  - add missing in_voltage_sensing_mode_available to list possible enum options.
  - handle the reset gpio with the obvious polarity rather than relying on
  DT to provide it correctly.
* hid-sensors
  - fix a wrong error path scrubbing of return values.
* hid-sensors-accel
  - drop static on a local variable
* hid-sensors-rotation
  - Add missing scale and offset property parsing support.
* ina2xx
  - Fix a bad use of GENMASK and some typos and whitespace issues.
* isl29018
  - only declare the ACPI table when ACPI is enabled.
* isl29028
  - fix proximity sleep times.
* lsm6dsx
  - replace ifdef CONFIG_PM with __maybe_unused to avoid the complexity of
  dealing with the various PM config variables.
* meson-saradc
  - mark meson_sar_adc_data static and const.
* rcar-gyroadc
  - derive the interface clock speed from the fck clock on the basis they are
  the same actual clock.
  - drop the now unused if clock from the bindings.
* rpr0521
  - disable sensor when marked as such rather than always enabling it.
  - poweroff if probe fails and we can talk to device.
  - make sure device powered off when it doesn't need to be on.
  - use sizeof rather than hardcoded size on value read.
  - whitespace fixup.
  - reorder channel numbers ready for buffered support which didn't quite
  make this pull request.
* st-accel
  - fix platform data initialization to allow remove and reprobe.
* st-pressure
  - fix platform data initialization to allow remove and reprobe.
* tsl2x7x
  - S_IRUGO, S_IWUSR to octal values
  - rename driver for consistency with more recent drivers
  - drop FSF mailing address
  - replace DEVICE_ATTR macros with the shorter DEVICE_ATTR_RW form and
  relevant function renames.
* zpa2326
  - report an error for consistency with other error paths.
parents 13253d80 7e87d11c

Documentation/ABI/testing/sysfs-bus-iio

+11 −0
Original line number Original line Diff line number Diff line
@@ -1425,6 +1425,17 @@ Description: 
		guarantees that the hardware fifo is flushed to the device

		guarantees that the hardware fifo is flushed to the device

		buffer.

		buffer.





What:		/sys/bus/iio/devices/iio:device*/buffer/hwfifo_timeout

KernelVersion:	4.12

Contact:	linux-iio@vger.kernel.org

Description:

		A read/write property to provide capability to delay reporting of

		samples till a timeout is reached. This allows host processors to

		sleep, while the sensor is storing samples in its internal fifo.

		The maximum timeout in seconds can be specified by setting

		hwfifo_timeout.The current delay can be read by reading

		hwfifo_timeout. A value of 0 means that there is no timeout.



What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark

What:		/sys/bus/iio/devices/iio:deviceX/buffer/hwfifo_watermark

KernelVersion: 4.2

KernelVersion: 4.2

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-bus-iio-meas-spec

+0 −1
Original line number Original line Diff line number Diff line
@@ -5,4 +5,3 @@ Description: 
                Reading returns either '1' or '0'. '1' means that the

                Reading returns either '1' or '0'. '1' means that the

                battery level supplied to sensor is below 2.25V.

                battery level supplied to sensor is below 2.25V.

                This ABI is available for tsys02d, htu21, ms8607
 
                This ABI is available for tsys02d, htu21, ms8607
 
		This ABI is available for htu21, ms8607

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

+48 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,54 @@ Description: 
		- "OC2REF"    : OC2REF signal is used as trigger output.

		- "OC2REF"    : OC2REF signal is used as trigger output.

		- "OC3REF"    : OC3REF signal is used as trigger output.

		- "OC3REF"    : OC3REF signal is used as trigger output.

		- "OC4REF"    : OC4REF signal is used as trigger output.

		- "OC4REF"    : OC4REF signal is used as trigger output.

		Additional modes (on TRGO2 only):

		- "OC5REF"    : OC5REF signal is used as trigger output.

		- "OC6REF"    : OC6REF signal is used as trigger output.

		- "compare_pulse_OC4REF":

		  OC4REF rising or falling edges generate pulses.

		- "compare_pulse_OC6REF":

		  OC6REF rising or falling edges generate pulses.

		- "compare_pulse_OC4REF_r_or_OC6REF_r":

		  OC4REF or OC6REF rising edges generate pulses.

		- "compare_pulse_OC4REF_r_or_OC6REF_f":

		  OC4REF rising or OC6REF falling edges generate pulses.

		- "compare_pulse_OC5REF_r_or_OC6REF_r":

		  OC5REF or OC6REF rising edges generate pulses.

		- "compare_pulse_OC5REF_r_or_OC6REF_f":

		  OC5REF rising or OC6REF falling edges generate pulses.



		+-----------+   +-------------+            +---------+

		| Prescaler +-> | Counter     |        +-> | Master  | TRGO(2)

		+-----------+   +--+--------+-+        |-> | Control +-->

		                   |        |          ||  +---------+

		                +--v--------+-+ OCxREF ||  +---------+

		                | Chx compare +----------> | Output  | ChX

		                +-----------+-+         |  | Control +-->

		                      .     |           |  +---------+

		                      .     |           |    .

		                +-----------v-+ OC6REF  |    .

		                | Ch6 compare +---------+>

		                +-------------+



		Example with: "compare_pulse_OC4REF_r_or_OC6REF_r":



		                X

		              X   X

		            X .   . X

		          X   .   .   X

		        X     .   .     X

		count X .     .   .     . X

		        .     .   .     .

		        .     .   .     .

		        +---------------+

		OC4REF  |     .   .     |

		      +-+     .   .     +-+

		        .     +---+     .

		OC6REF  .     |   |     .

		      +-------+   +-------+

		        +-+   +-+

		TRGO2   | |   | |

		      +-+ +---+ +---------+





What:		/sys/bus/iio/devices/triggerX/master_mode

What:		/sys/bus/iio/devices/triggerX/master_mode

KernelVersion:	4.11

KernelVersion:	4.11

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt

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




Required properties:

Required properties:

- compatible:	depending on the SoC this should be one of:

- compatible:	depending on the SoC this should be one of:

			- "amlogic,meson8-saradc" for Meson8

			- "amlogic,meson8b-saradc" for Meson8b

			- "amlogic,meson-gxbb-saradc" for GXBB

			- "amlogic,meson-gxbb-saradc" for GXBB

			- "amlogic,meson-gxl-saradc" for GXL

			- "amlogic,meson-gxl-saradc" for GXL

			- "amlogic,meson-gxm-saradc" for GXM

			- "amlogic,meson-gxm-saradc" for GXM

Documentation/devicetree/bindings/iio/adc/renesas,gyroadc.txt

+3 −4
Original line number Original line Diff line number Diff line
@@ -16,8 +16,7 @@ Required properties: 
- clocks:	References to all the clocks specified in the clock-names

- clocks:	References to all the clocks specified in the clock-names

		property as specified in

		property as specified in

		Documentation/devicetree/bindings/clock/clock-bindings.txt.

		Documentation/devicetree/bindings/clock/clock-bindings.txt.

- clock-names:	Shall contain "fck" and "if". The "fck" is the GyroADC block

- clock-names:	Shall contain "fck". The "fck" is the GyroADC block clock.

		clock, the "if" is the interface clock.

- power-domains: Must contain a reference to the PM domain, if available.

- power-domains: Must contain a reference to the PM domain, if available.

- #address-cells: Should be <1> (setting for the subnodes) for all ADCs

- #address-cells: Should be <1> (setting for the subnodes) for all ADCs

		except for "fujitsu,mb88101a". Should be <0> (setting for

		except for "fujitsu,mb88101a". Should be <0> (setting for
@@ -75,8 +74,8 @@ Example: 
	adc@e6e54000 {

	adc@e6e54000 {

		compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";

		compatible = "renesas,r8a7791-gyroadc", "renesas,rcar-gyroadc";

		reg = <0 0xe6e54000 0 64>;

		reg = <0 0xe6e54000 0 64>;

		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>, <&clk_65m>;

		clocks = <&mstp9_clks R8A7791_CLK_GYROADC>;

		clock-names = "fck", "if";

		clock-names = "fck";

		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;

		power-domains = <&sysc R8A7791_PD_ALWAYS_ON>;





		pinctrl-0 = <&adc_pins>;

		pinctrl-0 = <&adc_pins>;