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

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

Pull staging tree merge from Greg KH:
 "Here's the bit staging tree pull request for 3.12-rc1.

  Lots of staging driver updates, and fixes.  Lustre is finally enabled
  in the build, and lots of cleanup started happening in it.  There's a
  new wireless driver in here, and 2 new TTY drivers, which cause the
  overall lines added/removed to be quite large on the "added" side.

  The IIO driver updates are also coming through here, as they are tied
  to the staging iio drivers"

* tag 'staging-3.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (942 commits)
  staging: dwc2: make dwc2_core_params documentation more complete
  staging: dwc2: validate the value for phy_utmi_width
  staging: dwc2: interpret all hwcfg and related register at init time
  staging: dwc2: properly mask the GRXFSIZ register
  staging: dwc2: remove redundant register reads
  staging: dwc2: re-use hptxfsiz variable
  staging: dwc2: simplify debug output in dwc_hc_init
  staging: dwc2: add missing shift
  staging: dwc2: simplify register shift expressions
  staging: dwc2: only read the snpsid register once
  staging: dwc2: unshift non-bool register value constants
  staging: dwc2: fix off-by-one in check for max_packet_count parameter
  staging: dwc2: remove specific fifo size constants
  Staging:BCM:DDRInit.c:Renaming __FUNCTION__
  staging: bcm: remove Version.h file.
  staging: rtl8188eu: off by one in rtw_set_802_11_add_wep()
  staging: r8188eu: copying one byte too much
  staging: rtl8188eu: || vs && typo
  staging: r8188eu: off by one bugs
  staging: crystalhd: Resolve sparse 'different base types' warnings.
  ...
parents 542a086a 91121c10

Documentation/ABI/testing/sysfs-bus-iio

+19 −0
Original line number Diff line number Diff line
@@ -351,6 +351,7 @@ Description: 
		6kohm_to_gnd: connected to ground via a 6kOhm resistor,

		20kohm_to_gnd: connected to ground via a 20kOhm resistor,

		100kohm_to_gnd: connected to ground via an 100kOhm resistor,

		500kohm_to_gnd: connected to ground via a 500kOhm resistor,

		three_state: left floating.

		For a list of available output power down options read

		outX_powerdown_mode_available. If Y is not present the
@@ -792,3 +793,21 @@ 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/in_accelX_power_mode

KernelVersion:	3.11

Contact:	linux-iio@vger.kernel.org

Description:

		Specifies the chip power mode.

		low_noise: reduce noise level from ADC,

		low_power: enable low current consumption.

		For a list of available output power modes read

		in_accel_power_mode_available.



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

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

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.

Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9523

+0 −8
Original line number Diff line number Diff line
@@ -18,14 +18,6 @@ Description: 
		Reading returns either '1' or '0'. '1' means that the

		pllY is locked.



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

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

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/bus/iio/devices/iio:deviceX/sync_dividers

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Documentation/ABI/testing/sysfs-bus-iio-frequency-adf4350

+1 −1
Original line number Diff line number Diff line
@@ -18,4 +18,4 @@ Description: 
		adjust the reference frequency accordingly.

		The value written has no effect until out_altvoltageY_frequency

		is updated. Consider to use out_altvoltageY_powerdown to power

		down the PLL and it's RFOut buffers during REFin changes.
 
		down the PLL and its RFOut buffers during REFin changes.

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

+2 −5
Original line number Diff line number Diff line 
* AT91's Analog to Digital Converter (ADC)



Required properties:

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

  - compatible: Should be "atmel,<chip>-adc"

    <chip> can be "at91sam9260", "at91sam9g45" or "at91sam9x5"

  - 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

  - atmel,adc-res: List of resolution in bits supported by the ADC. List size

		   must be two at least.

Documentation/devicetree/bindings/iio/accel/bma180.txt

0 → 100644
+24 −0
Original line number Diff line number Diff line 
* Bosch BMA180 triaxial acceleration sensor



http://omapworld.com/BMA180_111_1002839.pdf



Required properties:



  - compatible : should be "bosch,bma180"

  - reg : the I2C address of the sensor



Optional properties:



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



  - interrupts : interrupt mapping for GPIO IRQ, it should by configured with

		flags IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING



Example:



bma180@40 {

	compatible = "bosch,bma180";

	reg = <0x40>;

	interrupt-parent = <&gpio6>;

	interrupts = <18 (IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_EDGE_RISING)>;

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE