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

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

Merge tag 'iio-for-4.19a' of... 

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

Jonathan writes:

First set of IIO new device support, features and cleanups in the 4.19 cycle

The usual mixed bunch.  Particular good to see is the generic
touch screen driver.  Will be interesting to see if this works
for other ADCs without major changes.

Core features
* Channel types
  - New position relative channel type primarily for touch screen
    sensors to feed the generic touchscreen driver.

New device support
* ad5586
  - Add support for the AD5311R DAC.

* Generic touch screen driver as an IIO consumer.
  - Note this is in input, but due to dependencies is coming through
    the IIO tree.
  - Specific support for this added to the at91-sama5d2 ADC.
  - Various necessary DT bindings added.

Staging Drops
* ADIS16060 gyro
  - A device with a very odd interface that was never cleanly supported.
    It's now very difficult to get, so unlikely it'll ever be fixed up.

Cleanups and minor features and fixes
* core
  - Fix y2038 timestamp issues now the core support is in place.
* 104-quad-8
  - Provide some defines for magic numbers to help readability.
  - Fix an off by one error in register selection
* ad7606
  - Put in a missing function parameter name in a prototype.
* adis16023
  - Use generic sign_extend function rather than local version.
* adis16240
  - Use generic sign_extend funciton rather than local version.
* at91-sama5d2
  - Drop dependency on HAS_DMA now this is handled elsewhere.  Will
    improve build test coverage.
  - Add oversampling ratio control.  Note there is a minor ABI change
    here to increase the apparent depth to 14 bits so as to allow
    for transparent provision of different oversampling ratios that
    drop the actual bit depth to 13 or 12 bits.
* hx711
  - Add a MAINTAINERS entry for this device.
* inv_mpu6050
  - Replace the timestamp fifo 'special' code with generic timestamp
    handling.
  - Switch to using local store of timestamp divider rather than rate
    as that is more helpful for accurate time measurement.
  - Fix an unaligned access that didn't seem to be causing any trouble.
  - Use the fifo overflow bit to track the overflow status rather than
    a software counter.
  - New timestamping mechanism to deal with missed sample interrupts.
* stm32-adc
  - Drop HAS_DMA build dependency.
* sun4i-gpadc
  - Select REGMAP_IRQ a very rarely hit build issue fix.
parents 6557dd49 6794e23f

Documentation/ABI/testing/sysfs-bus-iio

+12 −0
Original line number Diff line number Diff line
@@ -197,6 +197,18 @@ Description: 
		Angle of rotation. Units after application of scale and offset

		are radians.



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

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

KernelVersion:	4.18

Contact:	linux-iio@vger.kernel.org

Description:

		Relative position in direction x or y on a pad (may be

		arbitrarily assigned but should match other such assignments on

		device).

		Units after application of scale and offset are milli percents

		from the pad's size in both directions. Should be calibrated by

		the consumer.



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

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

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

Documentation/devicetree/bindings/iio/adc/at91-sama5d2_adc.txt

+9 −0
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ Optional properties: 
  - dmas: Phandle to dma channel for the ADC.

  - dma-names: Must be "rx" when dmas property is being used.

  See ../../dma/dma.txt for details.

  - #io-channel-cells: in case consumer drivers are attached, this must be 1.

  See <Documentation/devicetree/bindings/iio/iio-bindings.txt> for details.



Properties for consumer drivers:

  - Consumer drivers can be connected to this producer device, as specified

  in <Documentation/devicetree/bindings/iio/iio-bindings.txt>

  - Channels exposed are specified in:

  <dt-bindings/iio/adc/at91-sama5d2_adc.txt>



Example:
@@ -38,4 +46,5 @@ adc: adc@fc030000 { 
	atmel,trigger-edge-type = <IRQ_TYPE_EDGE_BOTH>;

	dmas = <&dma0 (AT91_XDMAC_DT_MEM_IF(0) | AT91_XDMAC_DT_PER_IF(1) | AT91_XDMAC_DT_PERID(25))>;

	dma-names = "rx";

	#io-channel-cells = <1>;

}

Documentation/devicetree/bindings/input/touchscreen/resistive-adc-touch.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
Generic resistive touchscreen ADC



Required properties:



 - compatible: must be "resistive-adc-touch"

The device must be connected to an ADC device that provides channels for

position measurement and optional pressure.

Refer to ../iio/iio-bindings.txt for details

 - iio-channels: must have at least two channels connected to an ADC device.

These should correspond to the channels exposed by the ADC device and should

have the right index as the ADC device registers them. These channels

represent the relative position on the "x" and "y" axes.

 - iio-channel-names: must have all the channels' names. Mandatory channels

are "x" and "y".



Optional properties:

 - iio-channels: The third channel named "pressure" is optional and can be

used if the ADC device also measures pressure besides position.

If this channel is missing, pressure will be ignored and the touchscreen

will only report position.

 - iio-channel-names: optional channel named "pressure".



Example:



	resistive_touch: resistive_touch {

		compatible = "resistive-adc-touch";

		touchscreen-min-pressure = <50000>;

		io-channels = <&adc 24>, <&adc 25>, <&adc 26>;

		io-channel-names = "x", "y", "pressure";

	};

Documentation/devicetree/bindings/input/touchscreen/touchscreen.txt

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,9 @@ Optional properties for Touchscreens: 
				  (in pixels)

 - touchscreen-max-pressure	: maximum reported pressure (arbitrary range

				  dependent on the controller)

 - touchscreen-min-pressure	: minimum pressure on the touchscreen to be

				  achieved in order for the touchscreen

				  driver to report a touch event.

 - touchscreen-fuzz-x		: horizontal noise value of the absolute input

				  device (in pixels)

 - touchscreen-fuzz-y		: vertical noise value of the absolute input

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -2547,6 +2547,13 @@ S: Maintained 
F:	drivers/auxdisplay/

F:	include/linux/cfag12864b.h



AVIA HX711 ANALOG DIGITAL CONVERTER IIO DRIVER

M:	Andreas Klinger <ak@it-klinger.de>

L:	linux-iio@vger.kernel.org

S:	Maintained

F:	Documentation/devicetree/bindings/iio/adc/avia-hx711.txt

F:	drivers/iio/adc/hx711.c



AX.25 NETWORK LAYER

M:	Ralf Baechle <ralf@linux-mips.org>

L:	linux-hams@vger.kernel.org
@@ -6006,6 +6013,12 @@ F: drivers/base/power/domain*.c 
F:	include/linux/pm_domain.h

F:	Documentation/devicetree/bindings/power/power_domain.txt



GENERIC RESISTIVE TOUCHSCREEN ADC DRIVER

M:	Eugen Hristev <eugen.hristev@microchip.com>

L:	linux-input@vger.kernel.org

S:	Maintained

F:	drivers/input/touchscreen/resistive-adc-touch.c



GENERIC UIO DRIVER FOR PCI DEVICES

M:	"Michael S. Tsirkin" <mst@redhat.com>

L:	kvm@vger.kernel.org