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

Commit 118c216e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here's the big staging driver update for 4.4-rc1.  If you were
  disappointed for 4.3-rc1 that we didn't contribute enough changesets,
  you should be happy with this pull request of over 2400 patches.

  But overall we removed more lines of code than we added, which is nice
  to see.  Full details in the shortlog.

  All of these have been in linux-next for a while"

Greg, I've never been disappointed in how few commits Staging
contributes to the kernel..  Never.

* tag 'staging-4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2431 commits)
  Staging: rtl8192u: ieee80211: added missing blank lines
  Staging: rtl8192u: ieee80211: removed unnecessary braces
  Staging: rtl8192u: ieee80211: corrected block comments
  Staging: rtl8192u: ieee80211: corrected indent
  Staging: rtl8192u: ieee80211: added missing spaces after if
  Staging: rtl8192u: ieee80211: added missing space around '='
  Staging: rtl8192u: ieee80211: fixed position of else statements
  Staging: rtl8192u: ieee80211: fixed open brace positions
  staging: rdma: ipath: Remove unneeded vairable.
  staging: rtl8188eu: pwrGrpCnt variable removed in store_pwrindex_offset function
  staging: rtl8188eu: new variable for hal_data->MCSTxPowerLevelOriginalOffset[pwrGrpCnt] in store_pwrindex_offset function
  staging: rtl8188eu: checkpatch fixes: 'Avoid CamelCase' in hal/bb_cfg.c
  staging: rtl8188eu: checkpatch fixes: line over 80 characters splited into two parts
  staging: rtl8188eu: checkpatch fixes: alignment should match open parenthesis
  staging: rtl8188eu: checkpatch fixes: unnecessary parentheses removed in hal/bb_cfg.c
  staging: rtl8188eu: checkpatch fixes: spaces preferred around that '|' in hal/bb_cfg.c
  staging: rtl8188eu: operator = replaced by += in loop increment
  staging: rtl8188eu: occurrence of the 5 GHz code marked
  staging: rtl8188eu: increment placed into for loop header
  staging: rtl8188eu: while loop replaced by for loop in rtw_restruct_wmm_ie
  ...
parents fd0d351d e3cc3136

Documentation/ABI/testing/sysfs-bus-iio

+32 −0
Original line number Diff line number Diff line
@@ -581,6 +581,7 @@ What: /sys/.../iio:deviceX/events/in_voltageY_supply_thresh_rising_en 
What:		/sys/.../iio:deviceX/events/in_voltageY_supply_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_falling_en

What:		/sys/.../iio:deviceX/events/in_voltageY_thresh_either_en

What:		/sys/.../iio:deviceX/events/in_tempY_thresh_rising_en

What:		/sys/.../iio:deviceX/events/in_tempY_thresh_falling_en

KernelVersion:	2.6.37
@@ -1459,3 +1460,34 @@ Description: 
		measurements and return the average value as output data. Each

		value resulted from <type>[_name]_oversampling_ratio measurements

		is considered as one sample for <type>[_name]_sampling_frequency.



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

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

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

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

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

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

KernelVersion:	4.3

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) percentage reading of a substance.



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

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

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

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

KernelVersion:	4.3

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no offset etc.) resistance reading that can be processed

		into an ohm value.



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

KernelVersion:	4.1.0

Contact:	linux-iio@vger.kernel.org

Description:

		'1' (enable) or '0' (disable) specifying the enable

		of heater function. Same reading values apply

		This ABI is especially applicable for humidity sensors

		to heatup the device and get rid of any condensation

		in some humidity environment

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

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

Date:		August 2015

KernelVersion:	4.2.0

Contact:	source@cogentembedded.com

Description:

		Program sensor type for threshold detector inputs.

		Could be either "GND-Open" or "Supply-Open" mode. Y is a

		threshold detector input channel. Channels 0..7, 8..15, 16..23

		and 24..31 has common sensor types.



What:		/sys/bus/iio/devices/iio:deviceX/events/in_voltageY_thresh_falling_value

Date:		August 2015

KernelVersion:	4.2.0

Contact:	source@cogentembedded.com

Description:

		Channel Y low voltage threshold. If sensor input voltage goes lower then

		this value then the threshold falling event is pushed.

		Depending on in_voltageY_sensing_mode the low voltage threshold

		is separately set for "GND-Open" and "Supply-Open" modes.

		Channels 0..31 have common low threshold values, but could have different

		sensing_modes.

		The low voltage threshold range is between 2..21V.

		Hysteresis between low and high thresholds can not be lower then 2 and

		can not be odd.

		If falling threshold results hysteresis to odd value then rising

		threshold is automatically subtracted by one.



What:		/sys/bus/iio/devices/iio:deviceX/events/in_voltageY_thresh_rising_value

Date:		August 2015

KernelVersion:	4.2.0

Contact:	source@cogentembedded.com

Description:

		Channel Y high voltage threshold. If sensor input voltage goes higher then

		this value then the threshold rising event is pushed.

		Depending on in_voltageY_sensing_mode the high voltage threshold

		is separately set for "GND-Open" and "Supply-Open" modes.

		Channels 0..31 have common high threshold values, but could have different

		sensing_modes.

		The high voltage threshold range is between 3..22V.

		Hysteresis between low and high thresholds can not be lower then 2 and

		can not be odd.

		If rising threshold results hysteresis to odd value then falling

		threshold is automatically appended by one.

Documentation/ABI/testing/sysfs-bus-iio-chemical-vz89x

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

Date:		September 2015

KernelVersion:	4.3

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Get the raw calibration VOC value from the sensor.

		This value has little application outside of calibration.

Documentation/ABI/testing/sysfs-bus-iio-humidity-hdc100x

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

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

KernelVersion:	4.3

Contact:	linux-iio@vger.kernel.org

Description:

		Controls the heater device within the humidity sensor to get

		rid of excess condensation.



		Valid control values are 0 = OFF, and 1 = ON.

Documentation/ABI/testing/sysfs-bus-iio-meas-spec

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

KernelVersion:  4.1.0

Contact:        linux-iio@vger.kernel.org

Description:

                Reading returns either '1' or '0'. '1' means that the

                battery level supplied to sensor is below 2.25V.

                This ABI is available for tsys02d, htu21, ms8607

		This ABI is available for htu21, ms8607