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

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

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

Jonathan writes:

Second set of iio new device support, features and cleanups for the 4.9 cycle.

New device support
* ad8801 dac
  - new driver supporting ad8801 and ad8803 DACs.
* adc12138
  - new driver supporting TI adc12130/adc12132 and adc12138 ADCs.
* ltc2485 adc
  - new driver
* mxc6255
  - add support for the mxc6225 part name and fixup the ID check so it works.
* vz89x VOC sensor
  - add support for the vz89te part which drops the voc_short channel and adds
    CRCs compared to other supported parts.

New features
* core
  - immutable triggers.  These effectively grant exclusive control over a
    trigger. The typical usecase is a device representing an analog part
    (perhaps a MUX) that needs to control the sampling of a downstream
    ADC.
  - resource managed trigger registration and triggered_buffer_init.
  - iio_push_event now protected against case of the event interface
    registration not having yet occured.  Only matters if an interrupt
    can occur during this window - might happen on shared interrupt lines.
  - helper to let a driver query if the trigger it is using is provided by
    itself (using the convention of both device and trigger having the same
    parent).
* tools
  - iio-utils. Used channel modifier scaling in preference to generic scaling
    when both exist.
* at91-adc
  - Add support for touchscreen switches closure time needed by some newer
    parts.
* stx104
  - support the ADC channels on this ADC/DAC board. As these are the primary
    feature of the board also move the driver to the iio/adc directory.
* sx9500
  - device tree bindings.

Cleanups / Fixes
* ad5755
  - fix an off-by-one on devnr limit check (introduced earlier this cycle)
* ad7266
  - drop NULL check on devm_regulator_get_optional as it can't return NULL.
* ak8974
  - avoid an unused functional warning due to rework in PM core code.
  - remove .owner field setting as done by i2c_core.
* ina2xx
  - clear out a left over debug field from chip global data.
* hid-sensors
  - avoid an unused functional warning due to rework in PM core code.
* maxim-thermocouple
  - fix non static symbol warnings.
* ms5611
  - fetch and enable regulators unconditionally when they aren't optional.
* sca3000
  - whitespace cleanup.
* st_sensors
  - fetch and enable regulators unconditionally rather than having them
    supported as optional regulators (missunderstanding on my part amongst
    others a while back)
  - followup to previous patch fixes error checking on the regulators.
  - mark symbols static where possible.
  - use the 'is it my trigger' help function.  This prevents the odd case
    of another device triggering from the st-sensors trigger whilst the
    st-sensors trigger is itself not using it but rather using say an hrtimer.
* ti-ads1015
  - add missing of_node_put.
* vz89x
  - rework to all support of new devices.
  - prevent reading of a corrupted buffer.
  - fixup a return value of 0/1 in a bool returning function.

Address updates
- Vlad Dogaru email address change.
parents d2f3e105 1696566f
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -159,6 +159,7 @@ Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar@st.com>
Viresh Kumar <vireshk@kernel.org> <viresh.linux@gmail.com>
Viresh Kumar <vireshk@kernel.org> <viresh.kumar2@arm.com>
Vlad Dogaru <ddvlad@gmail.com> <vlad.dogaru@intel.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
Takashi YOSHII <takashi.yoshii.zj@renesas.com>
+37 −0
Original line number Diff line number Diff line
* Texas Instruments' ADC12130/ADC12132/ADC12138

Required properties:
 - compatible: Should be one of
	* "ti,adc12130"
	* "ti,adc12132"
	* "ti,adc12138"
 - reg: SPI chip select number for the device
 - interrupts: Should contain interrupt for EOC (end of conversion)
 - clocks: phandle to conversion clock input
 - spi-max-frequency: Definision as per
	Documentation/devicetree/bindings/spi/spi-bus.txt
 - vref-p-supply: The regulator supply for positive analog voltage reference

Optional properties:
 - vref-n-supply: The regulator supply for negative analog voltage reference
	(Note that this must not go below GND or exceed vref-p)
	If not specified, this is assumed to be analog ground.
 - ti,acquisition-time: The number of conversion clock periods for the S/H's
	acquisition time.  Should be one of 6, 10, 18, 34.  If not specified,
	default value of 10 is used.
	For high source impedances, this value can be increased to 18 or 34.
	For less ADC accuracy and/or slower CCLK frequencies this value may be
	decreased to 6.  See section 6.0 INPUT SOURCE RESISTANCE in the
	datasheet for details.

Example:
adc@0 {
	compatible = "ti,adc12138";
	reg = <0>;
	interrupts = <28 IRQ_TYPE_EDGE_RISING>;
	interrupt-parent = <&gpio1>;
	clocks = <&cclk>;
	vref-p-supply = <&ldo4_reg>;
	spi-max-frequency = <5000000>;
	ti,acquisition-time = <6>;
};
+24 −0
Original line number Diff line number Diff line
Semtech's SX9500 capacitive proximity button device driver

Required properties:
	- compatible: must be "semtech,sx9500"
	- reg: i2c address where to find the device
	- 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.

Optional properties:
	- reset-gpios: Reference to the GPIO connected to the device's active
	  low reset pin.

Example:

sx9500@28 {
	compatible = "semtech,sx9500";
	reg = <0x28>;
	interrupt-parent = <&gpio2>;
	interrupts = <16 IRQ_TYPE_LEVEL_LOW>;
	reset-gpios = <&gpio2 10 GPIO_ACTIVE_LOW>;
};
+4 −0
Original line number Diff line number Diff line
@@ -266,8 +266,12 @@ IIO
  devm_iio_device_unregister()
  devm_iio_kfifo_allocate()
  devm_iio_kfifo_free()
  devm_iio_triggered_buffer_setup()
  devm_iio_triggered_buffer_cleanup()
  devm_iio_trigger_alloc()
  devm_iio_trigger_free()
  devm_iio_trigger_register()
  devm_iio_trigger_unregister()
  devm_iio_channel_get()
  devm_iio_channel_release()
  devm_iio_channel_get_all()
+2 −2
Original line number Diff line number Diff line
@@ -810,11 +810,11 @@ L: alsa-devel@alsa-project.org (moderated for non-subscribers)
S:	Maintained
F:	sound/aoa/

APEX EMBEDDED SYSTEMS STX104 DAC DRIVER
APEX EMBEDDED SYSTEMS STX104 IIO DRIVER
M:	William Breathitt Gray <vilhelm.gray@gmail.com>
L:	linux-iio@vger.kernel.org
S:	Maintained
F:	drivers/iio/dac/stx104.c
F:	drivers/iio/adc/stx104.c

APM DRIVER
M:	Jiri Kosina <jikos@kernel.org>
Loading