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

Commit 2f37dd13 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging and IIO driver updates from Greg KH:
 "Here's the big staging and iio driver update for 4.7-rc1.

  I think we almost broke even with this release, only adding a few more
  lines than we removed, which isn't bad overall given that there's a
  bunch of new iio drivers added.

  The Lustre developers seem to have woken up from their sleep and have
  been doing a great job in cleaning up the code and pruning unused or
  old cruft, the filesystem is almost readable :)

  Other than that, just a lot of basic coding style cleanups in the
  churn.  All have been in linux-next for a while with no reported
  issues"

* tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (938 commits)
  Staging: emxx_udc: emxx_udc: fixed coding style issue
  staging/gdm724x: fix "alignment should match open parenthesis" issues
  staging/gdm724x: Fix avoid CamelCase
  staging: unisys: rename misleading var ii with frag
  staging: unisys: visorhba: switch success handling to error handling
  staging: unisys: visorhba: main path needs to flow down the left margin
  staging: unisys: visorinput: handle_locking_key() simplifications
  staging: unisys: visorhba: fail gracefully for thread creation failures
  staging: unisys: visornic: comment restructuring and removing bad diction
  staging: unisys: fix format string %Lx to %llx for u64
  staging: unisys: remove unused struct members
  staging: unisys: visorchannel: correct variable misspelling
  staging: unisys: visorhba: replace functionlike macro with function
  staging: dgnc: Need to check for NULL of ch
  staging: dgnc: remove redundant condition check
  staging: dgnc: fix 'line over 80 characters'
  staging: dgnc: clean up the dgnc_get_modem_info()
  staging: lustre: lnet: enable configuration per NI interface
  staging: lustre: o2iblnd: properly set ibr_why
  staging: lustre: o2iblnd: remove last of kiblnd_tunables_fini
  ...
parents 3aa2fc16 ffc83a79

Documentation/ABI/testing/sysfs-bus-iio

+66 −2
Original line number Diff line number Diff line
@@ -1233,7 +1233,7 @@ KernelVersion: 3.4 
Contact:	linux-iio@vger.kernel.org

Description:

		Proximity measurement indicating that some

		object is near the sensor, usually be observing

		object is near the sensor, usually by observing

		reflectivity of infrared or ultrasound emitted.

		Often these sensors are unit less and as such conversion

		to SI units is not possible. Higher proximity measurements
@@ -1255,12 +1255,23 @@ Description: 
What:		/sys/.../iio:deviceX/in_intensityY_raw

What:		/sys/.../iio:deviceX/in_intensityY_ir_raw

What:		/sys/.../iio:deviceX/in_intensityY_both_raw

What:		/sys/.../iio:deviceX/in_intensityY_uv_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity. Modifiers both and ir indicate

		that measurements contains visible and infrared light

		components or just infrared light, respectively.

		components or just infrared light, respectively. Modifier uv indicates

		that measurements contain ultraviolet light components.



What:		/sys/.../iio:deviceX/in_uvindex_input

KernelVersion:	4.6

Contact:	linux-iio@vger.kernel.org

Description:

		UV light intensity index measuring the human skin's response to

		different wavelength of sunlight weighted according to the

		standardised CIE Erythemal Action Spectrum. UV index values range

		from 0 (low) to >=11 (extreme).



What:		/sys/.../iio:deviceX/in_intensity_red_integration_time

What:		/sys/.../iio:deviceX/in_intensity_green_integration_time
@@ -1501,3 +1512,56 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Raw (unscaled no offset etc.) pH reading of a substance as a negative

		base-10 logarithm of hydrodium ions in a litre of water.



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

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

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

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

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

KernelVersion:  4.6

Contact:        linux-iio@vger.kernel.org

Description:

		Mounting matrix for IIO sensors. This is a rotation matrix which

		informs userspace about sensor chip's placement relative to the

		main hardware it is mounted on.

		Main hardware placement is defined according to the local

		reference frame related to the physical quantity the sensor

		measures.

		Given that the rotation matrix is defined in a board specific

		way (platform data and / or device-tree), the main hardware

		reference frame definition is left to the implementor's choice

		(see below for a magnetometer example).

		Applications should apply this rotation matrix to samples so

		that when main hardware reference frame is aligned onto local

		reference frame, then sensor chip reference frame is also

		perfectly aligned with it.

		Matrix is a 3x3 unitary matrix and typically looks like

		[0, 1, 0; 1, 0, 0; 0, 0, -1]. Identity matrix

		[1, 0, 0; 0, 1, 0; 0, 0, 1] means sensor chip and main hardware

		are perfectly aligned with each other.



		For example, a mounting matrix for a magnetometer sensor informs

		userspace about sensor chip's ORIENTATION relative to the main

		hardware.

		More specifically, main hardware orientation is defined with

		respect to the LOCAL EARTH GEOMAGNETIC REFERENCE FRAME where :

		* Y is in the ground plane and positive towards magnetic North ;

		* X is in the ground plane, perpendicular to the North axis and

		  positive towards the East ;

		* Z is perpendicular to the ground plane and positive upwards.



		An implementor might consider that for a hand-held device, a

		'natural' orientation would be 'front facing camera at the top'.

		The main hardware reference frame could then be described as :

		* Y is in the plane of the screen and is positive towards the

		  top of the screen ;

		* X is in the plane of the screen, perpendicular to Y axis, and

		  positive towards the right hand side of the screen ;

		* Z is perpendicular to the screen plane and positive out of the

		  screen.

		Another example for a quadrotor UAV might be :

		* Y is in the plane of the propellers and positive towards the

		  front-view camera;

		* X is in the plane of the propellers, perpendicular to Y axis,

		  and positive towards the starboard side of the UAV ;

		* Z is perpendicular to propellers plane and positive upwards.

Documentation/DocBook/device-drivers.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,8 @@ X!Edrivers/base/interface.c 
!Iinclude/linux/seqno-fence.h

!Edrivers/dma-buf/reservation.c

!Iinclude/linux/reservation.h

!Edrivers/dma-buf/sync_file.c

!Iinclude/linux/sync_file.h

!Edrivers/base/dma-coherent.c

!Edrivers/base/dma-mapping.c

     </sect1>

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

+2 −1
Original line number Diff line number Diff line 
Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC or MMA8653FC

Freescale MMA8451Q, MMA8452Q, MMA8453Q, MMA8652FC, MMA8653FC or FXLS8471Q

triaxial accelerometer



Required properties:
@@ -9,6 +9,7 @@ Required properties: 
    * "fsl,mma8453"

    * "fsl,mma8652"

    * "fsl,mma8653"

    * "fsl,fxls8471"



  - reg: the I2C address of the chip

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
NXP LPC1850 ADC bindings



Required properties:

- compatible: Should be "nxp,lpc1850-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

- vref-supply: The regulator supply ADC reference voltage

- resets: phandle to reset controller and line specifier



Example:



adc0: adc@400e3000 {

	compatible = "nxp,lpc1850-adc";

	reg = <0x400e3000 0x1000>;

	interrupts = <17>;

	clocks = <&ccu1 CLK_APB3_ADC0>;

	vref-supply = <&reg_vdda>;

	resets = <&rgu 40>;

	status = "disabled";

};