Commit e266ca36 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 

Pull staging/IIO updates from Greg KH:
 "Here is the big staging/iio driver pull request for 5.1-rc1.

  Lots of good IIO driver updates and cleanups in here as always.
  Combined with the removal of the xgifb driver, we have a net "loss" of
  over 9000 lines in the pull request, always a nice thing.

  As the outreachy application process is currently happening, there are
  loads of tiny checkpatch cleanup fixes all over the staging tree,
  which accounts for the majority of the fixups"

* tag 'staging-5.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (341 commits)
  staging: mt7621-dma: remove license boilerplate text
  staging: mt7621-dma: add SPDX GPL-2.0+ license identifier
  Staging: ks7010: Replace typecast to int
  Staging: vt6655: Align a static function declaration
  staging: speakup: fix line over 80 characters.
  staging: mt7621-eth: Remove license boilerplate text
  staging: mt7621-eth: Add SPDX license identifier
  staging: ks7010: removed custom Michael MIC implementation.
  staging: rtl8192e: Fix space and suspect issue
  Staging: vt6655: Modify comment style of SPDX License Identifier
  Staging: vt6655: Modify comment style for SPDX-License-Identifier
  Staging: vt6655: Align a function declaration
  Staging: vt6655: Alignment of function declaration
  staging: rtl8712: Fix indentation issue
  staging: wilc1000: fix incorrent type in initializer
  staging: rtl8188eu: remove unused P2P_PRIVATE_IOCTL_SET_LEN
  staging: rtl8188eu: remove unused enum P2P_PROTO_WK_ID
  staging: rtl8723bs: Remove duplicated include from drv_types.h
  Staging: vt6655: Alignment should match open parenthesis
  staging: erofs: fix mis-acted TAIL merging behavior
  ...
parents e0f0ae83 1f08c4a5

Documentation/ABI/testing/sysfs-bus-iio

+20 −1
Original line number Diff line number Diff line
@@ -1554,6 +1554,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_raw 
What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_raw

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

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

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

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

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

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

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

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

KernelVersion:	4.3
@@ -1685,3 +1689,18 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Raw (unscaled) phase difference reading from channel Y

		that can be processed to radians.



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

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

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

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

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

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

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

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

KernelVersion:	4.22

Contact:	linux-iio@vger.kernel.org

Description:

		Mass concentration reading of particulate matter in ug / m3.

		pmX consists of particles with aerodynamic diameter less or

		equal to X micrometers.

Documentation/ABI/testing/sysfs-bus-iio-sps30

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

Date:		December 2018

KernelVersion:	4.22

Contact:	linux-iio@vger.kernel.org

Description:

		Writing 1 starts sensor self cleaning. Internal fan accelerates

		to its maximum speed and keeps spinning for about 10 seconds in

		order to blow out accumulated dust.



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

Date:		January 2019

KernelVersion:	5.1

Contact:	linux-iio@vger.kernel.org

Description:

		Sensor is capable of triggering self cleaning periodically.

		Period can be changed by writing a new value here. Upon reading

		the current one is returned. Units are seconds.



		Writing 0 disables periodical self cleaning entirely.



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

Date:		January 2019

KernelVersion:	5.1

Contact:	linux-iio@vger.kernel.org

Description:

		The range of available values in seconds represented as the

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

		square brackets.

Documentation/devicetree/bindings/iio/accel/mma8452.txt

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ Optional properties: 
  - interrupt-names: should contain "INT1" and/or "INT2", the accelerometer's

		     interrupt line in use.



  - vdd-supply: phandle to the regulator that provides vdd power to the accelerometer.



  - vddio-supply: phandle to the regulator that provides vddio power to the accelerometer.



Example:



	mma8453fc@1d {

Documentation/devicetree/bindings/iio/adc/adi,ad7606.txt

0 → 100644
+65 −0
Original line number Diff line number Diff line 
Analog Devices AD7606 Simultaneous Sampling ADC



Required properties for the AD7606:



- compatible: Must be one of

	* "adi,ad7605-4"

	* "adi,ad7606-8"

	* "adi,ad7606-6"

	* "adi,ad7606-4"

- reg: SPI chip select number for the device

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

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

- spi-cpha: See Documentation/devicetree/bindings/spi/spi-bus.txt

- avcc-supply: phandle to the Avcc power supply

- interrupts: IRQ line for the ADC

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

- adi,conversion-start-gpios: must be the device tree identifier of the CONVST pin.

		  This logic input is used to initiate conversions on the analog

		  input channels. As the line is active high, it should be marked

		  GPIO_ACTIVE_HIGH.



Optional properties:



- reset-gpios: must be the device tree identifier of the RESET pin. If specified,

	       it will be asserted during driver probe. As the line is active high,

	       it should be marked GPIO_ACTIVE_HIGH.

- standby-gpios: must be the device tree identifier of the STBY pin. This pin is used

		to place the AD7606 into one of two power-down modes, Standby mode or

		Shutdown mode. As the line is active low, it should be marked

		GPIO_ACTIVE_LOW.

- adi,first-data-gpios: must be the device tree identifier of the FRSTDATA pin.

		    The FRSTDATA output indicates when the first channel, V1, is

		    being read back on either the parallel, byte or serial interface.

		    As the line is active high, it should be marked GPIO_ACTIVE_HIGH.

- adi,range-gpios: must be the device tree identifier of the RANGE pin. The polarity on

	      this pin determines the input range of the analog input channels. If

	      this pin is tied to a logic high, the analog input range is ±10V for

	      all channels. If this pin is tied to a logic low, the analog input range

	      is ±5V for all channels. As the line is active high, it should be marked

	      GPIO_ACTIVE_HIGH.

- adi,oversampling-ratio-gpios: must be the device tree identifier of the over-sampling

				mode pins. As the line is active high, it should be marked

				GPIO_ACTIVE_HIGH.



Example:



	adc@0 {

		compatible = "adi,ad7606-8";

		reg = <0>;

		spi-max-frequency = <1000000>;

		spi-cpol;



		avcc-supply = <&adc_vref>;



		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;

		interrupt-parent = <&gpio>;



		adi,conversion-start-gpios = <&gpio 17 GPIO_ACTIVE_HIGH>;

		reset-gpios = <&gpio 27 GPIO_ACTIVE_HIGH>;

		adi,first-data-gpios = <&gpio 22 GPIO_ACTIVE_HIGH>;

		adi,oversampling-ratio-gpios = <&gpio 18 GPIO_ACTIVE_HIGH

						&gpio 23 GPIO_ACTIVE_HIGH

						&gpio 26 GPIO_ACTIVE_HIGH>;

		standby-gpios = <&gpio 24 GPIO_ACTIVE_LOW>;

	};

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

0 → 100644
+41 −0
Original line number 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";

	};

CRA Git | Maintained and supported by SUSTech CRA and CCSE