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

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

Pull staging driver tree changes from Greg KH:
 "Here's the big drivers/staging/ update for 3.14-rc1

  Lots and lots of cleanups, IIO driver updates are also mixed in here
  due to the subsystem still crossing staging and drivers/iio/, and the
  dwc2 driver is moved out of staging.  There's a new driver (rts5208),
  which ends up making us adding more lines than removing, but overall
  there was lots of work toward moving code out of here, which was good

  All of this has been in linux-next with no reported issues"

* tag 'staging-3.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1084 commits)
  lustre: delete linux/lustre_debug.h
  staging: lustre: remove some unused debug macros
  usb: dwc2: move device tree bindings doc to correct place
  staging: vt6656: sparse fixes: iwctl_giwgenie use memcpy.
  staging: vt6656: sparse fixes: iwctl_siwgenie use memcpy.
  staging: vt6656: sparse fixes ethtool_ioctl Use struct ifreq *
  staging: vt6656: sparse fixes: dpc.c missing dpc.h
  staging: lustre: libcfs_debug: small whitespace cleanups
  staging: lustre: libcfs_debug.h: remove extra blank lines
  staging: lustre: libcfs_debug.h: Align backslashes in macros
  staging: lustre: libcfs_debug.h: align define values
  staging: tidspbridge: adjust error return code (bugfix)
  Staging: rts5139: rts51x_card: fixed style issues
  staging: wlags49_h2: Fix "do not use C99 //" in wl_cs.h, wl_enc.h wl_main.h and wl_wext.h
  Staging: rtl8188eu: Fixed "foo * bar" related coding style issues
  Staging: rtl8188eu: Fixed required spaces after ',' and around '=' and '=='
  staging: vt6655: Fix memory leak in wpa_ioctl()
  imx-drm: parallel-display: honor 'native-mode' property when selecting video mode from DT
  staging: drm/imx: don't drop crtc offsets when doing pageflip
  staging: drm/imx: handle framebuffer offsets correctly
  ...
parents d3bad75a aa3bee0d

Documentation/ABI/testing/sysfs-bus-iio

+13 −0
Original line number Diff line number Diff line
@@ -197,6 +197,19 @@ Description: 
		Raw pressure measurement from channel Y. Units after

		application of scale and offset are kilopascal.



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

KernelVersion:	3.14

Contact:	linux-iio@vger.kernel.org

Description:

		Raw humidity measurement of air. Units after application of

		scale and offset are milli percent.



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

KernelVersion:	3.14

Contact:	linux-iio@vger.kernel.org

Description:

		Scaled humidity measurement in milli percent.



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

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

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ adt7461 +/-1C TDM Extended Temp Range I.C 
at,24c08		i2c serial eeprom  (24cxx)

atmel,24c02		i2c serial eeprom  (24cxx)

atmel,at97sc3204t	i2c trusted platform module (TPM)

capella,cm32181		CM32181: Ambient Light Sensor

catalyst,24c32		i2c serial eeprom

dallas,ds1307		64 x 8, Serial, I2C Real-Time Clock

dallas,ds1338		I2C RTC with 56-Byte NV RAM

Documentation/devicetree/bindings/iio/humidity/dht11.txt

0 → 100644
+14 −0
Original line number Diff line number Diff line 
* DHT11 humidity/temperature sensor (and compatibles like DHT22)



Required properties:

  - compatible: Should be "dht11"

  - gpios: Should specify the GPIO connected to the sensor's data

    line, see "gpios property" in

    Documentation/devicetree/bindings/gpio/gpio.txt.



Example:



humidity_sensor {

	compatible = "dht11";

	gpios = <&gpio0 6 0>;

}

Documentation/devicetree/bindings/iio/light/tsl2563.txt

0 → 100644
+19 −0
Original line number Diff line number Diff line 
* AMS TAOS TSL2563 ambient light sensor



Required properties:



  - compatible : should be "amstaos,tsl2563"

  - reg : the I2C address of the sensor



Optional properties:



  - amstaos,cover-comp-gain : integer used as multiplier for gain

                              compensation (default = 1)



Example:



tsl2563@29 {

	compatible = "amstaos,tsl2563";

	reg = <0x29>;

	amstaos,cover-comp-gain = <16>;

};

Documentation/devicetree/bindings/iio/magnetometer/hmc5843.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
* Honeywell HMC5843 magnetometer sensor



Required properties:



  - compatible : should be "honeywell,hmc5843"

  - reg : the I2C address of the magnetometer - typically 0x1e



Optional properties:



  - gpios : should be device tree identifier of the magnetometer DRDY pin



Example:



hmc5843@1e {

        compatible = "honeywell,hmc5843"

        reg = <0x1e>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE