Commit 23908db4 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here's the big, really big, staging tree patches for 4.2-rc1.

  Loads of stuff in here, almost all just coding style fixes / churn,
  and a few new drivers as well, one of which I just disabled from the
  build a few minutes ago due to way too many build warnings.

  Other than the one "disable this driver" patch, all of these have been
  in linux-next for quite a while with no reported issues"

* tag 'staging-4.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1163 commits)
  staging: wilc1000: disable driver due to build warnings
  Staging: rts5208: fix CHANGE_LINK_STATE value
  Staging: sm750fb: ddk750_swi2c.c: Insert spaces before parenthesis
  Staging: sm750fb: ddk750_swi2c.c: Place braces on correct lines
  Staging: sm750fb: ddk750_swi2c.c: Insert spaces around operators
  Staging: sm750fb: ddk750_swi2c.c: Replace spaces with tabs
  Staging: sm750fb: ddk750_swi2c.h: Shorten lines to under 80 characters
  Staging: sm750fb: ddk750_swi2c.h: Replace spaces with tabs
  Staging: sm750fb: modedb.h: Shorten lines to under 80 characters
  Staging: sm750fb: modedb.h: Replace spaces with tabs
  staging: comedi: addi_apci_3120: rename 'this_board' variables
  staging: comedi: addi_apci_1516: rename 'this_board' variables
  staging: comedi: ni_atmio: cleanup ni_getboardtype()
  staging: comedi: vmk80xx: sanity check context used to get the boardinfo
  staging: comedi: vmk80xx: rename 'boardinfo' variables
  staging: comedi: dt3000: rename 'this_board' variables
  staging: comedi: adv_pci_dio: rename 'this_board' variables
  staging: comedi: cb_pcidas64: rename 'thisboard' variables
  staging: comedi: cb_pcidas: rename 'thisboard' variables
  staging: comedi: me4000: rename 'thisboard' variables
  ...
parents 8d7804a2 53a20e9e

Documentation/ABI/testing/sysfs-bus-iio

+99 −0
Original line number Original line Diff line number Diff line
@@ -71,6 +71,8 @@ Description: 




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

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

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

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

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

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

KernelVersion:	2.6.35

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -81,6 +83,11 @@ Description: 
		unique to allow association with event codes. Units after

		unique to allow association with event codes. Units after

		application of scale and offset are millivolts.

		application of scale and offset are millivolts.





		Channels with 'i' and 'q' modifiers always exist in pairs and both

		channels refer to the same signal. The 'i' channel contains the in-phase

		component of the signal while the 'q' channel contains the quadrature

		component.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw

What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw

KernelVersion:	2.6.35

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org
@@ -246,8 +253,16 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_y_offset 
What:		/sys/bus/iio/devices/iio:deviceX/in_accel_z_offset

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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_pressureY_offset
@@ -273,14 +288,22 @@ Description: 
		to the _raw output.

		to the _raw output.





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

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

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

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

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

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

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

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

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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_scale

What:		/sys/bus/iio/devices/iio:deviceX/in_voltage-voltage_scale

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_scale
@@ -328,6 +351,10 @@ Description: 




What		/sys/bus/iio/devices/iio:deviceX/in_voltageY_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_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_voltage_calibscale

What		/sys/bus/iio/devices/iio:deviceX/in_accel_x_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_y_calibscale
@@ -420,6 +447,16 @@ Description: 
		to the underlying data channel, then this parameter

		to the underlying data channel, then this parameter

		gives the 3dB frequency of the filter in Hz.

		gives the 3dB frequency of the filter in Hz.





What:		/sys/.../in_accel_filter_high_pass_3db_frequency

What:		/sys/.../in_anglvel_filter_high_pass_3db_frequency

What:		/sys/.../in_magn_filter_high_pass_3db_frequency

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		If a known or controllable high pass filter is applied

		to the underlying data channel, then this parameter

		gives the 3dB frequency of the filter in Hz.



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

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

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

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

KernelVersion:	2.6.37

KernelVersion:	2.6.37
@@ -880,6 +917,26 @@ Description: 
		met before an event is generated. If direction is not

		met before an event is generated. If direction is not

		specified then this period applies to both directions.

		specified then this period applies to both directions.





What:		/sys/.../events/in_accel_thresh_rising_low_pass_filter_3db

What:		/sys/.../events/in_anglvel_thresh_rising_low_pass_filter_3db

What:		/sys/.../events/in_magn_thresh_rising_low_pass_filter_3db

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		If a low pass filter can be applied to the event generation

		this property gives its 3db frequency in Hz.

		A value of zero disables the filter.



What:		/sys/.../events/in_accel_thresh_rising_high_pass_filter_3db

What:		/sys/.../events/in_anglvel_thresh_rising_high_pass_filter_3db

What:		/sys/.../events/in_magn_thresh_rising_high_pass_filter_3db

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		If a high pass filter can be applied to the event generation

		this property gives its 3db frequency in Hz.

		A value of zero disables the filter.



What:		/sys/.../events/in_activity_still_thresh_rising_en

What:		/sys/.../events/in_activity_still_thresh_rising_en

What:		/sys/.../events/in_activity_still_thresh_falling_en

What:		/sys/.../events/in_activity_still_thresh_falling_en

What:		/sys/.../events/in_activity_walking_thresh_rising_en

What:		/sys/.../events/in_activity_walking_thresh_rising_en
@@ -1016,6 +1073,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_timestamp_en 
What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en

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

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

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

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en

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

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

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

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

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

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

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

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_pressureY_en
@@ -1034,6 +1095,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_type 
What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_type

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

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

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

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

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

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

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

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

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

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

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_pressureY_type

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

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type
@@ -1071,6 +1136,10 @@ Description: 




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

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

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

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

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

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

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

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

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

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

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

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

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

What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_index
@@ -1230,6 +1299,8 @@ Description: 
		or without compensation from tilt sensors.

		or without compensation from tilt sensors.





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

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

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

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

KernelVersion:	3.18

KernelVersion:	3.18

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

Description:

Description:
@@ -1238,6 +1309,11 @@ Description: 
		present, output should be considered as processed with the

		present, output should be considered as processed with the

		unit in milliamps.

		unit in milliamps.





		Channels with 'i' and 'q' modifiers always exist in pairs and both

		channels refer to the same signal. The 'i' channel contains the in-phase

		component of the signal while the 'q' channel contains the quadrature

		component.



What:		/sys/.../iio:deviceX/in_energy_en

What:		/sys/.../iio:deviceX/in_energy_en

What:		/sys/.../iio:deviceX/in_distance_en

What:		/sys/.../iio:deviceX/in_distance_en

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

What:		/sys/.../iio:deviceX/in_velocity_sqrt(x^2+y^2+z^2)_en
@@ -1364,3 +1440,26 @@ Description: 
		hwfifo_watermak_min but not equal to any of the values in this

		hwfifo_watermak_min but not equal to any of the values in this

		list, the driver will chose an appropriate value for the

		list, the driver will chose an appropriate value for the

		hardware fifo watermark level.

		hardware fifo watermark level.



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

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

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

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

KernelVersion:	4.1

Contact:	linux-iio@vger.kernel.org

Description:

		The emissivity ratio of the surface in the field of view of the

		contactless temperature sensor.  Emissivity varies from 0 to 1,

		with 1 being the emissivity of a black body.



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

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

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

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

Description:

		Hardware applied number of measurements for acquiring one

		data point. The HW will do <type>[_name]_oversampling_ratio

		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.

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

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

KernelVersion:	4.2

Contact:	linux-iio@vger.kernel.org

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.

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

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



The Berlin ADC has 8 channels, with one connected to a temperature sensor.

It is part of the system controller register set. The ADC node should be a

sub-node of the system controller node.



Required properties:

- compatible: must be "marvell,berlin2-adc"

- interrupts: the interrupts for the ADC and the temperature sensor

- interrupt-names: should be "adc" and "tsen"



Example:



adc: adc {

	compatible = "marvell,berlin2-adc";

	interrupt-parent = <&sic>;

	interrupts = <12>, <14>;

	interrupt-names = "adc", "tsen";

};

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

+2 −2
Original line number Original line Diff line number Diff line 
* Texas Instruments' ADC128S052 ADC chip

* Texas Instruments' ADC128S052 and ADC122S021 ADC chip





Required properties:

Required properties:

 - compatible: Should be "ti,adc128s052"

 - compatible: Should be "ti,adc128s052" or "ti,adc122s021"

 - reg: spi chip select number for the device

 - reg: spi chip select number for the device

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

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

Documentation/devicetree/bindings/iio/adc/vf610-adc.txt

+9 −0
Original line number Original line Diff line number Diff line
@@ -11,6 +11,13 @@ Required properties: 
- clock-names: Must contain "adc", matching entry in the clocks property.

- clock-names: Must contain "adc", matching entry in the clocks property.

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

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





Recommended properties:

- fsl,adck-max-frequency: Maximum frequencies according to datasheets operating

  requirements. Three values are required, depending on conversion mode:

  - Frequency in normal mode (ADLPC=0, ADHSC=0)

  - Frequency in high-speed mode (ADLPC=0, ADHSC=1)

  - Frequency in low-power mode (ADLPC=1, ADHSC=0)



Example:

Example:

adc0: adc@4003b000 {

adc0: adc@4003b000 {

	compatible = "fsl,vf610-adc";

	compatible = "fsl,vf610-adc";
@@ -18,5 +25,7 @@ adc0: adc@4003b000 { 
	interrupts = <0 53 0x04>;

	interrupts = <0 53 0x04>;

	clocks = <&clks VF610_CLK_ADC0>;

	clocks = <&clks VF610_CLK_ADC0>;

	clock-names = "adc";

	clock-names = "adc";

	fsl,adck-max-frequency = <30000000>, <40000000>,

				<20000000>;

	vref-supply = <&reg_vcc_3v3_mcu>;

	vref-supply = <&reg_vcc_3v3_mcu>;

};
 
};

CRA Git | Maintained and supported by SUSTech CRA and CCSE