Commit 5142c33e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'staging-3.16-rc1' of... 

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

Pull staging driver updates from Greg KH:
 "Here is the big staging driver pull request for 3.16-rc1.

  Lots of stuff here, tons of cleanup patches, a few new drivers, and
  some removed as well, but I think we are still adding a few thousand
  more lines than we remove, due to the new drivers being bigger than
  the ones deleted.

  One notible bit of work did stand out, Jes Sorensen has gone on a
  tear, fixing up a wireless driver to be "more sane" than it originally
  was from the vendor, with over 500 patches merged here.  Good stuff,
  and a number of users laptops are better off for it.

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

* tag 'staging-3.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1703 commits)
  staging: skein: fix sparse warning for static declarations
  staging/mt29f_spinand: coding style fixes
  staging: silicom: fix sparse warning for static variable
  staging: lustre: Fix coding style
  staging: android: binder.c: Use more appropriate functions for euid retrieval
  staging: lustre: fix integer as NULL pointer warnings
  Revert "staging: dgap: remove unneeded kfree() in dgap_tty_register_ports()"
  Staging: rtl8192u: r8192U_wx.c Fixed a misplaced brace
  staging: ion: shrink highmem pages on kswapd
  staging: ion: use compound pages on high order pages for system heap
  staging: ion: remove struct ion_page_pool_item
  staging: ion: simplify ion_page_pool_total()
  staging: ion: tidy up a bit
  staging: rtl8723au: Remove redundant casting in usb_ops_linux.c
  staging: rtl8723au: Remove redundant casting in rtl8723a_hal_init.c
  staging: rtl8723au: Remove redundant casting in rtw_xmit.c
  staging: rtl8723au: Remove redundant casting in rtw_wlan_util.c
  staging: rtl8723au: Remove redundant casting in rtw_sta_mgt.c
  staging: rtl8723au: Remove redundant casting in rtw_recv.c
  staging: rtl8723au: Remove redundant casting in rtw_mlme.c
  ...
parents 5da77761 7eb843aa

Documentation/ABI/testing/sysfs-bus-iio

+44 −2
Original line number Diff line number Diff line
@@ -114,14 +114,17 @@ What: /sys/bus/iio/devices/iio:deviceX/in_temp_raw 
What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_raw

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

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

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

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

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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc.) temperature measurement.

		If an axis is specified it generally means that the temperature

		sensor is associated with one part of a compound device (e.g.

		a gyroscope axis). Units after application of scale and offset

		a gyroscope axis). The ambient and object modifiers distinguish

		between ambient (reference) and distant temperature for contact-

		less measurements. Units after application of scale and offset

		are milli degrees Celsius.



What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_input
@@ -210,6 +213,14 @@ Contact: linux-iio@vger.kernel.org 
Description:

		Scaled humidity measurement in milli percent.



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

KernelVersion:	3.5

Contact:	linux-iio@vger.kernel.org

Description:

		Averaged raw measurement from channel X. The number of values

		used for averaging is device specific. The converting rules for

		normal raw values also applies to the averaged raw values.



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

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

What:		/sys/bus/iio/devices/iio:deviceX/in_accel_y_offset
@@ -784,6 +795,7 @@ 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_pressureY_en

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

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

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -799,6 +811,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_voltageY_supply_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_pressure_type

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

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -845,6 +858,7 @@ What: /sys/.../iio:deviceX/scan_elements/in_incli_y_index 
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

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -881,6 +895,25 @@ Description: 
		on-chip EEPROM. After power-up or chip reset the device will

		automatically load the saved configuration.



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

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

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

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Illuminance measurement, units after application of scale

		and offset are lux.



What:		/sys/.../iio:deviceX/in_intensityY_raw

What:		/sys/.../iio:deviceX/in_intensityY_ir_raw

What:		/sys/.../iio:deviceX/in_intensityY_both_raw

KernelVersion:	3.4

Contact:	linux-iio@vger.kernel.org

Description:

		Unit-less light intensity. Modifiers both and ir indicate

		that measurements contains visible and infrared light

		components or just infrared light, respectively.



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
@@ -891,3 +924,12 @@ Contact: linux-iio@vger.kernel.org 
Description:

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

		seconds.



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

KernelVersion:	3.15

Contact:	linux-iio@vger.kernel.org

Description:

		Raw value of quaternion components using a format

		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.

Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935

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

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Get the current distance in meters of storm (1km steps)

		1000-40000 = distance in meters



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

Date:		March 2014

KernelVersion:	3.15

Contact:	Matt Ranostay <mranostay@gmail.com>

Description:

		Show or set the gain boost of the amp, from 0-31 range.

		18 = indoors (default)

		14 = outdoors

Documentation/devicetree/bindings/iio/proximity/as3935.txt

0 → 100644
+28 −0
Original line number Diff line number Diff line 
Austrian Microsystems AS3935 Franklin lightning sensor device driver



Required properties:

	- compatible: must be "ams,as3935"

	- reg: SPI chip select number for the device

	- spi-cpha: SPI Mode 1. Refer to spi/spi-bus.txt for generic SPI

	slave node bindings.

	- interrupt-parent : should be the phandle for the interrupt controller

	- interrupts : the sole interrupt generated by the device



	Refer to interrupt-controller/interrupts.txt for generic

	interrupt client node bindings.



Optional properties:

	- ams,tuning-capacitor-pf: Calibration tuning capacitor stepping

	  value 0 - 120pF. This will require using the calibration data from

	  the manufacturer.



Example:



as3935@0 {

	compatible = "ams,as3935";

	reg = <0>;

	spi-cpha;

	interrupt-parent = <&gpio1>;

	interrupts = <16 1>;

	ams,tuning-capacitor-pf = <80>;

};

Documentation/devicetree/bindings/staging/imx-drm/fsl-imx-drm.txt

+1 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ Required properties: 
Optional properties:

- interface_pix_fmt: How this display is connected to the

  display interface. Currently supported types: "rgb24", "rgb565", "bgr666"

  and "lvds666".

- edid: verbatim EDID data block describing attached display.

- ddc: phandle describing the i2c bus handling the display data

  channel

Documentation/devicetree/bindings/vendor-prefixes.txt

+1 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ allwinner Allwinner Technology Co., Ltd. 
altr	Altera Corp.

amcc	Applied Micro Circuits Corporation (APM, formally AMCC)

amd	Advanced Micro Devices (AMD), Inc.

ams	AMS AG

amstaos	AMS-Taos Inc.

apm	Applied Micro Circuits Corporation (APM)

arm	ARM Ltd.

CRA Git | Maintained and supported by SUSTech CRA and CCSE