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

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

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

Jonathan writes:

Second set of new device support, features and cleanup for IIO in the 4.18 cycle

Usual mixture of new devices support and other stuff.  A couple of
staging graduations in here and some old driver drops.

New device support
* ad5686
  - Add support for AD5691R, AD5692R, AD5693 and AD5693R i2c DACs
  - Add support for AD5681R, AD5682R, AD5683 and AD5683R SPI DACs
* lmp91000
  - Add ID for LMP91002
* stm32-dfsdm
  - Add support for the stm32mp1 devices.

Drivers dropped
* ADE7753
  - No longer easily available, no users came forward and needs a lot
    of work to move out of staging.
* ADE7754
* ADE7758
* ADE7759

Staging graduations
- ad2s1200 - good cleanup from David Veenstra.
- tsl2772 (was tsl2x7x) - Brian's quest is at an end and
  staging/iio/light is no more!

Features
* tools
  - loop forever on a negative number of loops being specified.
* ltc 2632
  - add of_match_table
  - support an external reference regulator.
* mag3110
  - Support continuous mode when running fast as it increases the
    posssible sampling rate.
* ti-ads8688
  - Add trigger and buffer support to this ADC.

Cleanups / minor tweaks.
* tools
  - tidy up types in iio_generic_buffer.
* ad2s1200
  - Whitespace cleanup.
  - Drop pointless initializations.
  - Improve kernel docs.
  - Reorder to setup the SPI prior to device registration (race fix).
  - Change to modern gpiod framework.
  - Drop platform data and move to DT bindings. There are no in
    kernel users of the platform data. Any out of tree boards will
    need changes.
  - Add an explicit compatible table.
  - Provide _scale for angular velocity and angle channels.
  - Add David Veenstra to copyright notice as this cleanup was non
    trivial.
* ade8366
  - Avoid a race by ensuring channel init is before registration
    with the subsystem.
* afe
  - binding spelling fix.
* imx7d-adc
  - typo fix in Freescale
* inv_mpu6050
  - tidy up an ugly loop to take advantage of known entry condition.
  - add a comment explaining why the sensible sampling frequencies
    are more limited than might be immediately apparent (aliasing).
* mma8452
  - reduce the sleep time on data not ready when running at high
    frequency.
* stm32-dfsdm
  - add missing header.
* tsl2583
  - fix integration_time_availabe which was in microsecs rather the
    millisecs.
* tsl2x7x/tsl2772
  - Whitespace cleanup.
  - Change to direct returns where sensible.
  - Turn the chip off in the registration error path.
  - Use macro to reduce repition when setting up the device_info
    structures.
  - Change the _available attributes over to read_avail callback,
    and the range definitions that supports.
  - Fix some wrong period values.
  - Add some range checkign for _write_raw.
  - Rename the driver to tsl2772 to avoid wild card clash problems
    in future.
parents 385637ff 96c92d42

Documentation/devicetree/bindings/iio/adc/st,stm32-dfsdm-adc.txt

+5 −2
Original line number Diff line number Diff line
@@ -8,14 +8,16 @@ It is mainly targeted for: 
- PDM microphones (audio digital microphone)



It features up to 8 serial digital interfaces (SPI or Manchester) and

up to 4 filters on stm32h7.

up to 4 filters on stm32h7 or 6 filters on stm32mp1.



Each child node match with a filter instance.



Contents of a STM32 DFSDM root node:

------------------------------------

Required properties:

- compatible: Should be "st,stm32h7-dfsdm".

- compatible: Should be one of:

  "st,stm32h7-dfsdm"

  "st,stm32mp1-dfsdm"

- reg: Offset and length of the DFSDM block register set.

- clocks: IP and serial interfaces clocking. Should be set according

		to rcc clock ID and "clock-names".
@@ -45,6 +47,7 @@ Required properties: 
	"st,stm32-dfsdm-adc" for sigma delta ADCs

	"st,stm32-dfsdm-dmic" for audio digital microphone.

- reg: Specifies the DFSDM filter instance used.

	Valid values are from 0 to 3 on stm32h7, 0 to 5 on stm32mp1.

- interrupts: IRQ lines connected to each DFSDM filter instance.

- st,adc-channels:	List of single-ended channels muxed for this ADC.

			valid values:

Documentation/devicetree/bindings/iio/afe/current-sense-amplifier.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Current Sense Amplifier 
=======================



When an io-channel measures the output voltage from a current sense

amplifier, the interesting mesaurement is almost always the current

amplifier, the interesting measurement is almost always the current

through the sense resistor, not the voltage output. This binding

describes such a current sense circuit.

Documentation/devicetree/bindings/iio/afe/current-sense-shunt.txt

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Current Sense Shunt 
===================



When an io-channel measures the voltage over a current sense shunt,

the interesting mesaurement is almost always the current through the

the interesting measurement is almost always the current through the

shunt, not the voltage over it. This binding describes such a current

sense circuit.

Documentation/devicetree/bindings/iio/dac/ltc2632.txt

+14 −0
Original line number Diff line number Diff line
@@ -12,12 +12,26 @@ Required properties: 
Property rules described in Documentation/devicetree/bindings/spi/spi-bus.txt

apply. In particular, "reg" and "spi-max-frequency" properties must be given.



Optional properties:

	- vref-supply: Phandle to the external reference voltage supply. This should

	  only be set if there is an external reference voltage connected to the VREF

	  pin. If the property is not set the internal reference is used.



Example:



	vref: regulator-vref {

		compatible = "regulator-fixed";

		regulator-name = "vref-ltc2632";

		regulator-min-microvolt = <1250000>;

		regulator-max-microvolt = <1250000>;

		regulator-always-on;

	};



	spi_master {

		dac: ltc2632@0 {

			compatible = "lltc,ltc2632-l12";

			reg = <0>; /* CS0 */

			spi-max-frequency = <1000000>;

			vref-supply = <&vref>; /* optional */

		};

	};

Documentation/devicetree/bindings/iio/potentiostat/lmp91000.txt

+6 −3
Original line number Diff line number Diff line 
* Texas Instruments LMP91000 potentiostat

* Texas Instruments LMP91000 series of potentiostats



http://www.ti.com/lit/ds/symlink/lmp91000.pdf

LMP91000: http://www.ti.com/lit/ds/symlink/lmp91000.pdf

LMP91002: http://www.ti.com/lit/ds/symlink/lmp91002.pdf



Required properties:



  - compatible: should be "ti,lmp91000"

  - compatible: should be one of the following:

                 "ti,lmp91000"

                 "ti,lmp91002"

  - reg: the I2C address of the device

  - io-channels: the phandle of the iio provider