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

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

Merge tag 'iio-for-4.11c' of... 

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

Jonathan writes:

Third set of new device support, features and cleanups for IIO in the 4.11 cycle

This also involves a merge of the ib-mid-iio-pwm-4.11 branch from mfd to
bring in support for the stm32 timer triggers needed for the buffered
features in the stm32 adc driver.

New device support:
* Amligic Meson SAR ADC
  - new driver and bindings
* cros_ec barometer
  - new driver
* max5481 digital potentiometers
  - new driver for 5481, 5482, 5483 and 5484
* Renesas GyroADC - a very specific spi offload engine for ADCs
  - new driver and bindings.
* srf08 ultrasonic ranger
  - new driver, bindings and ABI docs,

New features
* Qualcomm PM8xxx ADC bindings.
  - due to a trivial build issues the driver will be following shortly.
* stm32 ADC
  - Triggered buffer mode
  - Allow use of stm32 timer triggers
  - Add trigger polarity control
  - Optional DMA support with bindings update
* stx104
  - add support for gpio names
  - support set_multiple callback
* tmp007
  - optional interrupt support

Cleanups
* ad7150
  - alignment fix.
* ad7816
  - octal rather than symbolic permissions.
* lsm6dsx
  - allow selection of data ready pin via device tree bindings.
* ssp_sensors
  - use devm_iio_device_register to handle unregister automatically.
* stx104
  - use devm functions in probe allowing removal or the remove function.
  - drop unneeded struct stx104_dev
* tmp007
  - fix the name attribute to be a meaninful description of the part.
parents 20380430 bfe7288e

Documentation/ABI/testing/sysfs-bus-iio-adc-stm32

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

KernelVersion:	4.11

Contact:	fabrice.gasnier@st.com

Description:

		The STM32 ADC can be configured to use external trigger sources

		(e.g. timers, pwm or exti gpio). Then, it can be tuned to start

		conversions on external trigger by either:

		- "rising-edge"

		- "falling-edge"

		- "both-edges".

		Reading returns current trigger polarity.

		Writing value before enabling conversions sets trigger polarity.



What:		/sys/bus/iio/devices/triggerX/trigger_polarity_available

KernelVersion:	4.11

Contact:	fabrice.gasnier@st.com

Description:

		List all available trigger_polarity settings.

Documentation/ABI/testing/sysfs-bus-iio-distance-srf08

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

Date:		January 2017

KernelVersion:	4.11

Contact:	linux-iio@vger.kernel.org

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		default 31



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

Date:		January 2017

KernelVersion:	4.11

Contact:	linux-iio@vger.kernel.org

Description:

                Show or set the maximum range between the sensor and the

		first object echoed in meters. Default value is 6.020.

		This setting limits the time the driver is waiting for a

		echo.

		Showing the range of available values is represented as the

		minimum value, the step and the maximum value, all enclosed

		in square brackets.

		Example:

		[0.043 0.043 11.008]

Documentation/ABI/testing/sysfs-bus-iio-timer-stm32

0 → 100644
+29 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/master_mode_available

KernelVersion:	4.11

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the list possible master modes which are:

		- "reset"     :	The UG bit from the TIMx_EGR register is used as trigger output (TRGO).

		- "enable"    : The Counter Enable signal CNT_EN is used as trigger output.

		- "update"    : The update event is selected as trigger output.

				For instance a master timer can then be used as a prescaler for a slave timer.

		- "compare_pulse" : The trigger output send a positive pulse when the CC1IF flag is to be set.

		- "OC1REF"    : OC1REF signal is used as trigger output.

		- "OC2REF"    : OC2REF signal is used as trigger output.

		- "OC3REF"    : OC3REF signal is used as trigger output.

		- "OC4REF"    : OC4REF signal is used as trigger output.



What:		/sys/bus/iio/devices/triggerX/master_mode

KernelVersion:	4.11

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the current master modes.

		Writing set the master mode



What:		/sys/bus/iio/devices/triggerX/sampling_frequency

KernelVersion:	4.11

Contact:	benjamin.gaignard@st.com

Description:

		Reading returns the current sampling frequency.

		Writing an value different of 0 set and start sampling.

		Writing 0 stop sampling.

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

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ dallas,ds1775 Tiny Digital Thermometer and Thermostat 
dallas,ds3232		Extremely Accurate I²C RTC with Integrated Crystal and SRAM

dallas,ds4510		CPU Supervisor with Nonvolatile Memory and Programmable I/O

dallas,ds75		Digital Thermometer and Thermostat

devantech,srf08		Devantech SRF08 ultrasonic ranger

dlg,da9053		DA9053: flexible system level PMIC with multicore support

dlg,da9063		DA9063: system PMIC for quad-core application processors

domintech,dmard09	DMARD09: 3-axis Accelerometer

Documentation/devicetree/bindings/iio/adc/amlogic,meson-saradc.txt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
* Amlogic Meson SAR (Successive Approximation Register) A/D converter



Required properties:

- compatible:	depending on the SoC this should be one of:

			- "amlogic,meson-gxbb-saradc" for GXBB

			- "amlogic,meson-gxl-saradc" for GXL

			- "amlogic,meson-gxm-saradc" for GXM

		along with the generic "amlogic,meson-saradc"

- reg:		the physical base address and length of the registers

- clocks:	phandle and clock identifier (see clock-names)

- clock-names:	mandatory clocks:

			- "clkin" for the reference clock (typically XTAL)

			- "core" for the SAR ADC core clock

		optional clocks:

			- "sana" for the analog clock

			- "adc_clk" for the ADC (sampling) clock

			- "adc_sel" for the ADC (sampling) clock mux

- vref-supply:	the regulator supply for the ADC reference voltage

- #io-channel-cells: must be 1, see ../iio-bindings.txt



Example:

	saradc: adc@8680 {

		compatible = "amlogic,meson-gxl-saradc", "amlogic,meson-saradc";

		#io-channel-cells = <1>;

		reg = <0x0 0x8680 0x0 0x34>;

		clocks = <&xtal>,

			 <&clkc CLKID_SAR_ADC>,

			 <&clkc CLKID_SANA>,

			 <&clkc CLKID_SAR_ADC_CLK>,

			 <&clkc CLKID_SAR_ADC_SEL>;

		clock-names = "clkin", "core", "sana", "adc_clk", "adc_sel";

	};