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

Commit 39272dde authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 4.5-rc1.

  Lots of cleanups and fixes here, not as many as some releases, but
  800+ isn't that bad.  Full details in the shortlog.  All of these have
  been in linux-next for a while"

* tag 'staging-4.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (843 commits)
  Revert "arm64: dts: Add dts files to enable ION on Hi6220 SoC."
  staging: gdm724x: constify tty_port_operations structs
  staging: gdm72xx: add userspace data struct
  staging: gdm72xx: Replace timeval with ktime_t
  iio: adc: ina2xx: Fix incorrect report of data endianness to userspace.
  iio: light: us5182d: Refactor read_raw function
  iio: light: us5182d: Add interrupt support and events
  iio: light: us5182d: Fix enable status inconcistency
  iio: Make IIO value formating function globally available.
  staging: emxx_udc: use list_first_entry_or_null()
  staging/emxx_udc: fix 64-bit warnings
  STAGING: COMEDI: Using kernel types in plx9080.h
  STAGING: COMEDI: Added spaces around binary operators in plx9080.h
  STAGING: COMEDI: Fixed format of comments in plx9080.h
  staging: comedi: comedilib.h: Coding style warning fix for block comments
  staging: comedi: s526: add macros for counter control reg values
  staging: comedi: s526: replace counter mode bitfield struct
  staging: comedi: check for more errors for zero-length write
  staging: comedi: simplify returned errors for comedi_write()
  staging: comedi: return error on "write" if no command set up
  ...
parents 67ad058d 841e3ed9

Documentation/ABI/testing/configfs-iio

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/config/iio

Date:		October 2015

KernelVersion:	4.4

Contact:	linux-iio@vger.kernel.org

Description:

		This represents Industrial IO configuration entry point

		directory. It contains sub-groups corresponding to IIO

		objects.



What:		/config/iio/triggers

Date:		October 2015

KernelVersion:	4.4

Description:

		Industrial IO software triggers directory.



What:		/config/iio/triggers/hrtimers

Date:		October 2015

KernelVersion:	4.4

Description:

		High resolution timers directory. Creating a directory here

		will result in creating a hrtimer trigger in the IIO subsystem.

Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc

0 → 100644
+24 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/iio:deviceX/in_allow_async_readout

Date:		December 2015

KernelVersion:	4.4

Contact:	linux-iio@vger.kernel.org

Description:

		By default (value '0'), the capture thread checks for the Conversion

		Ready Flag to being set prior to committing a new value to the sample

		buffer. This synchronizes the in-chip conversion rate with the

		in-driver readout rate at the cost of an additional register read.



		Writing '1' will remove the polling for the Conversion Ready Flags to

		save the additional i2c transaction, which will improve the bandwidth

		available for reading data. However, samples can be occasionally skipped

		or repeated, depending on the beat between the capture and conversion

		rates.



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

Date:		December 2015

KernelVersion:	4.4

Contact:	linux-iio@vger.kernel.org

Description:

		The value of the shunt resistor may be known only at runtime fom an

		eeprom content read by a client application. This attribute allows to

		set its value in ohms.

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ adi,adt7476 +/-1C TDM Extended Temp Range I.C 
adi,adt7490		+/-1C TDM Extended Temp Range I.C

adi,adxl345		Three-Axis Digital Accelerometer

adi,adxl346		Three-Axis Digital Accelerometer (backward-compatibility value "adi,adxl345" must be listed too)

ams,iaq-core		AMS iAQ-Core VOC Sensor

at,24c08		i2c serial eeprom  (24cxx)

atmel,24c00		i2c serial eeprom  (24cxx)

atmel,24c01		i2c serial eeprom  (24cxx)

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

+6 −0
Original line number Diff line number Diff line
@@ -7,13 +7,18 @@ Required properties: 
    * "fsl,mma8453"

    * "fsl,mma8652"

    * "fsl,mma8653"



  - reg: the I2C address of the chip



Optional properties:



  - interrupt-parent: should be the phandle for the interrupt controller



  - interrupts: interrupt mapping for GPIO IRQ



  - interrupt-names: should contain "INT1" and/or "INT2", the accelerometer's

		     interrupt line in use.



Example:



	mma8453fc@1d {
@@ -21,4 +26,5 @@ Example: 
		reg = <0x1d>;

		interrupt-parent = <&gpio1>;

		interrupts = <5 0>;

		interrupt-names = "INT2";

	};

Documentation/devicetree/bindings/iio/adc/imx7d-adc.txt

0 → 100644
+22 −0
Original line number Diff line number Diff line 
Freescale imx7d ADC bindings



The devicetree bindings are for the ADC driver written for

imx7d SoC.



Required properties:

- compatible: Should be "fsl,imx7d-adc"

- reg: Offset and length of the register set for the ADC device

- interrupts: The interrupt number for the ADC device

- clocks: The root clock of the ADC controller

- clock-names: Must contain "adc", matching entry in the clocks property

- vref-supply: The regulator supply ADC reference voltage



Example:

adc1: adc@30610000 {

	compatible = "fsl,imx7d-adc";

	reg = <0x30610000 0x10000>;

	interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;

	clocks = <&clks IMX7D_ADC_ROOT_CLK>;

	clock-names = "adc";

	vref-supply = <&reg_vcc_3v3_mcu>;

};