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

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

Merge tag 'iio-for-3.13c' of... 

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

Jonathan writes:

Third set of new functionality and cleanups for IIO in the 3.13 cycle.

Driver New Functionality
* MXS - new interrupt driven touch screen support for i.MX23/28. Old
  polled implementation dropped.

Driver Cleanups
* Some spi_sync boilerplate dropped by using spi_sync_transfer
* Some switching of drivers to the fractional type for scale reading.
  Moves the ugly calculation into one place.
* Fix the documentation for *_voltage_scale which is never been correct
  or as implemented in any driver.
* HID sensor hub and children : Open the sensor hub only when someone cares.
* hmc5843 - various minor
parents 5f1a1369 3658a71b

Documentation/ABI/testing/sysfs-bus-iio

+2 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Description: 
		correspond to externally available input one of the named

		versions may be used. The number must always be specified and

		unique to allow association with event codes. Units after

		application of scale and offset are microvolts.

		application of scale and offset are millivolts.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw

KernelVersion:	2.6.35
@@ -90,7 +90,7 @@ Description: 
		physically equivalent inputs when non differential readings are

		separately available. In differential only parts, then all that

		is required is a consistent labeling.  Units after application

		of scale and offset are microvolts.

		of scale and offset are millivolts.



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

KernelVersion:	3.2

Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt

+31 −5
Original line number Diff line number Diff line 
* Freescale i.MX28 LRADC device driver



Required properties:

- compatible: Should be "fsl,imx28-lradc"

- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"

              for i.MX28 SoC

- reg: Address and length of the register set for the device

- interrupts: Should contain the LRADC interrupts
@@ -9,13 +10,38 @@ Optional properties: 
- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen

                               to LRADC. Valid value is either 4 or 5. If this

                               property is not present, then the touchscreen is

                               disabled.

                               disabled. 5 wires is valid for i.MX28 SoC only.

- fsl,ave-ctrl: number of samples per direction to calculate an average value.

                Allowed value is 1 ... 31, default is 4

- fsl,ave-delay: delay between consecutive samples. Allowed value is

                 1 ... 2047. It is used if 'fsl,ave-ctrl' > 1, counts at

                 2 kHz and its default is 2 (= 1 ms)

- fsl,settling: delay between plate switch to next sample. Allowed value is

                1 ... 2047. It counts at 2 kHz and its default is

                10 (= 5 ms)



Examples:

Example for i.MX23 SoC:



	lradc@80050000 {

		compatible = "fsl,imx23-lradc";

		reg = <0x80050000 0x2000>;

		interrupts = <36 37 38 39 40 41 42 43 44>;

		status = "okay";

		fsl,lradc-touchscreen-wires = <4>;

		fsl,ave-ctrl = <4>;

		fsl,ave-delay = <2>;

		fsl,settling = <10>;

	};



Example for i.MX28 SoC:



	lradc@80050000 {

		compatible = "fsl,imx28-lradc";

		reg = <0x80050000 0x2000>;

		interrupts = <10 14 15 16 17 18 19

				20 21 22 23 24 25>;

		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;

		status = "okay";

		fsl,lradc-touchscreen-wires = <5>;

		fsl,ave-ctrl = <4>;

		fsl,ave-delay = <2>;

		fsl,settling = <10>;

	};

arch/arm/boot/dts/imx23.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -430,6 +430,7 @@ 
				reg = <0x80050000 0x2000>;

				interrupts = <36 37 38 39 40 41 42 43 44>;

				status = "disabled";

				clocks = <&clks 26>;

			};



			spdif@80054000 {

arch/arm/boot/dts/imx28-evk.dts

+4 −0
Original line number Diff line number Diff line
@@ -183,6 +183,10 @@ 


			lradc@80050000 {

				status = "okay";

				fsl,lradc-touchscreen-wires = <4>;

				fsl,ave-ctrl = <4>;

				fsl,ave-delay = <2>;

				fsl,settling = <10>;

			};



			i2c0: i2c@80058000 {

arch/arm/boot/dts/imx28.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -902,6 +902,7 @@ 
				interrupts = <10 14 15 16 17 18 19

						20 21 22 23 24 25>;

				status = "disabled";

				clocks = <&clks 41>;

			};



			spdif: spdif@80054000 {