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

Commit 83eaeec5 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'iio-for-3.9b-v2' of... 

Merge tag 'iio-for-3.9b-v2' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next

Jonathan writes:

	Second set of IIO new drivers, cleanups and fixes for the 3.9 cycle.

	This second version is due to a little fixup for an include
	path being added to the tsl2563 move out of staging after
	a report from Fengguang Wu and the 0-day kernel build testing
	backend.

	Minor bits:
	1) A Kconfig dependency fix for the max1363 driver that
	has been causing some autobuilder fails in Linux Next.
	2) Removal of a stale makefile entry
	3) Fix an incorrect arguement for a sizeof call
	4) Duplicate code removal in tsl2x7x driver
	5) A missing spin lock init in hid-sensor-time

	New features:
	1) mxs adc driver gains support for touchscreen special functions
	2) mxs driver gainst supprot for the MX23 and dt entries added
	3) adis16400 gains adis16448 support and some additional bells and whistles

	Moves out of staging.
	1) adis16400 - a venerable driver gets a make over and moves
	   out of staging.
	2) Kxsd9 moved out fo staging
	3) adis16080 gets cleaned up and moved out of staging
	4) tsl2563 gets a little cleaned up and move out of staging

	Removals
	1) sw_ring is killed off with all remaining drivers converted to kfifo.
	   This has been scheduled for a long time since we switched to kfifo.
	   There is demand for a high performance alternative, but this was
	   never it and I'm glad to see this vestage of IIOs youth gone once
	   and for all!
parents 8f5f90a8 9c2251dd

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 {

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)

drivers/iio/accel/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -14,4 +14,11 @@ config HID_SENSOR_ACCEL_3D 
	  Say yes here to build support for the HID SENSOR

	  accelerometers 3D.



config KXSD9

	tristate "Kionix KXSD9 Accelerometer Driver"

	depends on SPI

	help

	  Say yes here to build support for the Kionix KXSD9 accelerometer.

	  Currently this only supports the device via an SPI interface.



endmenu

drivers/iio/accel/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -3,3 +3,4 @@ 
#



obj-$(CONFIG_HID_SENSOR_ACCEL_3D) += hid-sensor-accel-3d.o

obj-$(CONFIG_KXSD9)	+= kxsd9.o