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

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

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

Merge tag 'iio-for-4.14b' 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 cleanup for the 4.14 cycle.

New device support:
* ak8974
  - support the AMI306.
* st_magnetometer
  - add support for the LIS2MDL with bindings.
* rockchip-saradc
  - add binding for rv1108 SoC (no driver change).
* srf08
  - add srf02 (i2c only) and srf10 support.
* stm32-timer
  - support for the STM32H7 to existing driver.

Features:
* tools
  - move over to the tools buildsystem rather than hand rolling.
  - add an install section to the build.
* ak8974
  - use serial number to add device randomness.
  - add AMI306 calibration data output.
* ccs811
  - triggered buffer support.
* srf08
  - add a device tree table as the old style i2c probing is going away,
  - add triggered buffer support
* st32-adc
  - add optional st,min-sample-time-nsecs binding to allow control of
    sampling against analog circuitry.
* stm32-timer
  - add output compare triggers.
* ti-ads1015
  - add threshold event support.
* ti-ads7950
  - Allow use on ACPI platforms including providing a default reference
    voltage as there is no way to obtain this on ACPI currently.

Cleanup and fixes:
* ad7606
  - fix an error return code in probe.
* ads1015
  - fix incorrect data rate setting update when capture in progress,
  - fix wrong scale information for the ADS1115,
  - make conversions work when CONFIG_PM is not set,
  - make sure we don't get a stale result after a runtime resume by
    ensuring we wait long enough,
  - avoid returning a false error form the buffer setup callbacks,
  - add enough wait time to get the correct conversion,
  - remove an unnecessary config register update,
  - add a helper to set conversion mode reducing repeated boilerplate,
  - use devm_iio_triggered_buffer_setup to simplify error and remove
    paths,
  - use iio_device_claim_direct_mode instead of opencoding the same.
* ak8974
  - mark the INT_CLEAR register as precious to prevent debugfs access.
* apds9300
  - constify the i2c_device_id.
* at91-sama5 adc
  - add missing Kconfig dependency.
* bma180 accel
  - constify the i2c_device_id.
* rockchip_saradc
  - explicitly request exclusive reset control as part of the reset rework
    on going throughout the kernel.
* st_accel
  - fix drdy configuration for a load of accelerometers that only have
    the int1 line.  Fix is unimportant as presumably no deviec tree actually
    used the non existent hardware line.
* st_pressure
  - fix drdy configuration for LPS22HB and LPS25H by dropping int2 support
    as they don't have this. Fix is unimportant as presumably no device tree
    actually used the non existent hardware line.
* stm32-dac
  - explicitly request exclusive reset control (part of reset being reworked).
* tsl2583
  - constify the i2c_device_id.
* xadc
  - coding style fixes.
parents 0de79ffc 87587016

Documentation/devicetree/bindings/iio/adc/rockchip-saradc.txt

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Required properties: 
   - "rockchip,rk3066-tsadc": for rk3036

   - "rockchip,rk3328-saradc", "rockchip,rk3399-saradc": for rk3328

   - "rockchip,rk3399-saradc": for rk3399

   - "rockchip,rv1108-saradc", "rockchip,rk3399-saradc": for rv1108



- reg: physical base address of the controller and length of memory mapped

       region.

Documentation/devicetree/bindings/iio/adc/st,stm32-adc.txt

+5 −0
Original line number Diff line number Diff line
@@ -74,6 +74,11 @@ Optional properties: 
  * can be 6, 8, 10 or 12 on stm32f4

  * can be 8, 10, 12, 14 or 16 on stm32h7

  Default is maximum resolution if unset.

- st,min-sample-time-nsecs: Minimum sampling time in nanoseconds.

  Depending on hardware (board) e.g. high/low analog input source impedance,

  fine tune of ADC sampling time may be recommended.

  This can be either one value or an array that matches 'st,adc-channels' list,

  to set sample time resp. for all channels, or independently for each channel.



Example:

	adc: adc@40012000 {

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

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ Magnetometers: 
- st,lsm303dlhc-magn

- st,lsm303dlm-magn

- st,lis3mdl-magn

- st,lis2mdl



Pressure sensors:

- st,lps001wp-press

Documentation/devicetree/bindings/iio/timer/stm32-timer-trigger.txt

+3 −1
Original line number Diff line number Diff line
@@ -4,7 +4,9 @@ Must be a sub-node of an STM32 Timers device tree node. 
See ../mfd/stm32-timers.txt for details about the parent node.



Required parameters:

- compatible:	Must be "st,stm32-timer-trigger".

- compatible:	Must be one of:

		"st,stm32-timer-trigger"

		"st,stm32h7-timer-trigger"

- reg:		Identify trigger hardware block.



Example:

drivers/iio/accel/bma180.c

+1 −1
Original line number Diff line number Diff line
@@ -842,7 +842,7 @@ static SIMPLE_DEV_PM_OPS(bma180_pm_ops, bma180_suspend, bma180_resume); 
#define BMA180_PM_OPS NULL

#endif



static struct i2c_device_id bma180_ids[] = {

static const struct i2c_device_id bma180_ids[] = {

	{ "bma180", BMA180 },

	{ "bma250", BMA250 },

	{ }