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

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

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

Jonathan writes:

2nd round of new IIO device support, features and cleanups for the 4.6 cycle.

New Device Support
* Apex stx104 DAC
  - new driver for this PC104 board. Right now DAC support only.
* ADI ad5064
  - Add support for ad5625, ad5627, ad5645, ad5665, ad5667 DACs.
  - Add support for Linear Technology ltc2606, ltc2607, ltc2609, ltc2616,
    ltc2617, ltc2619, ltc2626, ltc2627 and ltc2629.
* ADI ad7192
  - add support for the ad7193
* Invensense mpu6050
  - substantial rework of driver to use regmap allowing SPI support extending
    the now split driver to cover the MPU6000.
* TI adc0832
  - new driver supporting ADC0831, ADC0832, ADC0834 and ADC0838 ADCs.
* TI ads1015
  - new driver, note that there is an existing hwmon driver. The long term
    intention is to probably remove the hwmon driver but for now we just have
    guards in place to ensure this driver is not built if that one is enabled.
* TI afe4403
  - new driver for this heart rate monitor / pulse oximeter front end chip.
* TI afe4404
  - new driver for this heart rate monitor / pulse oximeter front end chip.

Staging Graduations
* mxs-lradc
  - A combined general purpose and touch screen (input) device driver.
    Originally held in staging to allow reworking into and MFD but as
    that wasn't happening and isn't an absolute requirement we are moving
    it out of staging.

Driver new features
* ms5611
  - triggered buffer support
  - IIO_CHAN_INFO_SCALE to aid the triggered buffer support.

Driver cleanups / reworks / fixes
* ad5064
  - Use an enum for the register map layout to allow support of additional
    chips (precursor to the new support listed above).
  - Structural driver changes to allow support of the slightly different
    handling for the ltc parts above.
* ad5933
  - drop an exceptional & unnecessary for a function pointer.
* ad7606
  - Cleanup the repeated copies of pm ops.
  - consolidate the various channels specs via a sport of rearranging so only
    one version is needed.
* atlas ph sensor
  - add select IRQ_WORK
* hmc8543 (soon to move out of staging)
  - Comment style fixes
  - functionality of suspend and resume was swapped.
* spear-adc
  - use devm_clk_dev instead of managing the clk lifetime by hand.

Core
* Use new dmaengine_terminate_sync call to avoid a theoretical race.
* Fix docs for mlock in struct iio_dev as it is correctly taken in some
  drivers (docs used to say for core only).
* Add a helper function for calculating the scan index storage size within
  the core cutting out some cut and paste versions of the same code.
parents 2cdb82c7 ecc24e72

Documentation/ABI/testing/sysfs-bus-iio

+1 −0
Original line number Diff line number Diff line
@@ -496,6 +496,7 @@ Description: 
		1kohm_to_gnd: connected to ground via an 1kOhm resistor,

		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

		20kohm_to_gnd: connected to ground via a 20kOhm resistor,

		90kohm_to_gnd: connected to ground via a 90kOhm resistor,

		100kohm_to_gnd: connected to ground via an 100kOhm resistor,

		125kohm_to_gnd: connected to ground via an 125kOhm resistor,

		500kohm_to_gnd: connected to ground via a 500kOhm resistor,

Documentation/ABI/testing/sysfs-bus-iio-health-afe440x

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

		/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the resistance and the capacitance settings for the

		Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for

		Rf2 and Cf2 values.



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

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Enable or disable separate settings for the TransImpedance

		Amplifier above, when disabled both values are set by the

		first channel.



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

		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get measured values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement.



What:		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get differential values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement for the specified LEDs.



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

		/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the offset cancellation DAC setting for these

		stages. The values are expressed in 5-bit sign-magnitude.



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

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the LED current for the specified LED. Y is the

		specific LED number.

Documentation/devicetree/bindings/iio/adc/ti-adc0832.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* Texas Instruments' ADC0831/ADC0832/ADC0832/ADC0838



Required properties:

 - compatible: Should be one of

	* "ti,adc0831"

	* "ti,adc0832"

	* "ti,adc0834"

	* "ti,adc0838"

 - reg: spi chip select number for the device

 - vref-supply: The regulator supply for ADC reference voltage

 - spi-max-frequency: Max SPI frequency to use (< 400000)



Example:

adc@0 {

	compatible = "ti,adc0832";

	reg = <0>;

	vref-supply = <&vdd_supply>;

	spi-max-frequency = <200000>;

};

Documentation/devicetree/bindings/iio/health/afe4403.txt

0 → 100644
+34 −0
Original line number Diff line number Diff line 
Texas Instruments AFE4403 Heart rate and Pulse Oximeter



Required properties:

 - compatible		: Should be "ti,afe4403".

 - reg			: SPI chip select address of device.

 - tx-supply		: Regulator supply to transmitting LEDs.

 - interrupt-parent	: Phandle to he parent interrupt controller.

 - interrupts		: The interrupt line the device ADC_RDY pin is

			  connected to. For details refer to,

			  ../../interrupt-controller/interrupts.txt.



Optional properties:

 - reset-gpios		: GPIO used to reset the device.

			  For details refer to, ../../gpio/gpio.txt.



For other required and optional properties of SPI slave nodes

please refer to ../../spi/spi-bus.txt.



Example:



&spi0 {

	heart_mon@0 {

		compatible = "ti,afe4403";

		reg = <0>;

		spi-max-frequency = <10000000>;



		tx-supply = <&vbat>;



		interrupt-parent = <&gpio1>;

		interrupts = <28 IRQ_TYPE_EDGE_RISING>;



		reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	};

};

Documentation/devicetree/bindings/iio/health/afe4404.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Texas Instruments AFE4404 Heart rate and Pulse Oximeter



Required properties:

 - compatible		: Should be "ti,afe4404".

 - reg			: I2C address of the device.

 - tx-supply		: Regulator supply to transmitting LEDs.

 - interrupt-parent	: Phandle to he parent interrupt controller.

 - interrupts		: The interrupt line the device ADC_RDY pin is

			  connected to. For details refer to,

			  ../interrupt-controller/interrupts.txt.



Optional properties:

 - reset-gpios		: GPIO used to reset the device.

			  For details refer to, ../gpio/gpio.txt.



Example:



&i2c2 {

	heart_mon@58 {

		compatible = "ti,afe4404";

		reg = <0x58>;



		tx-supply = <&vbat>;



		interrupt-parent = <&gpio1>;

		interrupts = <28 IRQ_TYPE_EDGE_RISING>;



		reset-gpios = <&gpio1 16 GPIO_ACTIVE_LOW>;

	};

};