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

Merge tag 'staging-4.1-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 patchset for 4.1-rc1.

  There's a lot of patches here, the Outreachy application period
  happened during this development cycle, so that means that there was a
  lot of cleanup patches accepted.  Other than the normal coding style
  and sparse fixes here, there are some driver updates and work toward
  making some of the drivers into "mergable" shape (like the Unisys
  drivers.)

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

* tag 'staging-4.1-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1214 commits)
  staging: lustre: orthography & coding style
  staging: lustre: lnet: lnet: fix error return code
  staging: lustre: fix sparse warning
  Revert "Staging: sm750fb: Fix C99 Comments"
  Staging: rtl8192u: use correct array for debug output
  staging: rtl8192e: Remove dead code
  staging: rtl8192e: Comment cleanup (style/format)
  staging: rtl8192e: Fix indentation in rtllib_rx_auth_resp()
  staging: rtl8192e: Decrease nesting of rtllib_rx_auth_resp()
  staging: rtl8192e: Divide rtllib_rx_auth()
  staging: rtl8192e: Fix PRINTK_WITHOUT_KERN_LEVEL warnings
  staging: rtl8192e: Fix DO_WHILE_MACRO_WITH_TRAILING_SEMICOLON warning
  staging: rtl8192e: Fix BRACES warning
  staging: rtl8192e: Fix LINE_CONTINUATIONS warning
  staging: rtl8192e: Fix UNNECESSARY_PARENTHESES warnings
  staging: rtl8192e: remove unused EXPORT_SYMBOL_RSL macro
  staging: rtl8192e: Fix RETURN_VOID warnings
  staging: rtl8192e: Fix UNNECESSARY_ELSE warning
  staging: rtl8723au: Remove unneeded comments
  staging: rtl8723au: Use __func__ in trace logs
  ...
parents c4be50ee c610f7f7

Documentation/ABI/testing/sysfs-bus-iio

+126 −11
Original line number Diff line number Diff line
@@ -253,6 +253,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_offset 
What:		/sys/bus/iio/devices/iio:deviceX/in_pressureY_offset

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

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

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

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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -296,6 +298,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_pressureY_scale 
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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -336,6 +339,7 @@ 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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -347,7 +351,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_activity_calibgender 
What:		/sys/bus/iio/devices/iio:deviceX/in_energy_calibgender

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

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

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Gender of the user (e.g.: male, female) used by some pedometers
@@ -358,7 +362,7 @@ What: /sys/bus/iio/devices/iio:deviceX/in_activity_calibgender_available 
What:		/sys/bus/iio/devices/iio:deviceX/in_energy_calibgender_available

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

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

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Lists all available gender values (e.g.: male, female).
@@ -375,7 +379,7 @@ Description: 
		type.



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

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Weight of the user (in kg). It is needed by some pedometers
@@ -612,6 +616,8 @@ Description: 
		a given event type is enabled a future point (and not those for

		whatever event was previously enabled).



What:		/sys/.../events/in_accel_thresh_rising_value

What:		/sys/.../events/in_accel_thresh_falling_value

What:		/sys/.../events/in_accel_x_raw_thresh_rising_value

What:		/sys/.../events/in_accel_x_raw_thresh_falling_value

What:		/sys/.../events/in_accel_y_raw_thresh_rising_value
@@ -661,6 +667,24 @@ Description: 
		value is in raw device units or in processed units (as _raw

		and _input do on sysfs direct channel read attributes).



What:		/sys/.../events/in_accel_scale

What:		/sys/.../events/in_accel_peak_scale

What:		/sys/.../events/in_anglvel_scale

What:		/sys/.../events/in_magn_scale

What:		/sys/.../events/in_rot_from_north_magnetic_scale

What:		/sys/.../events/in_rot_from_north_true_scale

What:		/sys/.../events/in_voltage_scale

What:		/sys/.../events/in_voltage_supply_scale

What:		/sys/.../events/in_temp_scale

What:		/sys/.../events/in_illuminance_scale

What:		/sys/.../events/in_proximity_scale

KernelVersion:	3.21

Contact:	linux-iio@vger.kernel.org

Description:

                Specifies the conversion factor from the standard units

                to device specific units used to set the event trigger

                threshold.



What:		/sys/.../events/in_accel_x_thresh_rising_hysteresis

What:		/sys/.../events/in_accel_x_thresh_falling_hysteresis

What:		/sys/.../events/in_accel_x_thresh_either_hysteresis
@@ -776,7 +800,7 @@ Description: 


What:		/sys/.../events/in_accel_x_thresh_rising_period

What:		/sys/.../events/in_accel_x_thresh_falling_period

hat:		/sys/.../events/in_accel_x_roc_rising_period

What:		/sys/.../events/in_accel_x_roc_rising_period

What:		/sys/.../events/in_accel_x_roc_falling_period

What:		/sys/.../events/in_accel_y_thresh_rising_period

What:		/sys/.../events/in_accel_y_thresh_falling_period
@@ -923,7 +947,7 @@ Description: 
		this type.



What:		/sys/.../events/in_steps_change_en

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Event generated when channel passes a threshold on the absolute
@@ -932,7 +956,7 @@ Description: 
		in_steps_change_value.



What:		/sys/.../events/in_steps_change_value

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies the value of change threshold that the
@@ -997,6 +1021,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_y_en 
What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_en

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_en

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_en

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1013,6 +1038,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_timestamp_type 
What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_type

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_type

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1064,6 +1090,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_timestamp_index 
What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_index

What:		/sys/.../iio:deviceX/scan_elements/in_rot_quaternion_index

What:		/sys/.../iio:deviceX/scan_elements/in_proximity_index

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1104,7 +1131,7 @@ Description: 


What:		/sys/.../iio:deviceX/in_energy_input

What:		/sys/.../iio:deviceX/in_energy_raw

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute is used to read the energy value reported by the
@@ -1113,7 +1140,7 @@ Description: 


What:		/sys/.../iio:deviceX/in_distance_input

What:		/sys/.../iio:deviceX/in_distance_raw

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute is used to read the distance covered by the user
@@ -1143,9 +1170,13 @@ Description: 
		values should behave in the same way as a distance, i.e. lower

		values indicate something is closer to the sensor.



What:		/sys/.../iio:deviceX/in_illuminance_input

What:		/sys/.../iio:deviceX/in_illuminance_raw

What:		/sys/.../iio:deviceX/in_illuminanceY_input

What:		/sys/.../iio:deviceX/in_illuminanceY_raw

What:		/sys/.../iio:deviceX/in_illuminanceY_mean_raw

What:		/sys/.../iio:deviceX/in_illuminance_ir_raw

What:		/sys/.../iio:deviceX/in_illuminance_clear_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:
@@ -1174,7 +1205,7 @@ Description: 
		seconds.



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

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Number of seconds in which to compute speed.
@@ -1236,7 +1267,7 @@ Description: 
		Units after application of scale are m/s.



What:		/sys/.../iio:deviceX/in_steps_debounce_count

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies the number of steps that must occur within
@@ -1244,8 +1275,92 @@ Description: 
		consumer is making steps.



What:		/sys/.../iio:deviceX/in_steps_debounce_time

KernelVersion:	3.20

KernelVersion:	4.0

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies number of seconds in which we compute the steps

		that occur in order to decide if the consumer is making steps.



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

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		A single positive integer specifying the maximum number of scan

		elements to wait for.

		Poll will block until the watermark is reached.

		Blocking read will wait until the minimum between the requested

		read amount or the low water mark is available.

		Non-blocking read will retrieve the available samples from the

		buffer even if there are less samples then watermark level. This

		allows the application to block on poll with a timeout and read

		the available samples after the timeout expires and thus have a

		maximum delay guarantee.



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

KernelVersion: 4.2

Contact:	linux-iio@vger.kernel.org

Description:

		A read-only boolean value that indicates if the hardware fifo is

		currently enabled or disabled. If the device does not have a

		hardware fifo this entry is not present.

		The hardware fifo is enabled when the buffer is enabled if the

		current hardware fifo watermark level is set and other current

		device settings allows it (e.g. if a trigger is set that samples

		data differently that the hardware fifo does then hardware fifo

		will not enabled).

		If the hardware fifo is enabled and the level of the hardware

		fifo reaches the hardware fifo watermark level the device will

		flush its hardware fifo to the device buffer. Doing a non

		blocking read on the device when no samples are present in the

		device buffer will also force a flush.

		When the hardware fifo is enabled there is no need to use a

		trigger to use buffer mode since the watermark settings

		guarantees that the hardware fifo is flushed to the device

		buffer.



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

KernelVersion: 4.2

Contact:	linux-iio@vger.kernel.org

Description:

		Read-only entry that contains a single integer specifying the

		current watermark level for the hardware fifo. If the device

		does not have a hardware fifo this entry is not present.

		The watermark level for the hardware fifo is set by the driver

		based on the value set by the user in buffer/watermark but

		taking into account hardware limitations (e.g. most hardware

		buffers are limited to 32-64 samples, some hardware buffers

		watermarks are fixed or have minimum levels).  A value of 0

		means that the hardware watermark is unset.



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

KernelVersion: 4.2

Contact:       linux-iio@vger.kernel.org

Description:

		A single positive integer specifying the minimum watermark level

		for the hardware fifo of this device. If the device does not

		have a hardware fifo this entry is not present.

		If the user sets buffer/watermark to a value less than this one,

		then the hardware watermark will remain unset.



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

KernelVersion: 4.2

Contact:       linux-iio@vger.kernel.org

Description:

		A single positive integer specifying the maximum watermark level

		for the hardware fifo of this device. If the device does not

		have a hardware fifo this entry is not present.

		If the user sets buffer/watermark to a value greater than this

		one, then the hardware watermark will be capped at this value.



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

KernelVersion: 4.2

Contact:       linux-iio@vger.kernel.org

Description:

		A list of positive integers specifying the available watermark

		levels for the hardware fifo. This entry is optional and if it

		is not present it means that all the values between

		hwfifo_watermark_min and hwfifo_watermark_max are supported.

		If the user sets buffer/watermark to a value greater than

		hwfifo_watermak_min but not equal to any of the values in this

		list, the driver will chose an appropriate value for the

		hardware fifo watermark level.

Documentation/devicetree/bindings/iio/adc/mcp320x.txt

0 → 100644
+30 −0
Original line number Diff line number Diff line 
* Microchip Analog to Digital Converter (ADC)



The node for this driver must be a child node of a SPI controller, hence

all mandatory properties described in



        Documentation/devicetree/bindings/spi/spi-bus.txt



must be specified.



Required properties:

	- compatible:  	Must be one of the following, depending on the

			model:

				"mcp3001"

				"mcp3002"

				"mcp3004"

				"mcp3008"

				"mcp3201"

				"mcp3202"

				"mcp3204"

				"mcp3208"





Examples:

spi_controller {

	mcp3x0x@0 {

		compatible = "mcp3002";

		reg = <0>;

		spi-max-frequency = <1000000>;

	};

};

Documentation/devicetree/bindings/iio/adc/mcp3422.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Microchip mcp3422/3/4/6/7/8 chip family (ADC)



Required properties:

 - compatible: Should be

	"microchip,mcp3422" or

	"microchip,mcp3423" or

	"microchip,mcp3424" or

	"microchip,mcp3426" or

	"microchip,mcp3427" or

	"microchip,mcp3428"

 - reg: I2C address for the device



Example:

adc@0 {

	compatible = "microchip,mcp3424";

	reg = <0x68>;

};

Documentation/devicetree/bindings/iio/adc/ti-adc128s052.txt

0 → 100644
+18 −0
Original line number Diff line number Diff line 
* Texas Instruments' ADC128S052 ADC chip



Required properties:

 - compatible: Should be "ti,adc128s052"

 - reg: spi chip select number for the device

 - vref-supply: The regulator supply for ADC reference voltage



Recommended properties:

 - spi-max-frequency: Definition as per

		Documentation/devicetree/bindings/spi/spi-bus.txt



Example:

adc@0 {

	compatible = "ti,adc128s052";

	reg = <0>;

	vref-supply = <&vdd_supply>;

	spi-max-frequency = <1000000>;

};

Documentation/devicetree/bindings/iio/st-sensors.txt

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ standard bindings from pinctrl/pinctrl-bindings.txt. 
Valid compatible strings:



Accelerometers:

- st,lis3lv02dl-accel

- st,lsm303dlh-accel

- st,lsm303dlhc-accel

- st,lis3dh-accel

CRA Git | Maintained and supported by SUSTech CRA and CCSE