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

Commit 0b1e73ed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull staging driver update from Greg KH:
 "Here's the big drivers/staging/ update for 3.13-rc1.

  Nothing major here, just a _ton_ of fixes and cleanups, mostly driven
  by the new round of OPW applicants, but also there are lots of other
  people doing staging tree cleanups these days in order to help get the
  drivers into mergable shape.

  We also merge, and then revert, the ktap code, as Ingo and the other
  perf/ftrace developers feel it should go into the "real" part of the
  kernel with only a bit more work, so no need to put it in staging for
  now.

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

* tag 'staging-3.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1045 commits)
  staging: drm/imx: fix return value check in ipu_add_subdevice_pdata()
  Staging: zram: Fix access of NULL pointer
  Staging: zram: Fix variable dereferenced before check
  Staging: rtl8187se: space prohibited before semicolon in r8185b_init.c
  Staging: rtl8187se: fix space prohibited after that open parenthesis '(' in r8185b_init.c
  Staging: rtl8187se: fix braces {} are not necessary for single statement blocks in r8185b_init.c
  Staging: rtl8187se: fix trailing whitespace in r8185b_init.c
  Staging: rtl8187se: fix please, no space before tabs in r8185b_init.c
  drivers/staging/nvec/Kconfig: remove trailing whitespace
  Staging: dwc2: Fix variable dereferenced before check
  Staging: xgifb: fix braces {} are not necessary for any arm of this statement
  staging: rtl8192e: remove unneeded semicolons
  staging: rtl8192e: use true and false for bool variables
  staging: ft1000: return values corrected in scram_start_dwnld
  staging: ft1000: change values of status return variable in write_dpram32_and_check
  staging: bcm: Remove unnecessary pointer casting
  imx-drm: ipuv3-crtc: Invert IPU DI0 clock polarity
  staging: r8188eu: Fix sparse warnings in rtl_p2p.c
  staging: r8188eu: Fix sparse warnings in rtw_mlme_ext.c
  staging: r8188eu: Fix sparse warnings in rtl8188e.cmd.c
  ...
parents 56edff75 ed5d6ca0

Documentation/ABI/testing/sysfs-bus-iio

+69 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ Description: 
		correspond to externally available input one of the named

		versions may be used. The number must always be specified and

		unique to allow association with event codes. Units after

		application of scale and offset are microvolts.

		application of scale and offset are millivolts.



What:		/sys/bus/iio/devices/iio:deviceX/in_voltageY-voltageZ_raw

KernelVersion:	2.6.35
@@ -90,7 +90,7 @@ Description: 
		physically equivalent inputs when non differential readings are

		separately available. In differential only parts, then all that

		is required is a consistent labeling.  Units after application

		of scale and offset are microvolts.

		of scale and offset are millivolts.



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

KernelVersion:	3.2
@@ -537,6 +537,62 @@ Description: 
		value is in raw device units or in processed units (as _raw

		and _input do on sysfs direct channel read attributes).



What:		/sys/.../events/in_accel_x_thresh_rising_hysteresis

What:		/sys/.../events/in_accel_x_thresh_falling_hysteresis

What:		/sys/.../events/in_accel_x_thresh_either_hysteresis

What:		/sys/.../events/in_accel_y_thresh_rising_hysteresis

What:		/sys/.../events/in_accel_y_thresh_falling_hysteresis

What:		/sys/.../events/in_accel_y_thresh_either_hysteresis

What:		/sys/.../events/in_accel_z_thresh_rising_hysteresis

What:		/sys/.../events/in_accel_z_thresh_falling_hysteresis

What:		/sys/.../events/in_accel_z_thresh_either_hysteresis

What:		/sys/.../events/in_anglvel_x_thresh_rising_hysteresis

What:		/sys/.../events/in_anglvel_x_thresh_falling_hysteresis

What:		/sys/.../events/in_anglvel_x_thresh_either_hysteresis

What:		/sys/.../events/in_anglvel_y_thresh_rising_hysteresis

What:		/sys/.../events/in_anglvel_y_thresh_falling_hysteresis

What:		/sys/.../events/in_anglvel_y_thresh_either_hysteresis

What:		/sys/.../events/in_anglvel_z_thresh_rising_hysteresis

What:		/sys/.../events/in_anglvel_z_thresh_falling_hysteresis

What:		/sys/.../events/in_anglvel_z_thresh_either_hysteresis

What:		/sys/.../events/in_magn_x_thresh_rising_hysteresis

What:		/sys/.../events/in_magn_x_thresh_falling_hysteresis

What:		/sys/.../events/in_magn_x_thresh_either_hysteresis

What:		/sys/.../events/in_magn_y_thresh_rising_hysteresis

What:		/sys/.../events/in_magn_y_thresh_falling_hysteresis

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_voltageY_thresh_rising_hysteresis

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

What:		/sys/.../events/in_voltageY_thresh_either_hysteresis

What:		/sys/.../events/in_tempY_thresh_rising_hysteresis

What:		/sys/.../events/in_tempY_thresh_falling_hysteresis

What:		/sys/.../events/in_tempY_thresh_either_hysteresis

What:		/sys/.../events/in_illuminance0_thresh_falling_hysteresis

what:		/sys/.../events/in_illuminance0_thresh_rising_hysteresis

what:		/sys/.../events/in_illuminance0_thresh_either_hysteresis

what:		/sys/.../events/in_proximity0_thresh_falling_hysteresis

what:		/sys/.../events/in_proximity0_thresh_rising_hysteresis

what:		/sys/.../events/in_proximity0_thresh_either_hysteresis

KernelVersion:	3.13

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies the hysteresis of threshold that the device is comparing

		against for the events enabled by

		<type>Y[_name]_thresh[_(rising|falling)]_hysteresis.

		If separate attributes exist for the two directions, but

		direction is not specified for this attribute, then a single

		hysteresis value applies to both directions.

		For falling events the hysteresis is added to the _value attribute for

		this event to get the upper threshold for when the event goes back to

		normal, for rising events the hysteresis is subtracted from the _value

		attribute. E.g. if in_voltage0_raw_thresh_rising_value is set to 1200

		and in_voltage0_raw_thresh_rising_hysteresis is set to 50. The event

		will get activated once in_voltage0_raw goes above 1200 and will become

		deactived again once the value falls below 1150.



What:		/sys/.../events/in_accel_x_raw_roc_rising_value

What:		/sys/.../events/in_accel_x_raw_roc_falling_value

What:		/sys/.../events/in_accel_y_raw_roc_rising_value
@@ -811,3 +867,14 @@ Description: 
		Writing '1' stores the current device configuration into

		on-chip EEPROM. After power-up or chip reset the device will

		automatically load the saved configuration.



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

What:		/sys/.../iio:deviceX/in_intensity_clear_integration_time

What:		/sys/.../iio:deviceX/in_illuminance_integration_time

KernelVersion:	3.12

Contact:	linux-iio@vger.kernel.org

Description:

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

		seconds.

Documentation/devicetree/bindings/arm/atmel-adc.txt

+7 −1
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ Required properties: 
  - interrupts: Should contain the IRQ line for the ADC

  - atmel,adc-channels-used: Bitmask of the channels muxed and enable for this

    device

  - atmel,adc-num-channels: Number of channels available in the ADC

  - atmel,adc-startup-time: Startup Time of the ADC in microseconds as

    defined in the datasheet

  - atmel,adc-vref: Reference voltage in millivolts for the conversions
@@ -24,6 +23,13 @@ Optional properties: 
		       resolution will be used.

  - atmel,adc-sleep-mode: Boolean to enable sleep mode when no conversion

  - atmel,adc-sample-hold-time: Sample and Hold Time in microseconds

  - atmel,adc-ts-wires: Number of touch screen wires. Should be 4 or 5. If this

                        value is set, then adc driver will enable touch screen

                        support.

    NOTE: when adc touch screen enabled, the adc hardware trigger will be

          disabled. Since touch screen will occupied the trigger register.

  - atmel,adc-ts-pressure-threshold: a pressure threshold for touchscreen. It

                                     make touch detect more precision.

 

Optional trigger Nodes:

  - Required properties:

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

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* Capella CM36651 I2C Proximity and Color Light sensor



Required properties:

- compatible: must be "capella,cm36651"

- reg: the I2C address of the device

- interrupts: interrupt-specifier for the sole interrupt

	      generated by the device

- vled-supply: regulator for the IR LED. IR_LED is a part

	      of the cm36651 for proximity detection.

	      As covered in ../../regulator/regulator.txt



Example:



	i2c_cm36651: i2c-gpio {

		/* ... */



		cm36651@18 {

			compatible = "capella,cm36651";

			reg = <0x18>;

			interrupt-parent = <&gpx0>;

			interrupts = <2 0>;

			vled-supply = <&ps_als_reg>;

		};



		/* ... */

	};

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

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Sharp GP2AP020A00F I2C Proximity/ALS sensor



The proximity detector sensor requires power supply

for its built-in led. It is also defined by this binding.



Required properties:



  - compatible : should be "sharp,gp2ap020a00f"

  - reg : the I2C slave address of the light sensor

  - interrupts : interrupt specifier for the sole interrupt generated

		 by the device

  - vled-supply : VLED power supply, as covered in ../regulator/regulator.txt



Example:



gp2ap020a00f@39 {

	compatible = "sharp,gp2ap020a00f";

	reg = <0x39>;

	interrupts = <2 0>;

	vled-supply = <...>;

};

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

+31 −5
Original line number Diff line number Diff line 
* Freescale i.MX28 LRADC device driver



Required properties:

- compatible: Should be "fsl,imx28-lradc"

- compatible: Should be "fsl,imx23-lradc" for i.MX23 SoC and "fsl,imx28-lradc"

              for i.MX28 SoC

- reg: Address and length of the register set for the device

- interrupts: Should contain the LRADC interrupts
@@ -9,13 +10,38 @@ 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.

                               disabled. 5 wires is valid for i.MX28 SoC only.

- fsl,ave-ctrl: number of samples per direction to calculate an average value.

                Allowed value is 1 ... 31, default is 4

- fsl,ave-delay: delay between consecutive samples. Allowed value is

                 1 ... 2047. It is used if 'fsl,ave-ctrl' > 1, counts at

                 2 kHz and its default is 2 (= 1 ms)

- fsl,settling: delay between plate switch to next sample. Allowed value is

                1 ... 2047. It counts at 2 kHz and its default is

                10 (= 5 ms)



Examples:

Example for i.MX23 SoC:



	lradc@80050000 {

		compatible = "fsl,imx23-lradc";

		reg = <0x80050000 0x2000>;

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

		status = "okay";

		fsl,lradc-touchscreen-wires = <4>;

		fsl,ave-ctrl = <4>;

		fsl,ave-delay = <2>;

		fsl,settling = <10>;

	};



Example for i.MX28 SoC:



	lradc@80050000 {

		compatible = "fsl,imx28-lradc";

		reg = <0x80050000 0x2000>;

		interrupts = <10 14 15 16 17 18 19

				20 21 22 23 24 25>;

		interrupts = <10 14 15 16 17 18 19 20 21 22 23 24 25>;

		status = "okay";

		fsl,lradc-touchscreen-wires = <5>;

		fsl,ave-ctrl = <4>;

		fsl,ave-delay = <2>;

		fsl,settling = <10>;

	};