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

Merge tag 'iio-for-5.10b-take2' of... 

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

Jonathan writes:

Second set of features and cleanups for IIO in 5.10

We have a couple of changes that apply to large sets of drivers, so
I have grouped those to keep this short.

There are a few late breaking fixes in here that can wait for the
merge window.

dt yaml conversions
-------------------

* adi,ad7768-1
* adi,ad7949
* aspeed,ast2400
* cosmic,10001-adc
* dlg,da9150-gpadc
* fsl,imx25-gcq
* fsl,imx7d-adc
* fsl,vf610
* holt,hi8435
* marvell,berlin2-adc
* motorola,cpcap-adc
* nuvoton,nau7802
* nuvoton,npcm750-adc
* nxp,lpc1850-adc
* nxp,lpc3220
* sprd,sc2720-adc
* st,stmpe-adc
* ti,adc12138
* ti,ads1015
* ti,ads7950
* ti,twl4030-madc

Features
--------

* adxrs290
  - Add triggered buffer support and expose data ready signal as a possible
    trigger. Includes updating bindings.
  - Add debugfs hooks for register access.
* mlx90632
  - Add a clear user interface to override the measured ambient temperature.
* vl53l0x
  - Add IRQ support including dt bindings.

Cleanups and minor fixes
------------------------
(groups)
Replace mlock with local lock:
  * adf4350
  * exynos-adc
  * fls-imx25-gcq
  * stm32-dac

devm use to simplify probe error handling and remove functions.
  * adis16201
  * adis16203
  * adis16209
  * adis16240
  * adis16136
  * adis16260
  * adis16400
  * adis16460
  * adis16480
  * adis library - drop unused adis_setup_buffer_and_trigger()

of_match_ptr removal and incorrect ACPI binding removal
  of_match_ptr() rarely makes sense in an IIO driver as space saving
  is trivial and it breaks ACPI PRP0001 based instantiation.
  Mostly this series is about removing examples that get copied into new
  drivers.
  * ad2s1200
  * ad5272
  * ad5446
  * ad5592r
  * ad5593r
  * ad5703
  * ak8974
  * ak8975
  * ams-iaq-core
  * as3935
  * atlas-sensor
  * ds1803
  * hdc100x
  * htu21
  * icp10100
  * lmp91000
  * pulsedlight
  * max30102
  * max5432
  * max5481
  * mcp4018
  * mcp4131
  * mcp4531
  * mcp4725
  * ms5611
  * ms5637
  * si7020
  * sgp30
  * ti-dac082s085
  * ti-dac5571
  * tmp007
  * tsys01
  * vz89x
  * zpa2326

kernel-doc fixes
  * iio-core
  * ad7303
  * ad7947
  * adis16080
  * adis16400
  * iio_dummy_evgen
  * sgp30

Fixes for buffer alignment when passed to iio_push_to_buffers_with_timestamp()
This is a long running effort.  There are a few more drivers to come.
  * inv_mpu6050
  * itg3200
  * si1145
  * st_lsm6dsx
  * ti-adc0832
  * ti-adc12138

(not driver focused)
* MAINTAINERS
  - Consolidate Analog Device IIO entries whilst removing Beniamin Bia.
  - Remove Hartmut Knaack as a listed IIO maintainer as he hasn't been
    active for a long time and people are getting intermitted bounces.
* Add __printf() markings to a few functions that were missing them.
* drop some rotted documentation from staging.
* rework buffer sysfs file creation (precursor to multiple buffer support)

(individual drivers)
* ad5592r
  - Fix use of true for IIO_SHARED_BY_TYPE
  - Tidy up locking and indentation.
* ad9467
  - Improve error message on chip-id missmatch.
  - Use more appropriate error value if chip-id not recognised.
* adis-library
  - Simplify burst mode handling.
* adxrs290
  - Make sure to switch device to standby mode during remove.
* as73211
  - Increase measurement timeout as seems some devices are slower.
* bma180
  - Fix use of true fo IIO_SHARED_BY_TYPE
* exynos_adc
  - Update binding to require second interrut with touch screen.
  - Update binding to not require syscon on S5Pv210
* hmc5843
  - Fix use of true for IIO_SHARED_BY_TYPE
* inv_mpu6050
  - Use regmap_noinc_read() for fifo reading.
* palmas_gpadc
  - Use module_platform_driver() to remove boilerplate.
* meson-saradc
  - style consistency fixes
* rockchip_saradc
  - Allow compile testing with !ARM.
* st_lsm6dsx
  - Changing scaling factor to use IIO_VAL_INT_PLUS_NANO to improve precision.
  - Fix an issue with unchecked return value.
* stm32-adc
  - Fix a missing return introduced in dev_err_probe() patch earlier in
    cycle.
* sx9310
  - Prefer async mode for probe as paticularly slow startup.
* vcnl4000
  - Add missing interrupt property to dt binding.

* tag 'iio-for-5.10b-take2' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (126 commits)
  dt-bindings: iio: vishay,vcnl4000: add interrupts property
  iio:imu:inv_mpu6050: Use regmap_noinc_read for fifo reads.
  iio:imu:inv_mpu6050 Fix dma and ts alignment and data leak issues.
  iio:adc:ti-adc12138 Fix alignment issue with timestamp
  iio:adc:ti-adc0832 Fix alignment issue with timestamp
  iio:imu:st_lsm6dsx Fix alignment and data leak issues
  iio:light:si1145: Fix timestamp alignment and prevent data leak.
  iio:gyro:itg3200: Fix timestamp alignment and prevent data leak.
  iio:imu:st_lsm6dsx: check st_lsm6dsx_shub_read_output return
  iio: adc: exynos_adc: Replace indio_dev->mlock with own device lock
  dt-bindings:iio:adc:holt,hi8435 yaml conversion
  dt-bindings:iio:adc:adi,ad7768-1 yaml conversion
  dt-bindings:iio:adc:adi,ad7949 yaml conversion
  dt-bindings:iio:adc:dlg,da9150-gpadc yaml conversion
  dt-bindings:iio:adc:motorola,cpcap-adc yaml conversion
  dt-bindings:iio:adc:nxp,lpc3220-adc yaml conversion
  dt-bindings:iio:adc:nxp,lpc1850-adc yaml conversion
  dt-bindings:iio:adc:fsl,imx25-gcq yaml conversion
  dt-bindings:iio:adc:fsl,imx7d-adc yaml conversion
  dt-bindings:iio:adc:ti,ads1015 yaml conversion
  ...
parents 93b61540 596fd016

CREDITS

+4 −0
Original line number Original line Diff line number Diff line
@@ -1942,6 +1942,10 @@ S: Post Office Box 611311 
S: San Jose, California 95161-1311

S: San Jose, California 95161-1311

S: USA

S: USA





N: Hartmut Knaack

E: knaack.h@gmx.de

D: IIO subsystem and drivers



N: Thorsten Knabe

N: Thorsten Knabe

E: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>

E: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>

E: Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>

E: Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>

Documentation/ABI/testing/sysfs-bus-iio

+8 −0
Original line number Original line Diff line number Diff line
@@ -1758,6 +1758,14 @@ Contact: linux-iio@vger.kernel.org 
Description:

Description:

		One of the following thermocouple types: B, E, J, K, N, R, S, T.

		One of the following thermocouple types: B, E, J, K, N, R, S, T.





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

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

KernelVersion:	5.10

Contact:	linux-iio@vger.kernel.org

Description:

		Calibrated ambient temperature for object temperature

		calculation in milli degrees Celsius.



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

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

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

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

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

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

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

deleted100644 → 0
+0 −16
Original line number Original line Diff line number Diff line 
* Analog Devices AD7949/AD7682/AD7689



Required properties:

 - compatible: Should be one of

	* "adi,ad7949"

	* "adi,ad7682"

	* "adi,ad7689"

 - reg: spi chip select number for the device

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



Example:

adc@0 {

	compatible = "adi,ad7949";

	reg = <0>;

	vref-supply = <&vdd_supply>;

};

Documentation/devicetree/bindings/iio/adc/adi,ad7768-1.txt

deleted100644 → 0
+0 −41
Original line number Original line Diff line number Diff line 
Analog Devices AD7768-1 ADC device driver



Required properties for the AD7768-1:



- compatible: Must be "adi,ad7768-1"

- reg: SPI chip select number for the device

- spi-max-frequency: Max SPI frequency to use

	see: Documentation/devicetree/bindings/spi/spi-bus.txt

- clocks: phandle to the master clock (mclk)

	see: Documentation/devicetree/bindings/clock/clock-bindings.txt

- clock-names: Must be "mclk".

- interrupts: IRQ line for the ADC

	see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

- vref-supply: vref supply can be used as reference for conversion

- adi,sync-in-gpios: must be the device tree identifier of the SYNC-IN pin. Enables

	synchronization of multiple devices that require simultaneous sampling.

	A pulse is always required if the configuration is changed in any way, for example

	if the filter decimation rate changes. As the line is active low, it should

	be marked GPIO_ACTIVE_LOW.



Optional properties:



 - reset-gpios : GPIO spec for the RESET pin. If specified, it will be asserted during

	driver probe. As the line is active low, it should be marked GPIO_ACTIVE_LOW.



Example:



	adc@0 {

		compatible = "adi,ad7768-1";

		reg = <0>;

		spi-max-frequency = <2000000>;

		spi-cpol;

		spi-cpha;

		vref-supply = <&adc_vref>;

		interrupts = <25 IRQ_TYPE_EDGE_RISING>;

		interrupt-parent = <&gpio>;

		adi,sync-in-gpios = <&gpio 22 GPIO_ACTIVE_LOW>;

		reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>;

		clocks = <&ad7768_mclk>;

		clock-names = "mclk";

	};