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

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

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

Jonathan writes:

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

Device Support
* ad5761
  - new driver
* at91_sama5d2 ADC.
  - new driver and MAINTAINERS entry.
  - minor cleanups followed.
* atlas pH-SM
  - new driver (this has possibly the prettiest data sheet I've ever seen)
* mcp3422
  - mcp3425 ADC added.
* mcp4725
  - mcp4726 DAC added.
* mma8452
  - mma8451q accelerometer added.
* mpl115
  - mpl115a1 added (a lot bigger than it seems as this is an SPI part whereas
    previous parts were i2c).
* si7005
  - Hoperf th02 (seems to be a repackaged part)
* si7020
  - Hoperf th06 (seems to be a repackaged part)

New features
* Core
  - IIO_PH type. Does what it says on the tin.
* max30100
  - LED current configuration support.
* mcp320x
  - more differential measurement combinations.
* mma8452
  - free fall deteciton
- opt3001
  - enable operation without a IRQ line.
  - device tree docs.  Somehow the original docs have disappeared down
    a rabbit hole, so here is a new set.
* st-sensors
  - Support active-low interrupts.

Cleanups and minor / not so minor reworks
* Documentation
  - drop some defunct ABI from the docs in staging.
* presure / Kconfig
  - white space cleanup.
* ad7150
  - BIT macro usage
  - Alignment fixes
* ad7192
  - false indent fixed.
* ak8975
  - constify the ak_def structures
* axp288
  - drop a redundant double const.
* dht11
  - substantial reliability improvements by being more tolerant
    of missing start bits.
  - simplify the decoding algorithm
* mma8452
  - whitespace cleanup
* mpl115
  - don't bother setting i2c_client_data as nothing uses it.
* mpu6050
  - drop unused function parameter.
* opt3001
  - extract integration time as constants.
  - trivial refactoring.
parents 4cff7adb ea4570d6

CREDITS

+1 −0
Original line number Original line Diff line number Diff line
@@ -3054,6 +3054,7 @@ D: PLX USB338x driver 
D: PCA9634 driver

D: PCA9634 driver

D: Option GTM671WFS

D: Option GTM671WFS

D: Fintek F81216A

D: Fintek F81216A

D: AD5761 iio driver

D: Various kernel hacks

D: Various kernel hacks

S: Qtechnology A/S

S: Qtechnology A/S

S: Valby Langgade 142

S: Valby Langgade 142

Documentation/ABI/testing/sysfs-bus-iio

+9 −0
Original line number Original line Diff line number Diff line
@@ -497,7 +497,9 @@ Description: 
		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

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

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

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

		100kohm_to_gnd: connected to ground via an 100kOhm 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,

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

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

		three_state: left floating.

		three_state: left floating.

		For a list of available output power down options read

		For a list of available output power down options read

		outX_powerdown_mode_available. If Y is not present the

		outX_powerdown_mode_available. If Y is not present the
@@ -1491,3 +1493,10 @@ Description: 
		This ABI is especially applicable for humidity sensors

		This ABI is especially applicable for humidity sensors

		to heatup the device and get rid of any condensation

		to heatup the device and get rid of any condensation

		in some humidity environment

		in some humidity environment



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

KernelVersion:	4.5

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) pH reading of a substance as a negative

		base-10 logarithm of hydrodium ions in a litre of water.

Documentation/devicetree/bindings/iio/accel/mma8452.txt

+3 −1
Original line number Original line Diff line number Diff line 
Freescale MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC triaxial accelerometer

Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC

triaxial accelerometer





Required properties:

Required properties:





  - compatible: should contain one of

  - compatible: should contain one of

    * "fsl,mma8451"

    * "fsl,mma8452"

    * "fsl,mma8452"

    * "fsl,mma8453"

    * "fsl,mma8453"

    * "fsl,mma8652"

    * "fsl,mma8652"

Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

0 → 100644
+28 −0
Original line number Original line Diff line number Diff line 
* AT91 SAMA5D2 Analog to Digital Converter (ADC)



Required properties:

  - compatible: Should be "atmel,sama5d2-adc".

  - reg: Should contain ADC registers location and length.

  - interrupts: Should contain the IRQ line for the ADC.

  - clocks: phandle to device clock.

  - clock-names: Must be "adc_clk".

  - vref-supply: Supply used as reference for conversions.

  - vddana-supply: Supply for the adc device.

  - atmel,min-sample-rate-hz: Minimum sampling rate, it depends on SoC.

  - atmel,max-sample-rate-hz: Maximum sampling rate, it depends on SoC.

  - atmel,startup-time-ms: Startup time expressed in ms, it depends on SoC.



Example:



adc: adc@fc030000 {

	compatible = "atmel,sama5d2-adc";

	reg = <0xfc030000 0x100>;

	interrupts = <40 IRQ_TYPE_LEVEL_HIGH 7>;

	clocks = <&adc_clk>;

	clock-names = "adc_clk";

	atmel,min-sample-rate-hz = <200000>;

	atmel,max-sample-rate-hz = <20000000>;

	atmel,startup-time-ms = <4>;

	vddana-supply = <&vdd_3v3_lp_reg>;

	vref-supply = <&vdd_3v3_lp_reg>;

}

Documentation/devicetree/bindings/iio/adc/mcp3422.txt

+1 −0
Original line number Original line Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
	"microchip,mcp3422" or

	"microchip,mcp3422" or

	"microchip,mcp3423" or

	"microchip,mcp3423" or

	"microchip,mcp3424" or

	"microchip,mcp3424" or

	"microchip,mcp3425" or

	"microchip,mcp3426" or

	"microchip,mcp3426" or

	"microchip,mcp3427" or

	"microchip,mcp3427" or

	"microchip,mcp3428"

	"microchip,mcp3428"