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

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

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

  Lots and lots of tiny patches here, nothing major at all. Which is
  good, tiny cleanups is nice to see. No new huge driver removal or
  addition, this release cycle, although there are lots of good IIO
  driver changes, addtions, and movement from staging into the "real"
  part of the kernel, which is always great.

  Full details are in the shortlog, and all of these have been in
  linux-next for a while with no reported issues"

* tag 'staging-4.21-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (553 commits)
  staging: mt7621-mmc: Correct spelling mistakes in comments
  staging: wilc1000: fix missing read_write setting when reading data
  mt7621-mmc: char * array declaration might be better as static const
  mt7621-mmc: return statement in void function unnecessary
  mt7621-mmc: Alignment should match open parenthesis
  mt7621-mmc: Removed unnecessary blank lines
  mt7621-mmc: Fix some coding style issues
  staging: android: ashmem: doc: Fix spelling
  staging: rtl8188eu: cleanup brace coding style issues
  staging: rtl8188eu: add spaces around '&' in rtw_mlme_ext.c
  staging: rtl8188eu: change return type of is_basicrate() to bool
  staging: rtl8188eu: simplify null array initializations
  staging: rtl8188eu: change order of declarations to improve readability
  staging: rtl8188eu: make some arrays static in rtw_mlme_ext.c
  staging: rtl8188eu: constify some arrays
  staging: rtl8188eu: convert unsigned char arrays to u8
  staging: rtl8188eu: remove redundant declaration in rtw_mlme_ext.c
  staging: rtl8188eu: remove unused arrays WFD_OUI and WMM_INFO_OUI
  staging: rtl8188eu: remove unnecessary parentheses in rtw_mlme_ext.c
  staging: rtl8188eu: remove unnecessary comments in rtw_mlme_ext.c
  ...
parents 117eda8f 215852f4

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

+2 −2
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ Optional properties for all bus drivers: 


Example for a SPI device node:



	lis302@0 {

	accelerometer@0 {

		compatible = "st,lis302dl-spi";

		reg = <0>;

		spi-max-frequency = <1000000>;
@@ -89,7 +89,7 @@ Example for a SPI device node: 


Example for a I2C device node:



	lis331dlh: lis331dlh@18 {

	lis331dlh: accelerometer@18 {

		compatible = "st,lis331dlh", "st,lis3lv02d";

		reg = <0x18>;

		Vdd-supply = <&lis3_reg>;

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

0 → 100644
+16 −0
Original line number 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/adc.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Common ADCs properties



Optional properties for child nodes:

- bipolar : Boolean, if set the channel is used in bipolar mode.

- diff-channels : Differential channels muxed for this ADC. The first value

		specifies the positive input pin, the second value the negative

		input pin.



Example:

	adc@0 {

		compatible = "some,adc";

		...

		channel@0 {

			bipolar;

			diff-channels = <0 1>;

			...

		};



		channel@1 {

			diff-channels = <2 3>;

			...

		};

	};

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

0 → 100644
+75 −0
Original line number Diff line number Diff line 
Analog Devices AD7124 ADC device driver



Required properties for the AD7124:

	- compatible: Must be one of "adi,ad7124-4" or "adi,ad7124-8"

	- 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



	  Required properties:

		* #address-cells: Must be 1.

		* #size-cells: Must be 0.



	  Subnode(s) represent the external channels which are connected to the ADC.

	  Each subnode represents one channel and has the following properties:

		Required properties:

			* reg: The channel number. It can have up to 4 channels on ad7124-4

			  and 8 channels on ad7124-8, numbered from 0 to 15.

			* diff-channels: see: Documentation/devicetree/bindings/iio/adc/adc.txt



		Optional properties:

			* bipolar: see: Documentation/devicetree/bindings/iio/adc/adc.txt

			* adi,reference-select: Select the reference source to use when

			  converting on the the specific channel. Valid values are:

			  0: REFIN1(+)/REFIN1(−).

			  1: REFIN2(+)/REFIN2(−).

			  3: AVDD

			  If this field is left empty, internal reference is selected.



Optional properties:

	- refin1-supply: refin1 supply can be used as reference for conversion.

	- refin2-supply: refin2 supply can be used as reference for conversion.

	- avdd-supply: avdd supply can be used as reference for conversion.



Example:

	adc@0 {

		compatible = "adi,ad7124-4";

		reg = <0>;

		spi-max-frequency = <5000000>;

		interrupts = <25 2>;

		interrupt-parent = <&gpio>;

		refin1-supply = <&adc_vref>;

		clocks = <&ad7124_mclk>;

		clock-names = "mclk";



		#address-cells = <1>;

		#size-cells = <0>;



		channel@0 {

			reg = <0>;

			diff-channels = <0 1>;

			adi,reference-select = <0>;

		};



		channel@1 {

			reg = <1>;

			bipolar;

			diff-channels = <2 3>;

			adi,reference-select = <0>;

		};



		channel@2 {

			reg = <2>;

			diff-channels = <4 5>;

		};



		channel@3 {

			reg = <3>;

			diff-channels = <6 7>;

		};

	};

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

+6 −0
Original line number Diff line number Diff line
@@ -22,6 +22,12 @@ Required properties: 
- vref-supply:	the regulator supply for the ADC reference voltage

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



Optional properties:

- nvmem-cells:		phandle to the temperature_calib eFuse cells

- nvmem-cell-names:	if present (to enable the temperature sensor

			calibration) this must contain "temperature_calib"





Example:

	saradc: adc@8680 {

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE