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

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

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

Jonathan writes:

Second set of IIO new device support, features and cleanups for the 4.21 cycle.

Staging graduation
* ad2s90
  - Driver for this resolver to digital chip.

New drivers and device support.
* ad5686
  - Add support for ad5310r DAC and associated fix in value read back.
* exynos-adc
  - Support for S5PV210 which is slightly different from other parts.
* mcp41010
  - Driver supporting MCP41010, MCP41050, MCP41100, MCP42010, MCP42050 and
  MCP42100 microchip potentiometers.

New ACPI ids.
* ak8975
  - AKM9911 ACPI HID.
* kxcjk-1013
  - KXJ2109 ACPI HID.
  - KIOX010A ACPI HID.

New features
* ad5933
  - Explicit DT binding.
* ad2s90
  - Explicit DT binding including dropping spi setup that is done via dt
    in favour of verifying the settings form DT.
* adt7316
  - Explicit DT binding and support for gpio, irq_flags etc.
* stm32-adc
  - Runtime power management.

Minor fixes and cleanups
* core
  - Protect against missing info structure.
* ad2s90
  - SPDX
  - Add documentation fo the mutex.
* ad7280a
  - Check allocation failure.
  - Fix an accidental replacement of an error return.
* adt7316
  - Switch some variables to be local and rename for consistency with other
    drivers.
  - Revert a false handling of 0 as an error introduced earlier this cycle.
* bmi160
  - Use devm functions throughout probe() to avoid need for remove().
* hid-sensor-hub
  - White space cleanup.
* hts221
  - MAINTAINERS entry.
* lis302
  - Use generic name in the DT binding doc.
* Messon-saradc
  - Check for allocation error.
  - Fix some presented clock names that break clk debugfs.
* qcom-spmi-adc
  - A fix for initialization of the prescale property. Came late in the
    cycle, so merge window is probably the best route for this.
* st_lsm6dsx
  - Allow for variable read length to support wider range of slave devices.

* tag 'iio-for-4.21b' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio: (37 commits)
  iio: adc: qcom-spmi-adc5: Initialize prescale properly
  dt-bindings: iio: adc: exynos-adc: Add S5PV210 variant
  iio: adc: Allow selection of Exynos ADC on S5PV210
  iio: adc: exynos-adc: Add S5PV210 variant
  iio: bmi160: use all devm functions in probe
  iio: dac: ad5686: fix bit shift read register
  iio:dac:ad5686: Add AD5310R support
  Revert "Staging: iio: adt7316: Add an extra check for 'ret' equals to 0"
  dt-bindings: iio: accel: use a generic node name for lis302
  iio: core: check 'info' value before registering the device
  staging: iio: adc: ad7280a: fix overwrite of the returned value
  staging: iio: adc: ad7280a: check for devm_kasprint() failure
  iio: humidity: hts221: add entry in MAINTAINERS file
  iio: magnetometer: ak8975: Add the "AKM9911" ACPI HID
  staging:iio:ad2s90: Move out of staging
  staging:iio:ad2s90: Add comment to device state mutex
  staging:iio:ad2s90: Replace license text w/ SPDX identifier
  dt-bindings:iio:resolver: Add docs for ad2s90
  staging:iio:ad2s90: Add max frequency check at probe
  staging:iio:ad2s90: Remove spi setup that should be done via dt
  ...
parents e8940759 db23d887

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/samsung,exynos-adc.txt

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


Required properties:

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

				for exynos4412/5250 and s5pv210 controllers.

				for exynos4412/5250 controllers.

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

				future controllers.

			Must be "samsung,exynos3250-adc" for
@@ -28,6 +28,8 @@ Required properties: 
				the ADC in s3c2443 and compatibles

			Must be "samsung,s3c6410-adc" for

				the ADC in s3c6410 and compatibles

			Must be "samsung,s5pv210-adc" for

				the ADC in s5pv210 and compatibles

- reg:			List of ADC register address range

			- The base address and range of ADC register

			- The base address and range of ADC_PHY register (every

Documentation/devicetree/bindings/iio/potentiometer/mcp41010.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
* Microchip MCP41010/41050/41100/42010/42050/42100 Digital Potentiometer



Datasheet publicly available at:

http://ww1.microchip.com/downloads/en/devicedoc/11195c.pdf



The node for this driver must be a child node of a SPI controller, hence

all mandatory properties described in



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



must be specified.



Required properties:

	- compatible:  	Must be one of the following, depending on the

			model:

			"microchip,mcp41010"

			"microchip,mcp41050"

			"microchip,mcp41100"

			"microchip,mcp42010"

			"microchip,mcp42050"

			"microchip,mcp42100"



Example:

potentiometer@0 {

	compatible = "microchip,mcp41010";

	reg = <0>;

	spi-max-frequency = <500000>;

};

Documentation/devicetree/bindings/iio/resolver/ad2s90.txt

0 → 100644
+31 −0
Original line number Diff line number Diff line 
Analog Devices AD2S90 Resolver-to-Digital Converter



https://www.analog.com/en/products/ad2s90.html



Required properties:

  - compatible: should be "adi,ad2s90"

  - reg: SPI chip select number for the device

  - spi-max-frequency: set maximum clock frequency, must be 830000

  - spi-cpol and spi-cpha:

        Either SPI mode (0,0) or (1,1) must be used, so specify none or both of

        spi-cpha, spi-cpol.



See for more details:

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



Note about max frequency:

    Chip's max frequency, as specified in its datasheet, is 2Mhz. But a 600ns

    delay is expected between the application of a logic LO to CS and the

    application of SCLK, as also specified. And since the delay is not

    implemented in the spi code, to satisfy it, SCLK's period should be at most

    2 * 600ns, so the max frequency should be 1 / (2 * 6e-7), which gives

    roughly 830000Hz.



Example:

resolver@0 {

	compatible = "adi,ad2s90";

	reg = <0>;

	spi-max-frequency = <830000>;

	spi-cpol;

	spi-cpha;

};

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -6866,6 +6866,14 @@ L: linux-input@vger.kernel.org 
S:	Maintained

F:	drivers/input/touchscreen/htcpen.c



HTS221 TEMPERATURE-HUMIDITY IIO DRIVER

M:	Lorenzo Bianconi <lorenzo.bianconi83@gmail.com>

L:	linux-iio@vger.kernel.org

W:	http://www.st.com/

S:	Maintained

F:	drivers/iio/humidity/hts221*

F:	Documentation/devicetree/bindings/iio/humidity/hts221.txt



HUAWEI ETHERNET DRIVER

M:	Aviad Krawczyk <aviad.krawczyk@huawei.com>

L:	netdev@vger.kernel.org

CRA Git | Maintained and supported by SUSTech CRA and CCSE