Commit 53ee9833 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver updates from Greg KH:
 "Here's the big pull request for the staging driver tree for 3.17-rc1.

  Lots of things in here, over 2000 patches, but the best part is this:
   1480 files changed, 39070 insertions(+), 254659 deletions(-)

  Thanks to the great work of Kristina Martšenko, 14 different staging
  drivers have been removed from the tree as they were obsolete and no
  one was willing to work on cleaning them up.  Other than the driver
  removals, loads of cleanups are in here (comedi, lustre, etc.) as well
  as the usual IIO driver updates and additions.

  All of this has been in the linux-next tree for a while"

* tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits)
  staging: comedi: addi_apci_1564: remove diagnostic interrupt support code
  staging: comedi: addi_apci_1564: add subdevice to check diagnostic status
  staging: wlan-ng: coding style problem fix
  staging: wlan-ng: fixing coding style problems
  staging: comedi: ii_pci20kc: request and ioremap memory
  staging: lustre: bitwise vs logical typo
  staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h
  staging: dgnc: rephrase comment
  staging: comedi: ni_tio: remove some dead code
  staging: rtl8723au: Fix static symbol sparse warning
  staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc'
  staging: rtl8723au: Do not duplicate kernel provided USB macros
  staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown
  staging: rtl8723au: Remove two never set variables
  staging: rtl8723au: RSSI_test is never set
  staging:r8190: coding style: Fixed checkpatch reported Error
  staging:r8180: coding style: Fixed too long lines
  staging:r8180: coding style: Fixed commenting style
  staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer
  staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer
  ...
parents 29b88e23 b9aaea39

Documentation/ABI/testing/sysfs-bus-iio

+95 −0
Original line number Diff line number Diff line
@@ -260,6 +260,10 @@ What: /sys/bus/iio/devices/iio:deviceX/in_magn_scale 
What:		/sys/bus/iio/devices/iio:deviceX/in_magn_x_scale

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

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

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

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

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

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

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

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

KernelVersion:	2.6.35
@@ -447,6 +451,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_thresh_rising_en 
What:		/sys/.../iio:deviceX/events/in_magn_y_thresh_falling_en

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

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

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

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

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

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

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

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

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

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

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
@@ -492,6 +504,14 @@ What: /sys/.../iio:deviceX/events/in_magn_y_roc_rising_en 
What:		/sys/.../iio:deviceX/events/in_magn_y_roc_falling_en

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

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

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

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

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

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

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

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

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

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

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

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

What:		/sys/.../iio:deviceX/events/in_voltageY_roc_rising_en
@@ -538,6 +558,14 @@ What: /sys/.../events/in_magn_y_raw_thresh_rising_value 
What:		/sys/.../events/in_magn_y_raw_thresh_falling_value

What:		/sys/.../events/in_magn_z_raw_thresh_rising_value

What:		/sys/.../events/in_magn_z_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_true_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_true_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_thresh_falling_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_rising_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_raw_thresh_rising_value
@@ -588,6 +616,18 @@ What: /sys/.../events/in_magn_y_thresh_either_hysteresis 
What:		/sys/.../events/in_magn_z_thresh_rising_hysteresis

What:		/sys/.../events/in_magn_z_thresh_falling_hysteresis

What:		/sys/.../events/in_magn_z_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_true_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_either_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_hysteresis

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_either_hysteresis

What:		/sys/.../events/in_voltageY_thresh_rising_hysteresis

What:		/sys/.../events/in_voltageY_thresh_falling_hysteresis

What:		/sys/.../events/in_voltageY_thresh_either_hysteresis
@@ -635,6 +675,14 @@ What: /sys/.../events/in_magn_y_raw_roc_rising_value 
What:		/sys/.../events/in_magn_y_raw_roc_falling_value

What:		/sys/.../events/in_magn_z_raw_roc_rising_value

What:		/sys/.../events/in_magn_z_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_true_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_true_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_raw_roc_falling_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_rising_value

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_raw_roc_rising_value
@@ -690,6 +738,22 @@ What: /sys/.../events/in_magn_z_thresh_rising_period 
What:		/sys/.../events/in_magn_z_thresh_falling_period

What:		/sys/.../events/in_magn_z_roc_rising_period

What:		/sys/.../events/in_magn_z_roc_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_roc_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_roc_falling_period

What:		/sys/.../events/in_rot_from_north_true_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_true_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_true_roc_rising_period

What:		/sys/.../events/in_rot_from_north_true_roc_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_rising_period

What:		/sys/.../events/in_rot_from_north_magnetic_tilt_comp_roc_falling_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_rising_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_thresh_falling_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_roc_rising_period

What:		/sys/.../events/in_rot_from_north_true_tilt_comp_roc_falling_period

What:		/sys/.../events/in_voltageY_supply_thresh_rising_period

What:		/sys/.../events/in_voltageY_supply_thresh_falling_period

What:		/sys/.../events/in_voltageY_supply_roc_rising_period
@@ -787,6 +851,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_en 
What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_en

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

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

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

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

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

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

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_en
@@ -853,6 +921,10 @@ What: /sys/.../iio:deviceX/scan_elements/in_anglvel_z_index 
What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_index

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

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

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

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

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

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

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

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

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index
@@ -895,6 +967,19 @@ Description: 
		on-chip EEPROM. After power-up or chip reset the device will

		automatically load the saved configuration.



What:		/sys/.../iio:deviceX/in_proximity_raw

What:		/sys/.../iio:deviceX/in_proximity_input

What:		/sys/.../iio:deviceX/in_proximityY_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Proximity measurement indicating that some

		object is near the sensor, usually be observing

		reflectivity of infrared or ultrasound emitted.

		Often these sensors are unit less and as such conversion

		to SI units is not possible.  Where it is, the units should

		be meters.



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

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

What:		/sys/.../iio:deviceX/in_illuminanceY_mean_raw
@@ -933,3 +1018,13 @@ Description: 
		x y z w. Here x, y, and z component represents the axis about

		which a rotation will occur and w component represents the

		amount of rotation.



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

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

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

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

KernelVersion:	3.15

Contact:	linux-iio@vger.kernel.org

Description:

		Raw value of rotation from true/magnetic north measured with

		or without compensation from tilt sensors.

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+23 −2
Original line number Diff line number Diff line
@@ -14,14 +14,21 @@ Required properties: 
				for exynos4412/5250 controllers.

			Must be "samsung,exynos-adc-v2" for

				future controllers.

			Must be "samsung,exynos3250-adc" for

				controllers compatible with ADC of Exynos3250.

- reg:			Contains ADC register address range (base address and

			length) and the address of the phy enable register.

- interrupts: 		Contains the interrupt information for the timer. The

			format is being dependent on which interrupt controller

			the Samsung device uses.

- #io-channel-cells = <1>; As ADC has multiple outputs

- clocks		From common clock binding: handle to adc clock.

- clock-names		From common clock binding: Shall be "adc".

- clocks		From common clock bindings: handles to clocks specified

			in "clock-names" property, in the same order.

- clock-names		From common clock bindings: list of clock input names

			used by ADC block:

			- "adc" : ADC bus clock

			- "sclk" : ADC special clock (only for Exynos3250 and

				   compatible ADC block)

- vdd-supply		VDD input supply.



Note: child nodes can be added for auto probing from device tree.
@@ -41,6 +48,20 @@ adc: adc@12D10000 { 
	vdd-supply = <&buck5_reg>;

};



Example: adding device info in dtsi file for Exynos3250 with additional sclk



adc: adc@126C0000 {

	compatible = "samsung,exynos3250-adc", "samsung,exynos-adc-v2;

	reg = <0x126C0000 0x100>, <0x10020718 0x4>;

	interrupts = <0 137 0>;

	#io-channel-cells = <1>;

	io-channel-ranges;



	clocks = <&cmu CLK_TSADC>, <&cmu CLK_SCLK_TSADC>;

	clock-names = "adc", "sclk";



	vdd-supply = <&buck5_reg>;

};



Example: Adding child nodes in dts file

Documentation/devicetree/bindings/i2c/trivial-devices.txt

+1 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ epson,rx8581 I2C-BUS INTERFACE REAL TIME CLOCK MODULE 
fsl,mag3110		MAG3110: Xtrinsic High Accuracy, 3D Magnetometer

fsl,mc13892		MC13892: Power Management Integrated Circuit (PMIC) for i.MX35/51

fsl,mma8450		MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer

fsl,mma8452		MMA8452Q: 3-axis 12-bit / 8-bit Digital Accelerometer

fsl,mpr121		MPR121: Proximity Capacitive Touch Sensor Controller

fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec

gmt,g751		G751: Digital Temperature Sensor and Thermal Watchdog with Two-Wire Interface

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

0 → 100644
+22 −0
Original line number Diff line number Diff line 
* Maxim 1027/1029/1031 Analog to Digital Converter (ADC)



Required properties:

  - compatible: Should be "maxim,max1027" or "maxim,max1029" or "maxim,max1031"

  - reg: SPI chip select number for the device

  - interrupt-parent: phandle to the parent interrupt controller

  see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

  - interrupts: IRQ line for the ADC

  see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt



Recommended properties:

- spi-max-frequency: Definition as per

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



Example:

adc@0 {

	compatible = "maxim,max1027";

	reg = <0>;

	interrupt-parent = <&gpio5>;

	interrupts = <15 IRQ_TYPE_EDGE_RISING>;

	spi-max-frequency = <1000000>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE