Commit 72cca7ba authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO updates from Greg KH:
 "Here's the "big" staging/iio pull request for 4.10-rc1.

  Not as big as 4.9 was, but still just over a thousand changes. We
  almost broke even of lines added vs. removed, as the slicoss driver
  was removed (got a "clean" driver for the same hardware through the
  netdev tree), and some iio drivers were also dropped, but I think we
  ended up adding a few thousand lines to the source tree in the end.
  Other than that it's a lot of minor fixes all over the place, nothing
  major stands out at all.

  All of these have been in linux-next for a while. There will be a
  merge conflict with Al's vfs tree in the lustre code, but the
  resolution for that should be pretty simple, that too has been in
  linux-next"

* tag 'staging-4.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1002 commits)
  staging: comedi: comedidev.h: Document usage of 'detach' handler
  staging: fsl-mc: remove unnecessary info prints from bus driver
  staging: fsl-mc: add sysfs ABI doc
  staging/lustre/o2iblnd: Fix misspelled attemps->attempts
  staging/lustre/o2iblnd: Fix misspelling intialized->intialized
  staging/lustre: Convert all bare unsigned to unsigned int
  staging/lustre/socklnd: Fix whitespace problem
  staging/lustre/o2iblnd: Add missing space
  staging/lustre/lnetselftest: Fix potential integer overflow
  staging: greybus: audio_module: remove redundant OOM message
  staging: dgnc: Fix lines longer than 80 characters
  staging: dgnc: fix blank line after '{' warnings.
  staging/android: remove Sync Framework tasks from TODO
  staging/lustre/osc: Revert erroneous list_for_each_entry_safe use
  staging: slicoss: remove the staging driver
  staging: lustre: libcfs: remove lnet upcall code
  staging: lustre: remove set but unused variables
  staging: lustre: osc: set lock data for readahead lock
  staging: lustre: import: don't reconnect during connect interpret
  staging: lustre: clio: remove mtime check in vvp_io_fault_start()
  ...
parents 5266e703 3e0f9b2c

Documentation/ABI/testing/sysfs-bus-fsl-mc

0 → 100644
+21 −0
Original line number Diff line number Diff line 
What:		/sys/bus/fsl-mc/drivers/.../bind

Date:		December 2016

Contact:	stuart.yoder@nxp.com

Description:

		Writing a device location to this file will cause

		the driver to attempt to bind to the device found at

		this location. The format for the location is Object.Id

		and is the same as found in /sys/bus/fsl-mc/devices/.

                For example:

		# echo dpni.2 > /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/bind



What:		/sys/bus/fsl-mc/drivers/.../unbind

Date:		December 2016

Contact:	stuart.yoder@nxp.com

Description:

		Writing a device location to this file will cause the

		driver to attempt to unbind from the device found at

		this location. The format for the location is Object.Id

		and is the same as found in /sys/bus/fsl-mc/devices/.

                For example:

		# echo dpni.2 > /sys/bus/fsl-mc/drivers/fsl_dpaa2_eth/unbind

Documentation/ABI/testing/sysfs-bus-iio

+18 −0
Original line number Diff line number Diff line
@@ -329,6 +329,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_pressure_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_humidityrelative_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_scale

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

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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1579,3 +1580,20 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Raw (unscaled no offset etc.) electric conductivity reading that

		can be processed to siemens per meter.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device counts from channel Y. For quadrature

		counters, multiplication by an available [Y]_scale results in

		the counts of a single quadrature signal phase from channel Y.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Raw counter device index value from channel Y. This attribute

		provides an absolute positional reference (e.g. a pulse once per

		revolution) which may be used to home positional systems as

		required.

Documentation/ABI/testing/sysfs-bus-iio-adc-envelope-detector

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

Date:		October 2016

KernelVersion:	4.9

Contact:	Peter Rosin <peda@axentia.se>

Description:

		The DAC is used to find the peak level of an alternating

		voltage input signal by a binary search using the output

		of a comparator wired to an interrupt pin. Like so:

		                           _

		                          | \

		     input +------>-------|+ \

		                          |   \

		            .-------.     |    }---.

		            |       |     |   /    |

		            |    dac|-->--|- /     |

		            |       |     |_/      |

		            |       |              |

		            |       |              |

		            |    irq|------<-------'

		            |       |

		            '-------'

		The boolean invert attribute (0/1) should be set when the

		input signal is centered around the maximum value of the

		dac instead of zero. The envelope detector will search

		from below in this case and will also invert the result.

		The edge/level of the interrupt is also switched to its

		opposite value.



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

Date:		October 2016

KernelVersion:	4.9

Contact:	Peter Rosin <peda@axentia.se>

Description:

		Number of milliseconds to wait for the comparator in each

		step of the binary search for the input peak level. Needs

		to relate to the frequency of the input signal.

Documentation/ABI/testing/sysfs-bus-iio-counter-104-quad-8

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

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

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

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

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

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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Discrete set of available values for the respective counter

		configuration are listed in this file.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Read-only attribute that indicates whether the counter for

		channel Y is counting up or down.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Count mode for channel Y. Four count modes are available:

		normal, range limit, non-recycle, and modulo-n. The preset value

		for channel Y is used by the count mode where required.



		Normal:

			Counting is continuous in either direction.



		Range Limit:

			An upper or lower limit is set, mimicking limit switches

			in the mechanical counterpart. The upper limit is set to

			the preset value, while the lower limit is set to 0. The

			counter freezes at count = preset when counting up, and

			at count = 0 when counting down. At either of these

			limits, the counting is resumed only when the count

			direction is reversed.



		Non-recycle:

			Counter is disabled whenever a 24-bit count overflow or

			underflow takes place. The counter is re-enabled when a

			new count value is loaded to the counter via a preset

			operation or write to raw.



		Modulo-N:

			A count boundary is set between 0 and the preset value.

			The counter is reset to 0 at count = preset when

			counting up, while the counter is set to the preset

			value at count = 0 when counting down; the counter does

			not freeze at the bundary points, but counts

			continuously throughout.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Read-only attribute that indicates whether excessive noise is

		present at the channel Y count inputs in quadrature clock mode;

		irrelevant in non-quadrature clock mode.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		If the counter device supports preset registers, the preset

		count for channel Y is provided by this attribute.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Configure channel Y counter for non-quadrature or quadrature

		clock mode. Selecting non-quadrature clock mode will disable

		synchronous load mode. In quadrature clock mode, the channel Y

		scale attribute selects the encoder phase division (scale of 1

		selects full-cycle, scale of 0.5 selects half-cycle, scale of

		0.25 selects quarter-cycle) processed by the channel Y counter.



		Non-quadrature:

			The filter and decoder circuit are bypassed. Encoder A

			input serves as the count input and B as the UP/DOWN

			direction control input, with B = 1 selecting UP Count

			mode and B = 0 selecting Down Count mode.



		Quadrature:

			Encoder A and B inputs are digitally filtered and

			decoded for UP/DN clock.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Whether to set channel Y counter with channel Y preset value

		when channel Y index input is active, or continuously count.

		Valid attribute values are boolean.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Active level of channel Y index input; irrelevant in

		non-synchronous load mode.



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

KernelVersion:	4.9

Contact:	linux-iio@vger.kernel.org

Description:

		Configure channel Y counter for non-synchronous or synchronous

		load mode. Synchronous load mode cannot be selected in

		non-quadrature clock mode.



		Non-synchronous:

			A logic low level is the active level at this index

			input. The index function (as enabled via

			set_to_preset_on_index) is performed directly on the

			active level of the index input.



		Synchronous:

			Intended for interfacing with encoder Index output in

			quadrature clock mode. The active level is configured

			via index_polarity. The index function (as enabled via

			set_to_preset_on_index) is performed synchronously with

			the quadrature clock on the active level of the index

			input.

Documentation/ABI/testing/sysfs-bus-iio-cros-ec

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

Date:		July 2015

KernelVersion:	4.7

Contact:	linux-iio@vger.kernel.org

Description:

		Writing '1' will perform a FOC (Fast Online Calibration). The

                corresponding calibration offsets can be read from *_calibbias

                entries.



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

Date:		July 2015

KernelVersion:	4.7

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute returns a string with the physical location where

                the motion sensor is placed. For example, in a laptop a motion

                sensor can be located on the base or on the lid. Current valid

		values are 'base' and 'lid'.

CRA Git | Maintained and supported by SUSTech CRA and CCSE