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

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

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

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

Jonathan writes:

Second set of IIO new drivers, functionality and cleanups for the 4.5 cycle.

The big one here is the configfs support which has been a long time in the
works but should allow for cleaner ways to do instantiation of those elements
of IIO that aren't directly connected to specific hardware. Lots of cool new
stuff we can use this for in the works!

New core stuff (basically all configfs support related)
* Configfs support
  - Core support (was waiting for a configfs patch that went in around 4.4rc2)
  - A little fixlet to add a configfs.h to contain a reference to the
    configfs_subsystem structure.
* Some infrastructure to simplify handling of software based triggers
  (i.e. ones with no actual hardware associated with them)
* A high resolution timer based trigger.  This has been around for years
    but until the configfs support was ready we didn't have a sensible way
    of instantiating instances of it (the method used for the sysfs_trigger
    has never been really satisfactory)

New Device Support
* AMS iAQ Volatile Organic Compounds sensor support.
* Freescale imx7d ADC driver
* Maxim MAX30100 oximeter driver (note that for these devices most of the
  smart stuff will be in userspace - effectively they are just light sensors
  with some interesting led synchronization as far as the kernel is concerned).
* Microchip mcp3421 support added to the mcp3422 driver.
* TI adc124s021 support added to the adc128s052 driver.
* TI ina219, inda226 power monitors. Note that there is an existing hwmon driver
  for these parts, the usecase is somewhat different so it is unclear at this
  point if the hwmon driver will eventually be replaced by a bridge from
  this driver.  In the meantime the Kconfig dependencies should prevent both
  from being built.

New driver functionality
* us8152d power management support.

Cleanups, fixups
* Use list_for_each_entry_safe instead of list_for_each_safe with the entry
  bit coded longhand.
* Select IRQ_WORK for IIO_DUMMY_EVGEN.  This is a fix that somehow got lost
  when the driver was moved so lets do it again.
* st-accel - drop an unused define.
* vz89x, lidar - optimize i2c transactions by using a single i2c tranfers
  instead of multiple calls where supported (fall back to smbus calls as
  before if not).
* Use dev_get_platdata() in staging drivers: tsl2x7x, adcs and frequency
  drivers instead of direct access to the structure element.
parents e59ac747 c34c1819
Loading
Loading
Loading
Loading
+21 −0
Original line number Diff line number Diff line
What:		/config/iio
Date:		October 2015
KernelVersion:	4.4
Contact:	linux-iio@vger.kernel.org
Description:
		This represents Industrial IO configuration entry point
		directory. It contains sub-groups corresponding to IIO
		objects.

What:		/config/iio/triggers
Date:		October 2015
KernelVersion:	4.4
Description:
		Industrial IO software triggers directory.

What:		/config/iio/triggers/hrtimers
Date:		October 2015
KernelVersion:	4.4
Description:
		High resolution timers directory. Creating a directory here
		will result in creating a hrtimer trigger in the IIO subsystem.
+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ adi,adt7476 +/-1C TDM Extended Temp Range I.C
adi,adt7490		+/-1C TDM Extended Temp Range I.C
adi,adxl345		Three-Axis Digital Accelerometer
adi,adxl346		Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)
ams,iaq-core		AMS iAQ-Core VOC Sensor
at,24c08		i2c serial eeprom  (24cxx)
atmel,24c00		i2c serial eeprom  (24cxx)
atmel,24c01		i2c serial eeprom  (24cxx)
+22 −0
Original line number Diff line number Diff line
Freescale imx7d ADC bindings

The devicetree bindings are for the ADC driver written for
imx7d SoC.

Required properties:
- compatible: Should be "fsl,imx7d-adc"
- reg: Offset and length of the register set for the ADC device
- interrupts: The interrupt number for the ADC device
- clocks: The root clock of the ADC controller
- clock-names: Must contain "adc", matching entry in the clocks property
- vref-supply: The regulator supply ADC reference voltage

Example:
adc1: adc@30610000 {
	compatible = "fsl,imx7d-adc";
	reg = <0x30610000 0x10000>;
	interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
	clocks = <&clks IMX7D_ADC_ROOT_CLK>;
	clock-names = "adc";
	vref-supply = <&reg_vcc_3v3_mcu>;
};
+2 −1
Original line number Diff line number Diff line
* Microchip mcp3422/3/4/6/7/8 chip family (ADC)
* Microchip mcp3421/2/3/4/6/7/8 chip family (ADC)

Required properties:
 - compatible: Should be
	"microchip,mcp3421" or
	"microchip,mcp3422" or
	"microchip,mcp3423" or
	"microchip,mcp3424" or
+2 −2
Original line number Diff line number Diff line
* Texas Instruments' ADC128S052 and ADC122S021 ADC chip
* Texas Instruments' ADC128S052, ADC122S021 and ADC124S021 ADC chip

Required properties:
 - compatible: Should be "ti,adc128s052" or "ti,adc122s021"
 - compatible: Should be "ti,adc128s052", "ti,adc122s021" or "ti,adc124s021"
 - reg: spi chip select number for the device
 - vref-supply: The regulator supply for ADC reference voltage

Loading