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

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

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



Pull staging tree changes from Greg Kroah-Hartman:
 "Here is the big staging tree pull request for the 3.5-rc1 merge
  window.

  Loads of changes here, and we just narrowly added more lines than we
  added:
   622 files changed, 28356 insertions(+), 26059 deletions(-)

  But, good news is that there is a number of subsystems that moved out
  of the staging tree, to their respective "real" portions of the
  kernel.

  Code that moved out was:
	- iio core code
	- mei driver
	- vme core and bridge drivers

  There was one broken network driver that moved into staging as a step
  before it is removed from the tree (pc300), and there was a few new
  drivers added to the tree:
	- new iio drivers
	- gdm72xx wimax USB driver
	- ipack subsystem and 2 drivers

  All of the movements around have acks from the various subsystem
  maintainers, and all of this has been in the linux-next tree for a
  while.

  Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org&gt;">

Fixed up various trivial conflicts, along with a non-trivial one found
in -next and pointed out by Olof Johanssen: a clean - but incorrect -
merge of the arch/arm/boot/dts/at91sam9g20.dtsi file.  Fix up manually
as per Stephen Rothwell.

* tag 'staging-3.5-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (536 commits)
  Staging: bcm: Remove two unused variables from Adapter.h
  Staging: bcm: Removes the volatile type definition from Adapter.h
  Staging: bcm: Rename all "INT" to "int" in Adapter.h
  Staging: bcm: Fix warning: __packed vs. __attribute__((packed)) in Adapter.h
  Staging: bcm: Correctly format all comments in Adapter.h
  Staging: bcm: Fix all whitespace issues in Adapter.h
  Staging: bcm: Properly format braces in Adapter.h
  Staging: ipack/bridges/tpci200: remove unneeded casts
  Staging: ipack/bridges/tpci200: remove TPCI200_SHORTNAME constant
  Staging: ipack: remove board_name and bus_name fields from struct ipack_device
  Staging: ipack: improve the register of a bus and a device in the bus.
  staging: comedi: cleanup all the comedi_driver 'detach' functions
  staging: comedi: remove all 'default N' in Kconfig
  staging: line6/config.h: Delete unused header
  staging: gdm72xx depends on NET
  staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices
  staging: drm/omap: initial dmabuf/prime import support
  staging: drm/omap: dmabuf/prime mmap support
  pstore/ram: Add ECC support
  pstore/ram: Switch to persistent_ram routines
  ...
parents 94b5aff4 c3c6cc91

drivers/staging/iio/Documentation/sysfs-bus-iio→Documentation/ABI/testing/sysfs-bus-iio

+24 −28
Original line number Diff line number Diff line
@@ -108,7 +108,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 nanofarads..

		of scale and offset are nanofarads.



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

What:		/sys/bus/iio/devices/iio:deviceX/in_tempX_raw
@@ -119,7 +119,7 @@ KernelVersion: 2.6.35 
Contact:	linux-iio@vger.kernel.org

Description:

		Raw (unscaled no bias removal etc) temperature measurement.

		It an axis is specified it generally means that the temperature

		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

		are milli degrees Celsuis.
@@ -232,7 +232,7 @@ Description: 
		If known for a device, scale to be applied to <type>Y[_name]_raw

		post addition of <type>[Y][_name]_offset in order to obtain the

		measured value in <type> units as specified in

		<type>[Y][_name]_raw documentation..  If shared across all in

		<type>[Y][_name]_raw documentation.  If shared across all in

		channels then Y and <x|y|z> are not present and the value is

		called <type>[Y][_name]_scale. The peak modifier means this

		value is applied to <type>Y[_name]_peak_raw values.
@@ -243,6 +243,8 @@ What: /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibbias 
What:		/sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibbias

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

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

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

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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -258,6 +260,8 @@ What /sys/bus/iio/devices/iio:deviceX/in_accel_z_calibscale 
What		/sys/bus/iio/devices/iio:deviceX/in_anglvel_x_calibscale

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

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

what		/sys/bus/iio/devices/iio:deviceX/in_illuminance0_calibscale

what		/sys/bus/iio/devices/iio:deviceX/in_proximity0_calibscale

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:
@@ -276,6 +280,13 @@ Description: 
		If a discrete set of scale values are available, they

		are listed in this attribute.



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

KernelVersion:	2.6.35

Contact:	linux-iio@vger.kernel.org

Description:

		Hardware applied gain factor. If shared across all channels,

		<type>_hardwaregain is used.



What:		/sys/.../in_accel_filter_low_pass_3db_frequency

What:		/sys/.../in_magn_filter_low_pass_3db_frequency

What:		/sys/.../in_anglvel_filter_low_pass_3db_frequency
@@ -453,10 +464,14 @@ What: /sys/.../events/in_magn_z_raw_thresh_rising_value 
What:		/sys/.../events/in_magn_z_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_raw_thresh_rising_value

What:		/sys/.../events/in_voltageY_raw_thresh_falling_value

What:		/sys/.../events/in_voltageY_raw_thresh_falling_value

What:		/sys/.../events/in_tempY_raw_thresh_falling_value

What:		/sys/.../events/in_tempY_raw_thresh_rising_value

What:		/sys/.../events/in_tempY_raw_thresh_falling_value

What:		/sys/.../events/in_illuminance0_thresh_falling_value

what:		/sys/.../events/in_illuminance0_thresh_rising_value

what:		/sys/.../events/in_proximity0_thresh_falling_value

what:		/sys/.../events/in_proximity0_thresh_rising_value

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -490,9 +505,9 @@ What: /sys/.../events/in_magn_z_raw_roc_rising_value 
What:		/sys/.../events/in_magn_z_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_rising_value

What:		/sys/.../events/in_voltageY_supply_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_raw_roc_rising_value

What:		/sys/.../events/in_voltageY_raw_roc_falling_value

What:		/sys/.../events/in_voltageY_raw_roc_falling_value

What:		/sys/.../events/in_tempY_raw_roc_falling_value

What:		/sys/.../events/in_tempY_raw_roc_rising_value

What:		/sys/.../events/in_tempY_raw_roc_falling_value

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org
@@ -556,6 +571,8 @@ What: /sys/.../events/in_tempY_thresh_falling_period 
What:		/sys/.../events/in_tempY_roc_rising_period

What:		/sys/.../events/in_tempY_roc_falling_period

What:		/sys/.../events/in_accel_x&y&z_mag_falling_period

What:		/sys/.../events/in_intensity0_thresh_period

What:		/sys/.../events/in_proximity0_thresh_period

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -718,24 +735,3 @@ Contact: linux-iio@vger.kernel.org 
Description:

		This attribute is used to read the amount of quadrature error

		present in the device at a given time.
 


What:		/sys/.../iio:deviceX/ac_excitation_en

KernelVersion:	3.1.0

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute, if available, is used to enable the AC

		excitation mode found on some converters. In ac excitation mode,

		the polarity of the excitation voltage is reversed on

		alternate cycles, to eliminate DC errors.



What:		/sys/.../iio:deviceX/bridge_switch_en

KernelVersion:	3.1.0

Contact:	linux-iio@vger.kernel.org

Description:

		This attribute, if available, is used to close or open the

		bridge power down switch found on some converters.

		In bridge applications, such as strain gauges and load cells,

		the bridge itself consumes the majority of the current in the

		system. To minimize the current consumption of the system,

		the bridge can be disconnected (when it is not being used

		using the bridge_switch_en attribute.

Documentation/Makefile

+1 −1
Original line number Diff line number Diff line 
obj-m := DocBook/ accounting/ auxdisplay/ connector/ \

	filesystems/ filesystems/configfs/ ia64/ laptops/ networking/ \

	pcmcia/ spi/ timers/ watchdog/src/
 
	pcmcia/ spi/ timers/ watchdog/src/ misc-devices/mei/

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

0 → 100644
+65 −0
Original line number Diff line number Diff line 
* AT91's Analog to Digital Converter (ADC)



Required properties:

  - compatible: Should be "atmel,at91sam9260-adc"

  - reg: Should contain ADC registers location and length

  - interrupts: Should contain the IRQ line for the ADC

  - atmel,adc-channel-base: Offset of the first channel data register

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

    device

  - atmel,adc-drdy-mask: Mask of the DRDY interruption in the ADC

  - 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-status-register: Offset of the Interrupt Status Register

  - atmel,adc-trigger-register: Offset of the Trigger Register

  - atmel,adc-vref: Reference voltage in millivolts for the conversions



Optional properties:

  - atmel,adc-use-external: Boolean to enable of external triggers

 

Optional trigger Nodes:

  - Required properties:

    * trigger-name: Name of the trigger exposed to the user

    * trigger-value: Value to put in the Trigger register

      to activate this trigger

  - Optional properties:

    * trigger-external: Is the trigger an external trigger?



Examples:

adc0: adc@fffb0000 {

	compatible = "atmel,at91sam9260-adc";

	reg = <0xfffb0000 0x100>;

	interrupts = <20 4>;

	atmel,adc-channel-base = <0x30>;

	atmel,adc-channels-used = <0xff>;

	atmel,adc-drdy-mask = <0x10000>;

	atmel,adc-num-channels = <8>;

	atmel,adc-startup-time = <40>;

	atmel,adc-status-register = <0x1c>;

	atmel,adc-trigger-register = <0x08>;

	atmel,adc-use-external;

	atmel,adc-vref = <3300>;



	trigger@0 {

		trigger-name = "external-rising";

		trigger-value = <0x1>;

		trigger-external;

	};

	trigger@1 {

		trigger-name = "external-falling";

		trigger-value = <0x2>;

		trigger-external;

	};



	trigger@2 {

		trigger-name = "external-any";

		trigger-value = <0x3>;

		trigger-external;

	};



	trigger@3 {

		trigger-name = "continuous";

		trigger-value = <0x6>;

	};

};

Documentation/devicetree/bindings/staging/iio/adc/lpc32xx-adc.txt

0 → 100644
+16 −0
Original line number Diff line number Diff line 
* NXP LPC32xx SoC ADC controller



Required properties:

- compatible: must be "nxp,lpc3220-adc"

- reg: physical base address of the controller and length of memory mapped

  region.

- interrupts: The ADC interrupt



Example:



	adc@40048000 {

		compatible = "nxp,lpc3220-adc";

		reg = <0x40048000 0x1000>;

		interrupt-parent = <&mic>;

		interrupts = <39 0>;

	};

Documentation/devicetree/bindings/staging/iio/adc/spear-adc.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
* ST SPEAr ADC device driver



Required properties:

- compatible: Should be "st,spear600-adc"

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

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

  that services interrupts for this device

- interrupts: Should contain the ADC interrupt

- sampling-frequency: Default sampling frequency



Optional properties:

- vref-external: External voltage reference in milli-volts. If omitted

  the internal voltage reference will be used.

- average-samples: Number of samples to generate an average value. If

  omitted, single data conversion will be used.



Examples:



	adc: adc@d8200000 {

		compatible = "st,spear600-adc";

		reg = <0xd8200000 0x1000>;

		interrupt-parent = <&vic1>;

		interrupts = <6>;

		sampling-frequency = <5000000>;

		vref-external = <2500>;	/* 2.5V VRef */

	};