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

Commit 9dffdb38 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-4.6-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.6-rc1.

  Lots of little things here, over 1600 patches or so.  Notable is all
  of the good Lustre work happening, those developers have finally woken
  up and are cleaning up their code greatly.  The Outreachy intern
  application process is also happening, which brought in another 400 or
  so patches.  Full details are in the very long shortlog.

  All of these have been in linux-next with no reported issues"

* tag 'staging-4.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1673 commits)
  staging: lustre: fix aligments in lnet selftest
  staging: lustre: report minimum of two buffers for LNet selftest load test
  staging: lustre: test for proper errno code in lstcon_rpc_trans_abort
  staging: lustre: filter remaining extra spacing for lnet selftest
  staging: lustre: remove extra spacing when setting variable for lnet selftest
  staging: lustre: remove extra spacing of variable declartions for lnet selftest
  staging: lustre: fix spacing issues checkpatch reported in lnet selftest
  staging: lustre: remove returns in void function for lnet selftest
  staging: lustre: fix bogus lst errors for lnet selftest
  staging: netlogic: Replacing pr_err with dev_err after the call to devm_kzalloc
  staging: mt29f_spinand: Replacing pr_info with dev_info after the call to devm_kzalloc
  staging: android: ion: fix up file mode
  staging: ion: debugfs invalid gfp mask
  staging: rts5208: Replace pci_enable_device with pcim_enable_device
  Staging: ieee80211: Place constant on right side of the test.
  staging: speakup: Replace del_timer with del_timer_sync
  staging: lowmemorykiller: fix 2 checks that checkpatch complained
  staging: mt29f_spinand: Drop void pointer cast
  staging: rdma: hfi1: file_ops: Replace ALIGN with PAGE_ALIGN
  staging: rdma: hfi1: driver: Replace IS_ALIGNED with PAGE_ALIGNED
  ...
parents 10fdfee7 2df122bd

CREDITS

+1 −0
Original line number Diff line number Diff line
@@ -3054,6 +3054,7 @@ D: PLX USB338x driver 
D: PCA9634 driver

D: Option GTM671WFS

D: Fintek F81216A

D: AD5761 iio driver

D: Various kernel hacks

S: Qtechnology A/S

S: Valby Langgade 142

Documentation/ABI/testing/sysfs-bus-iio

+10 −0
Original line number Diff line number Diff line
@@ -496,8 +496,11 @@ Description: 
		1kohm_to_gnd: connected to ground via an 1kOhm resistor,

		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

		20kohm_to_gnd: connected to ground via a 20kOhm resistor,

		90kohm_to_gnd: connected to ground via a 90kOhm resistor,

		100kohm_to_gnd: connected to ground via an 100kOhm resistor,

		125kohm_to_gnd: connected to ground via an 125kOhm resistor,

		500kohm_to_gnd: connected to ground via a 500kOhm resistor,

		640kohm_to_gnd: connected to ground via a 640kOhm resistor,

		three_state: left floating.

		For a list of available output power down options read

		outX_powerdown_mode_available. If Y is not present the
@@ -1491,3 +1494,10 @@ Description: 
		This ABI is especially applicable for humidity sensors

		to heatup the device and get rid of any condensation

		in some humidity environment



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

KernelVersion:	4.5

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.

Documentation/ABI/testing/sysfs-bus-iio-health-afe440x

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

		/sys/bus/iio/devices/iio:deviceX/tia_capacitanceY

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the resistance and the capacitance settings for the

		Transimpedance Amplifier. Y is 1 for Rf1 and Cf1, Y is 2 for

		Rf2 and Cf2 values.



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

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Enable or disable separate settings for the TransImpedance

		Amplifier above, when disabled both values are set by the

		first channel.



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

		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY_ambient_raw

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get measured values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement.



What:		/sys/bus/iio/devices/iio:deviceX/in_intensity_ledY-ledY_ambient_raw

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get differential values from the ADC for these stages. Y is the

		specific LED number. The values are expressed in 24-bit twos

		complement for the specified LEDs.



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

		/sys/bus/iio/devices/iio:deviceX/out_current_ledY_ambient_offset

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the offset cancellation DAC setting for these

		stages. The values are expressed in 5-bit sign-magnitude.



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

Date:		December 2015

KernelVersion:

Contact:	Andrew F. Davis <afd@ti.com>

Description:

		Get and set the LED current for the specified LED. Y is the

		specific LED number.

Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843

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

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

KernelVersion:  4.5

Contact:        linux-iio@vger.kernel.org

Description:

                Current configuration and available configurations

		for the bias current.

		normal		- Normal measurement configurations (default)

		positivebias	- Positive bias configuration

		negativebias	- Negative bias configuration

		disabled	- Only available on HMC5983. Disables magnetic

				  sensor and enables temperature sensor.

		Note: The effect of this configuration may vary

		according to the device. For exact documentation

		check the device's datasheet.

Documentation/ABI/testing/sysfs-bus-iio-vf610

+9 −0
Original line number Diff line number Diff line
@@ -5,3 +5,12 @@ Description: 
		Specifies the hardware conversion mode used. The three

		available modes are "normal", "high-speed" and "low-power",

		where the last is the default mode.





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

KernelVersion:	4.6

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies the hardware conversion mode used within DAC.

		The two available modes are "high-power" and "low-power",

		where "low-power" mode is the default mode.