Commit c0c419c0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging/IIO driver updates from Greg KH:
 "Here is the large set of Staging and IIO driver patches for 5.9-rc1.

  Lots of churn here, but overall the size increase in lines added is
  small, while adding a load of new IIO drivers.

  Major things in here:

   - lots and lots of IIO new drivers and frameworks added

   - IIO driver fixes and updates

   - lots of tiny coding style cleanups for staging drivers

   - vc04_services major reworks and cleanups

  We had 3 set of drivers move out of staging in this round as well:

   - wilc1000 wireless driver moved out of staging

   - speakup moved out of staging

   - most USB driver moved out of staging

  Full details are in the shortlog.

  All of these have been in linux-next with no reported issues. The last
  few changes here were to resolve reported linux-next issues, and they
  seem to have resolved the problems"

* tag 'staging-5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (428 commits)
  staging: most: fix up movement of USB driver
  staging: rts5208: clear alignment style issues
  staging: r8188eu: replace rtw_netdev_priv define with inline function
  staging: netlogic: clear alignment style issues
  staging: android: ashmem: Fix lockdep warning for write operation
  drivers: most: add USB adapter driver
  staging: most: Use %pM format specifier for MAC addresses
  staging: ks7010: Use %pM format specifier for MAC addresses
  staging: qlge: qlge_dbg: removed comment repition
  staging: wfx: Use flex_array_size() helper in memcpy()
  staging: rtl8723bs: Align macro definitions
  staging: rtl8723bs: Clean up function declations
  staging: rtl8723bs: Fix coding style errors
  drivers: staging: audio: Fix the missing header file for helper file
  staging: greybus: audio: Enable GB codec, audio module compilation.
  staging: greybus: audio: Add helper APIs for dynamic audio modules
  staging: greybus: audio: Resolve compilation error in topology parser
  staging: greybus: audio: Resolve compilation errors for GB codec module
  staging: greybus: audio: Maintain jack list within GB Audio module
  staging: greybus: audio: Update snd_jack FW usage as per new APIs
  ...
parents 3f9df564 5bbd9055

Documentation/ABI/testing/sysfs-bus-iio

+2 −1
Original line number Diff line number Diff line
@@ -1569,7 +1569,8 @@ 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.

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

		after application of scale and offset are percents.



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

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

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

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

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

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

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

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

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

KernelVersion:  5.8

Contact:        linux-iio@vger.kernel.org

Description:

		Hardware applied calibration offset (assumed to fix production

		inaccuracies). Values represent a real physical offset expressed

		in SI units (m/s^2 for accelerometer and rad/s for gyroscope).



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

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

KernelVersion:  5.8

Contact:        linux-iio@vger.kernel.org

Description:

		Range of available values for hardware offset. Values in SI

		units (m/s^2 for accelerometer and rad/s for gyroscope).

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

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

Date:		June 2020

KernelVersion:	5.8

Contact:	linux-iio@vger.kernel.org

Description:

		Contaminants build-up in the measurement chamber or optical

		elements deterioration leads to sensor drift.



		One can compensate for sensor drift by using automatic self

		calibration procedure (asc).



		Writing 1 or 0 to this attribute will respectively activate or

		deactivate asc.



		Upon reading current asc status is returned.



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

Date:		June 2020

KernelVersion:	5.8

Contact:	linux-iio@vger.kernel.org

Description:

		Contaminants build-up in the measurement chamber or optical

		elements deterioration leads to sensor drift.



		One can compensate for sensor drift by using forced

		recalibration (frc). This is useful in case there's known

		co2 reference available nearby the sensor.



		Picking value from the range [400 1 2000] and writing it to the

		sensor will set frc.



		Upon reading current frc value is returned. Note that after

		power cycling default value (i.e 400) is returned even though

		internally sensor had recalibrated itself.

drivers/staging/speakup/spkguide.txt→Documentation/admin-guide/spkguide.txt

+1 −1
Original line number Diff line number Diff line
@@ -1531,7 +1531,7 @@ The Free Software Foundation may publish new, revised versions 
of the GNU Free Documentation License from time to time.  Such new

versions will be similar in spirit to the present version, but may

differ in detail to address new problems or concerns.  See

http://www.gnu.org/copyleft/.

https://www.gnu.org/copyleft/.



Each version of the License is given a distinguishing version number.

If the Document specifies that a particular numbered version of this

CRA Git | Maintained and supported by SUSTech CRA and CCSE