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

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

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

Jonathan writes:

Second round of new device support, cleanups and fixes for IIO in the 4.10 cycle

This includes two branch merges for elements that may also go via MFD.

New device support
* cros_ec
  - new driver to support these Chrome OS contiguous sensors which are behind
    the Chrome OS embedded controller.  Requires a few minor MFD and chrome
    platform changes.  One follow up fix deals with some dependency issues in
    Kconfig.
* mpu-3050
  - new driver and device tree bindings for this venerable device.
* st_accel
  - support for the lng2dm an

Driver features
* ad7192
  - Add DVdd regulator handling
* ad9832
  - Add DVDD regulator handling
* at91
  - Suspend and resume support
* si7020
  - Device tree bindings
* ti-am335x
  - DMA support - uses dma to accelerate short bursts of read back rather
  than full blown DMA buffer support.  Greatly improved performance.
  Includes an MFD addition to give access to the address needed for DMA.
* tsl2583
  - Device tree bindings

Cleanups and minor fixes
* ad7192
  - Fix regulator naming to match datasheet
  - Handle regulator errors correctly (so as to not break deferred probing)
  - Rename reg variable to reflect which regulator it is
* ad5933
  - Fix regulator naming to match datasheet
  - Handle regulator errors correctly (so as to not break deferred probing)
* ad7746
  - Fix a missing return value (fallout from previous patch set)
* ad7780
  - Fix regulator naming to match datasheet
  - Handle regulator errors correctly (so as to not break deferred probing)
* ad9832
  - Fix regulator naming to match datasheet
  - Handle regulator errors correctly (so as to not break deferred probing)
  - Rename reg regulator to reflect which one it is
* ad9834
  - Fix regulator naming to match datasheet
  - Handle regulator errors correctly (so as to not break deferred probing)
* hts221
  - Remove a duplicated include
* maxim thermocouple
  - Handle a wrong storage side in read function.  Prevent any problems that
  might be introduced by additions to this driver in future.
* tsl2583 - big set from Brian Masney to drive this towards a staging
  graduation.
  - Convert to iio_chan_spec and read_raw / write_raw (in a couple of steps)
  - Improved error handling in various functions
  - Drop redundant power_state custom sysfs attribute.
  - Use IIO_*_ATTR* macros for remaining attributes.
  - Return an error code to userspace on invalid parameters being writen to
    sysfs files.
  - Add locking to various attribute accesses to remove possible races.
  - Add defines for various magic numbers.
  - Use smbus_read_byte_data instead of a write_byte followed by read_byte.
  - Query only relevant registers in probe.
  - Tidy up ordering of code comments.
  - Remove a pointless power off sequence in taos_chip_on.
  - Don't bother shutting down the chip when updating the lux table.
  The table is held entirely in the driver and doesn't effect the chip at all.
  - Drop a redundant i2c call in taos_als_calibrate where the same register
  is read twice in a row.
parents c2b6028f c2b0d2cf

Documentation/ABI/testing/sysfs-bus-iio-cros-ec

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

Date:		July 2015

KernelVersion:	4.7

Contact:	linux-iio@vger.kernel.org

Description:

		Writing '1' will perform a FOC (Fast Online Calibration). The

                corresponding calibration offsets can be read from *_calibbias

                entries.



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

Date:		July 2015

KernelVersion:	4.7

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute returns a string with the physical location where

                the motion sensor is placed. For example, in a laptop a motion

                sensor can be located on the base or on the lid. Current valid

		values are 'base' and 'lid'.

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ ricoh,rv5c387a I2C bus SERIAL INTERFACE REAL-TIME CLOCK IC 
samsung,24ad0xd1	S524AD0XF1 (128K/256K-bit Serial EEPROM for Low Power)

sgx,vz89x		SGX Sensortech VZ89X Sensors

sii,s35390a		2-wire CMOS real-time clock

silabs,si7020		Relative Humidity and Temperature Sensors

skyworks,sky81452	Skyworks SKY81452: Six-Channel White LED Driver with Touch Panel Bias Supply

st,24c256		i2c serial eeprom  (24cxx)

st,m41t00		Serial real-time clock (RTC)

Documentation/devicetree/bindings/iio/gyroscope/invensense,mpu3050.txt

0 → 100644
+46 −0
Original line number Diff line number Diff line 
Invensense MPU-3050 Gyroscope device tree bindings



Required properties:

  - compatible : should be "invensense,mpu3050"

  - reg : the I2C address of the sensor



Optional properties:

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

  - interrupts : interrupt mapping for the trigger interrupt from the

    internal oscillator. The following IRQ modes are supported:

    IRQ_TYPE_EDGE_RISING, IRQ_TYPE_EDGE_FALLING, IRQ_TYPE_LEVEL_HIGH and

    IRQ_TYPE_LEVEL_LOW. The driver should detect and configure the hardware

    for the desired interrupt type.

  - vdd-supply : supply regulator for the main power voltage.

  - vlogic-supply : supply regulator for the signal voltage.

  - mount-matrix : see iio/mount-matrix.txt



Optional subnodes:

  - The MPU-3050 will pass through and forward the I2C signals from the

    incoming I2C bus, alternatively drive traffic to a slave device (usually

    an accelerometer) on its own initiative. Therefore is supports a subnode

    i2c gate node. For details see: i2c/i2c-gate.txt



Example:



mpu3050@68 {

	compatible = "invensense,mpu3050";

	reg = <0x68>;

	interrupt-parent = <&foo>;

	interrupts = <12 IRQ_TYPE_EDGE_FALLING>;

	vdd-supply = <&bar>;

	vlogic-supply = <&baz>;



	/* External I2C interface */

	i2c-gate {

		#address-cells = <1>;

		#size-cells = <0>;



		fnord@18 {

			compatible = "fnord";

			reg = <0x18>;

			interrupt-parent = <&foo>;

			interrupts = <13 IRQ_TYPE_EDGE_FALLING>;

		};

	};

};

Documentation/devicetree/bindings/iio/light/tsl2583.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* TAOS TSL 2580/2581/2583 ALS sensor



Required properties:



  - compatible: Should be one of

		"amstaos,tsl2580"

		"amstaos,tsl2581"

		"amstaos,tsl2583"

  - reg: the I2C address of the device



Optional properties:



  - 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.



  - vcc-supply: phandle to the regulator that provides power to the sensor.



Example:



tsl2581@29 {

	compatible = "amstaos,tsl2581";

	reg = <0x29>;

};

Documentation/devicetree/bindings/iio/st-sensors.txt

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ Accelerometers: 
- st,lsm303agr-accel

- st,lis2dh12-accel

- st,h3lis331dl-accel

- st,lng2dm-accel



Gyroscopes:

- st,l3g4200d-gyro

CRA Git | Maintained and supported by SUSTech CRA and CCSE