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

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

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

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

Jonathan writes:

Second set of new device support, features and cleanup for IIO in the 5.1 cycle.

There are a few late breaking fixes in here that weren't worth trying to
rush into 5.0 as they have been with us for quite a while.

New device support
* ad7476
  - add support for TI ADS786X parts that are compatible with this Analog
    Devices driver. Good to see some simple devices are so similar.
* Ingenic jz47xx SoC ADCs
  - new driver and bindings
* Plantower PMS7003 partical sensor
  - new driver and bindings including vendor prefix.
* TI DAC7612
  - new driver and bindings for this dual DAC.

New features
* ad7768-1
  - Sampling frequency control
* bmi160
  - Data ready trigger support, including open-drain dt binding.

Cleanup / minor fixes.
* Analog Device DACs
  - Fix some inconsistent licenses.  These are only ones where there were
    two different license marked in the same file, and hence were previously
    unclear.
* ads124s08
  - Spelling fix.
* adxl345
  - Parameter alignement tidy up.
* bmi160
  - SPDX
  - correct a note on the types of supported interrupts which was too strict.
  - use iio_pollfunc_store_time to grab an earlier timestamp.
  - use if (ret) instead of if (ret < 0) to be consistent whilst simplifying
    some handling where ret was effectively getting written to 0 even though
    it was always already 0.
* exynos_adc
  - Fix a null pointer dereference on unbind.
  - Fix number of channels on Exynos4x12 devices to be 4 rather than 8.
* lpc32xx-adc
  - Move DT bindings doc out of staging. Oops, I missed this one when
    moving the driver.
  - SPDX.
* npcm-adc
  - drop documentation of reset node as going to be done differently.
    It's a new driver this cycle so no need to support the previous
    binding going forwards.
* sps30
  - Fix an issue with a loop timeout test that meant it would never identify
    a timeout.
  - Mark deliberate switch fall throughs.

* tag 'iio-for-5.1b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (26 commits)
  iio: adc: exynos-adc: Use proper number of channels for Exynos4x12
  dt-binding: iio: remove rst node from NPCM ADC document
  dt-bindings: iio: chemical: pms7003: add device tree support
  dt-bindings: add Plantower to the vendor prefixes
  iio: chemical: add support for Plantower PMS7003 sensor
  iio:chemical:sps30 Supress some switch fallthrough warnings.
  iio:adc:lpc32xx use SPDX-License-Identifier
  dt-bindings: iio: adc: move lpc32xx-adc out of staging
  iio: adc: ads124s08: fix spelling mistake "converions" -> "conversions"
  iio: adc: exynos-adc: Fix NULL pointer exception on unbind
  iio: chemical: sps30: fix a loop timeout test
  iio:accel:adxl345: Change alignment to match paranthesis
  iio:dac:dac7612: device tree bindings
  iio:dac:ti-dac7612: Add driver for Texas Instruments DAC7612
  iio: adc: ad7476: Add support for TI ADS786X ADCs
  iio: adc: ad7768-1: Add support for setting the sampling frequency
  drivers: iio: dac: Fix wrong license for ADI drivers
  IIO: add Ingenic JZ47xx ADC driver.
  dt-bindings: iio/adc: Add bindings for Ingenic JZ47xx SoCs ADC.
  dt-bindings: iio/adc: Add docs for Ingenic JZ47xx SoCs ADC.
  ...
parents 20931236 103cda6a

Documentation/devicetree/bindings/iio/adc/ingenic,adc.txt

0 → 100644
+48 −0
Original line number Diff line number Diff line 
* Ingenic JZ47xx ADC controller IIO bindings



Required properties:



- compatible: Should be one of:

  * ingenic,jz4725b-adc

  * ingenic,jz4740-adc

- reg: ADC controller registers location and length.

- clocks: phandle to the SoC's ADC clock.

- clock-names: Must be set to "adc".

- #io-channel-cells: Must be set to <1> to indicate channels are selected

  by index.



ADC clients must use the format described in iio-bindings.txt, giving

a phandle and IIO specifier pair ("io-channels") to the ADC controller.



Example:



#include <dt-bindings/iio/adc/ingenic,adc.h>



adc: adc@10070000 {

	compatible = "ingenic,jz4740-adc";

	#io-channel-cells = <1>;



	reg = <0x10070000 0x30>;



	clocks = <&cgu JZ4740_CLK_ADC>;

	clock-names = "adc";



	interrupt-parent = <&intc>;

	interrupts = <18>;

};



adc-keys {

	...

	compatible = "adc-keys";

	io-channels = <&adc INGENIC_ADC_AUX>;

	io-channel-names = "buttons";

	...

};



battery {

	...

	compatible = "ingenic,jz4740-battery";

	io-channels = <&adc INGENIC_ADC_BATTERY>;

	io-channel-names = "battery";

	...

};

Documentation/devicetree/bindings/iio/adc/nuvoton,npcm-adc.txt

+0 −11
Original line number Diff line number Diff line
@@ -14,11 +14,6 @@ Optional properties: 
			   vref-supply is not added the ADC will use internal voltage

			   reference.



Required Node in the NPCM7xx BMC:

An additional register is present in the NPCM7xx SOC which is

assumed to be in the same device tree, with and marked as

compatible with "nuvoton,npcm750-rst".



Example:



adc: adc@f000c000 {
@@ -27,9 +22,3 @@ adc: adc@f000c000 { 
	interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clk NPCM7XX_CLK_ADC>;

};
 


rst: rst@f0801000 {

	compatible = "nuvoton,npcm750-rst", "syscon",

	"simple-mfd";

	reg = <0xf0801000 0x6C>;

};

Documentation/devicetree/bindings/iio/adc/samsung,exynos-adc.txt

+3 −1
Original line number Diff line number Diff line
@@ -11,11 +11,13 @@ New driver handles the following 


Required properties:

- compatible:		Must be "samsung,exynos-adc-v1"

				for exynos4412/5250 controllers.

				for Exynos5250 controllers.

			Must be "samsung,exynos-adc-v2" for

				future controllers.

			Must be "samsung,exynos3250-adc" for

				controllers compatible with ADC of Exynos3250.

			Must be "samsung,exynos4212-adc" for

				controllers compatible with ADC of Exynos4212 and Exynos4412.

			Must be "samsung,exynos7-adc" for

				the ADC in Exynos7 and compatibles

			Must be "samsung,s3c2410-adc" for

Documentation/devicetree/bindings/iio/chemical/plantower,pms7003.txt

0 → 100644
+20 −0
Original line number Diff line number Diff line 
* Plantower PMS7003 particulate matter sensor



Required properties:

- compatible: must be "plantower,pms7003"

- vcc-supply: phandle to the regulator that provides power to the sensor



Optional properties:

- plantower,set-gpios: phandle to the GPIO connected to the SET line

- reset-gpios: phandle to the GPIO connected to the RESET line



Refer to serial/slave-device.txt for generic serial attached device bindings.



Example:



&uart0 {

	air-pollution-sensor {

		compatible = "plantower,pms7003";

		vcc-supply = <&reg_vcc5v0>;

	};

};