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

Merge tag 'staging-5.10-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 updates for 5.10-rc1.

  Included in here are:

   - new IIO drivers

   - new IIO driver frameworks

   - various IIO driver fixes and updates

   - IIO device tree conversions to yaml

   - so many minor staging driver coding style cleanups

   - most cdev driver moved out of staging

   - no staging drivers added or removed

  Full details are in the shortlog.

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

* tag 'staging-5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (476 commits)
  staging: comedi: check validity of wMaxPacketSize of usb endpoints found
  staging: wfx: improve robustness of wfx_get_hw_rate()
  staging: wfx: drop unicode characters from strings
  staging: wfx: gpiod_get_value() can return an error
  staging: wfx: increase robustness of hif_generic_confirm()
  staging: wfx: wfx_init_common() returns NULL on error
  staging: wfx: standardize the error when vif does not exist
  staging: wfx: check memory allocation
  staging: wfx: improve error handling of hif_join()
  staging: dpaa2-switch: add a dpaa2_switch prefix to all functions in ethsw.c
  staging: dpaa2-switch: add a dpaa2_switch_ prefix to all functions in ethsw-ethtool.c
  staging: rtl8188eu: Fix long lines
  dt-bindings: staging: wfx: silabs,wfx yaml conversion
  staging: wfx: update copyrights dates
  staging: wfx: fix QoS priority for slow buses
  staging: wfx: fix BA sessions for older firmwares
  staging: wfx: remove remaining code of 'secure link' feature
  staging: wfx: fix handling of MMIC error
  staging: vchiq: Fix list_for_each exit tests
  staging: greybus: use __force when assigning __u8 value to snd_ctl_elem_type_t
  ...
parents 3e4fb434 e1f13c87

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -1942,6 +1942,10 @@ S: Post Office Box 611311 
S: San Jose, California 95161-1311

S: USA



N: Hartmut Knaack

E: knaack.h@gmx.de

D: IIO subsystem and drivers



N: Thorsten Knabe

E: Thorsten Knabe <tek@rbg.informatik.tu-darmstadt.de>

E: Thorsten Knabe <tek01@hrzpub.tu-darmstadt.de>

Documentation/ABI/testing/sysfs-bus-iio

+62 −28
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ Description: 
		buffered samples and events for device X.



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

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

What:		/sys/bus/iio/devices/iio:deviceX/buffer/sampling_frequency

What:		/sys/bus/iio/devices/triggerX/sampling_frequency

KernelVersion:	2.6.35
@@ -49,12 +50,13 @@ Description: 
		resulting sampling frequency.  In many devices this

		parameter has an effect on input filters etc. rather than

		simply controlling when the input is sampled.  As this

		effects data ready triggers, hardware buffers and the sysfs

		affects data ready triggers, hardware buffers and the sysfs

		direct access interfaces, it may be found in any of the

		relevant directories.  If it effects all of the above

		relevant directories.  If it affects all of the above

		then it is to be found in the base device directory.



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

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

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

What:		/sys/.../iio:deviceX/buffer/sampling_frequency_available

What:		/sys/bus/iio/devices/triggerX/sampling_frequency_available
@@ -374,6 +376,9 @@ 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

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

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

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

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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -401,21 +406,21 @@ Description: 
		Hardware applied calibration offset (assumed to fix production

		inaccuracies).



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

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

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

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

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

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

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

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

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

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

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

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

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

what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale

what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_illuminance_calibscale
@@ -483,7 +488,8 @@ Description: 
		If a discrete set of scale values is available, they

		are listed in this attribute.



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

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

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

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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_intensity_blue_hardwaregain
@@ -494,6 +500,13 @@ Description: 
		Hardware applied gain factor. If shared across all channels,

		<type>_hardwaregain is used.



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

KernelVersion:	5.10

Contact:	linux-iio@vger.kernel.org

Description:

		Lists all available hardware applied gain factors. Shared across all

		channels.



What:		/sys/.../in_accel_filter_low_pass_3db_frequency

What:		/sys/.../in_magn_filter_low_pass_3db_frequency

What:		/sys/.../in_anglvel_filter_low_pass_3db_frequency
@@ -750,9 +763,9 @@ What: /sys/.../events/in_voltageY_raw_thresh_falling_value 
What:		/sys/.../events/in_tempY_raw_thresh_rising_value

What:		/sys/.../events/in_tempY_raw_thresh_falling_value

What:		/sys/.../events/in_illuminance0_thresh_falling_value

what:		/sys/.../events/in_illuminance0_thresh_rising_value

what:		/sys/.../events/in_proximity0_thresh_falling_value

what:		/sys/.../events/in_proximity0_thresh_rising_value

What:		/sys/.../events/in_illuminance0_thresh_rising_value

What:		/sys/.../events/in_proximity0_thresh_falling_value

What:		/sys/.../events/in_proximity0_thresh_rising_value

What:		/sys/.../events/in_illuminance_thresh_rising_value

What:		/sys/.../events/in_illuminance_thresh_falling_value

KernelVersion:	2.6.37
@@ -832,11 +845,11 @@ What: /sys/.../events/in_tempY_thresh_rising_hysteresis 
What:		/sys/.../events/in_tempY_thresh_falling_hysteresis

What:		/sys/.../events/in_tempY_thresh_either_hysteresis

What:		/sys/.../events/in_illuminance0_thresh_falling_hysteresis

what:		/sys/.../events/in_illuminance0_thresh_rising_hysteresis

what:		/sys/.../events/in_illuminance0_thresh_either_hysteresis

what:		/sys/.../events/in_proximity0_thresh_falling_hysteresis

what:		/sys/.../events/in_proximity0_thresh_rising_hysteresis

what:		/sys/.../events/in_proximity0_thresh_either_hysteresis

What:		/sys/.../events/in_illuminance0_thresh_rising_hysteresis

What:		/sys/.../events/in_illuminance0_thresh_either_hysteresis

What:		/sys/.../events/in_proximity0_thresh_falling_hysteresis

What:		/sys/.../events/in_proximity0_thresh_rising_hysteresis

What:		/sys/.../events/in_proximity0_thresh_either_hysteresis

KernelVersion:	3.13

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1013,7 +1026,7 @@ What: /sys/.../events/in_activity_running_thresh_falling_en 
KernelVersion:	3.19

Contact:	linux-iio@vger.kernel.org

Description:

		Enables or disables activitity events. Depending on direction

		Enables or disables activity events. Depending on direction

		an event is generated when sensor ENTERS or LEAVES a given state.



What:		/sys/.../events/in_activity_still_thresh_rising_value
@@ -1333,6 +1346,7 @@ Description: 
		standardised CIE Erythemal Action Spectrum. UV index values range

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



What:		/sys/.../iio:deviceX/in_intensity_integration_time

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

What:		/sys/.../iio:deviceX/in_intensity_green_integration_time

What:		/sys/.../iio:deviceX/in_intensity_blue_integration_time
@@ -1342,7 +1356,8 @@ KernelVersion: 3.12 
Contact:	linux-iio@vger.kernel.org

Description:

		This attribute is used to get/set the integration time in

		seconds.

		seconds. If shared across all channels of a given type,

		<type>_integration_time is used.



What:		/sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_integration_time

KernelVersion:	4.0
@@ -1564,6 +1579,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_concentration_ethanol_raw 
What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_ethanol_raw

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

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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_concentrationX_o2_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
@@ -1740,3 +1757,20 @@ KernelVersion: 5.5 
Contact:	linux-iio@vger.kernel.org

Description:

		One of the following thermocouple types: B, E, J, K, N, R, S, T.



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

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

KernelVersion:	5.10

Contact:	linux-iio@vger.kernel.org

Description:

		Calibrated ambient temperature for object temperature

		calculation in milli degrees Celsius.



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

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

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

KernelVersion:	5.10

Contact:	linux-iio@vger.kernel.org

Description:

		Unscaled light intensity according to CIE 1931/DIN 5033 color space.

		Units after application of scale are nano nanowatts per square meter.

Documentation/ABI/testing/sysfs-bus-iio-accel-adxl372

0 → 100644
+7 −0
Original line number Diff line number Diff line 
What:		/sys/bus/iio/devices/triggerX/name = "adxl372-devX-peak"

KernelVersion:

Contact:	linux-iio@vger.kernel.org

Description:

		The adxl372 accelerometer kernel module provides an additional trigger,

		which sets the device in a mode in which it will record only the peak acceleration

		sensed over the set period of time in the events sysfs.

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

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:	5.3.8

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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE