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

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

Merge tag 'iio-for-3.12a' of... 

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

Jonathan writes:

First round of new IIO drivers, features and cleanups for the 3.12 cycle.

There has been a lot of good work going into IIO recently, some of which
missed this pull request purely because I haven't caught up with all my
emails.

Core changes

1) Introduction of devm_iio_device_alloc/free and conversions of lots of
   drivers (37 + patches so far mostly from Sachin)
2) A Kconfig option to enabled some debug logging subsystem wide.

New drivers

1) Nuvoton NAU7802 adc driver
2) Avago APDS9300 ambient light sensor driver.

Staging graduations
1) ADIS16260 gyroscope (after a lot fo cleaning up from Lars-Peter)

New driver features

1) ST-sensors gain control of which pin is used for dataready.
2) mcp4725 gains eeprom saving (a later fix deals with a wrong return type
   bug in that patch)
3) A number of drivers have gained module alias' to aid autoloading.

Cleanups and minor bug fixes.

1) A number of typos in Kconfig comments
2) Drop remaining mentions of ring buffers (now just buffers)
3) Overrestrictive i2c function checking in the invensense mpu6050 driver
4) Some help text clarifications.
5) store_eeprom is now used in several drivers so move to generic abi docs.
6) Update dac power down options.
7) Add some error handlign to mxs-lradc on stmp_reset_block call.
8) Lars fixed the alphabetical order in various files and added comments
   to try and prevent them getting messed up again.
9) Dropped some remaining 'reset' attributes for drivers.  We have never
   seen a reason why these should be available.  Finally the macro
   used to define many of these has gone.
10) lps331ap gets an easier to check temperature scale implementation.
11) Various cleanups for the hmc5843 from Peter with a view to getting
    it ready for a staging graduation.

Quite a few other little typo fixes etc.
parents b59fe845 cd6fe065

Documentation/ABI/testing/sysfs-bus-iio

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

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

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

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

		100kohm_to_gnd: connected to ground via an 100kOhm 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.

		three_state: left floating.

		For a list of available output power down options read

		For a list of available output power down options read

		outX_powerdown_mode_available. If Y is not present the

		outX_powerdown_mode_available. If Y is not present the
@@ -792,3 +793,11 @@ Contact: linux-iio@vger.kernel.org 
Description:

Description:

		This attribute is used to read the amount of quadrature error

		This attribute is used to read the amount of quadrature error

		present in the device at a given time.

		present in the device at a given time.



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 Original line Diff line number Diff line
@@ -18,14 +18,6 @@ Description: 
		Reading returns either '1' or '0'. '1' means that the

		Reading returns either '1' or '0'. '1' means that the

		pllY is locked.

		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

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

KernelVersion:	3.4.0

KernelVersion:	3.4.0

Contact:	linux-iio@vger.kernel.org

Contact:	linux-iio@vger.kernel.org

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

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

		adjust the reference frequency accordingly.

		The value written has no effect until out_altvoltageY_frequency

		The value written has no effect until out_altvoltageY_frequency

		is updated. Consider to use out_altvoltageY_powerdown to power

		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/iio/adc/nuvoton-nau7802.txt

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
* Nuvoton NAU7802 Analog to Digital Converter (ADC)



Required properties:

  - compatible: Should be "nuvoton,nau7802"

  - reg: Should contain the ADC I2C address



Optional properties:

  - nuvoton,vldo: Internal reference voltage in millivolts to be

    configured valid values are between 2400 mV and 4500 mV.

  - interrupts: IRQ line for the ADC. If not used the driver will use

    polling.



Example:

adc2: nau7802@2a {

	compatible = "nuvoton,nau7802";

	reg = <0x2a>;

	nuvoton,vldo = <3000>;

};

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

0 → 100644
+22 −0
Original line number Original line Diff line number Diff line 
* Avago APDS9300 ambient light sensor



http://www.avagotech.com/docs/AV02-1077EN



Required properties:



  - compatible : should be "avago,apds9300"

  - 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



Example:



apds9300@39 {

	compatible = "avago,apds9300";

	reg = <0x39>;

	interrupt-parent = <&gpio2>;

	interrupts = <29 8>;

};