Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Pull staging tree update from Greg Kroah-Hartman:
 "Here's the big staging tree merge for 3.9-rc1

  Lots of cleanups and updates for drivers all through the staging tree.
  We are pretty much "code neutral" here, adding just about as many
  lines as we removed.

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

* tag 'staging-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (804 commits)
  staging: comedi: vmk80xx: wait for URBs to complete
  staging: comedi: drivers: addi-data: hwdrv_apci3200.c: Add a missing semicolon
  staging: et131x: Update TODO list
  staging: et131x: Remove assignment of skb->dev
  staging: wlan-ng: hfa384x.h: fix for error reported by smatch
  staging/zache checkpatch ERROR: spaces prohibited around that
  staging/ozwpan: Mark read only parameters and structs as const
  staging/ozwpan: Remove empty and unused function oz_cdev_heartbeat
  staging/ozwpan: Mark local functions as static (fix sparse warnings)
  staging/ozwpan: Add missing header includes
  staging/usbip: Mark local functions as static (fix sparse warnings)
  staging/xgifb: Remove duplicated code in loops.
  staging/xgifb: Consolidate return paths
  staging/xgifb: Remove code without effect
  staging/xgifb: Remove unnecessary casts
  staging/xgifb: Consolidate if/else if with identical code branches
  staging: vt6656: replaced custom TRUE definition with true
  staging: vt6656: replaced custom FALSE definition with false
  staging: vt6656: replace custom BOOL definition with bool
  staging/rtl8187se: Mark functions as static to silence sparse
  ...
parents 06991c28 951348b3

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

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

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

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

KernelVersion:  3.4.0

Contact:        linux-iio@vger.kernel.org

Description:

		This is mounting matrix for motion sensors. Mounting matrix

		is a 3x3 unitary matrix. A typical mounting matrix would look like

		[0, 1, 0; 1, 0, 0; 0, 0, -1]. Using this information, it would be

		easy to tell the relative positions among sensors as well as their

		positions relative to the board that holds these sensors. Identity matrix

		[1, 0, 0; 0, 1, 0; 0, 0, 1] means sensor chip and device are perfectly

		aligned with each other. All axes are exactly the same.

Documentation/devicetree/bindings/staging/iio/adc/mxs-lradc.txt

+6 −0
Original line number Diff line number Diff line
@@ -5,6 +5,12 @@ Required properties: 
- reg: Address and length of the register set for the device

- interrupts: Should contain the LRADC interrupts



Optional properties:

- fsl,lradc-touchscreen-wires: Number of wires used to connect the touchscreen

                               to LRADC. Valid value is either 4 or 5. If this

                               property is not present, then the touchscreen is

                               disabled.



Examples:



	lradc@80050000 {

MAINTAINERS

+1 −2
Original line number Diff line number Diff line
@@ -7299,8 +7299,7 @@ S: Odd Fixes 
F:	drivers/staging/olpc_dcon/



STAGING - OZMO DEVICES USB OVER WIFI DRIVER

M:	Rupesh Gujare <rgujare@ozmodevices.com>

M:	Chris Kelly <ckelly@ozmodevices.com>

M:	Rupesh Gujare <rupesh.gujare@atmel.com>

S:	Maintained

F:	drivers/staging/ozwpan/

arch/arm/boot/dts/imx23.dtsi

+2 −0
Original line number Diff line number Diff line
@@ -391,7 +391,9 @@ 
			};



			lradc@80050000 {

				compatible = "fsl,imx23-lradc";

				reg = <0x80050000 0x2000>;

				interrupts = <36 37 38 39 40 41 42 43 44>;

				status = "disabled";

			};

arch/arm/mach-omap2/board-rx51-peripherals.c

+1 −1
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ 
#include <media/si4713.h>

#include <linux/leds-lp5523.h>



#include <../drivers/staging/iio/light/tsl2563.h>

#include <linux/platform_data/tsl2563.h>

#include <linux/lis3lv02d.h>



#if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)