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

Merge tag 'iio-for-3.11c' of... 

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

Jonathan writes:

Third round of IIO new stuff, cleanups and staging graduations for the 3.11
cycle.

1) Add clock consumer support and device tree bindings to adf4350.
   The clock consumer part depends on a not so optional 'optional'
   implementation of clock_round_rate which is not present for pxa27x.
   It will be shortly and as no one actually uses this chip with that
   sub arch as far as we know, no need to delay the inclusion in the
   meantime. See
   http://lkml.indiana.edu/hypermail/linux/kernel/1306.1/00023.html
   for the brief discussion.  This may be the first non soc specific driver
   that makes use of that function.

2) AD7303 DAC new driver.

3) ADIS16130 minor fixes and improvements plus move out of staging.

4) AD7291 improvements to bring it inline with more recent drivers.

5) Update to the sysfs ABI doc to fix some out of date paths.
parents 4a8d1135 1df9d1d4

Documentation/ABI/testing/sysfs-bus-iio

+45 −45
Original line number Diff line number Diff line
@@ -690,45 +690,45 @@ Description: 
		Actually start the buffer capture up.  Will start trigger

		if first device and appropriate.



What:		/sys/bus/iio/devices/iio:deviceX/buffer/scan_elements

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

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Directory containing interfaces for elements that will be

		captured for a single triggered sample set in the buffer.



What:		/sys/.../buffer/scan_elements/in_accel_x_en

What:		/sys/.../buffer/scan_elements/in_accel_y_en

What:		/sys/.../buffer/scan_elements/in_accel_z_en

What:		/sys/.../buffer/scan_elements/in_anglvel_x_en

What:		/sys/.../buffer/scan_elements/in_anglvel_y_en

What:		/sys/.../buffer/scan_elements/in_anglvel_z_en

What:		/sys/.../buffer/scan_elements/in_magn_x_en

What:		/sys/.../buffer/scan_elements/in_magn_y_en

What:		/sys/.../buffer/scan_elements/in_magn_z_en

What:		/sys/.../buffer/scan_elements/in_timestamp_en

What:		/sys/.../buffer/scan_elements/in_voltageY_supply_en

What:		/sys/.../buffer/scan_elements/in_voltageY_en

What:		/sys/.../buffer/scan_elements/in_voltageY-voltageZ_en

What:		/sys/.../buffer/scan_elements/in_incli_x_en

What:		/sys/.../buffer/scan_elements/in_incli_y_en

What:		/sys/.../buffer/scan_elements/in_pressureY_en

What:		/sys/.../buffer/scan_elements/in_pressure_en

What:		/sys/.../iio:deviceX/scan_elements/in_accel_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_accel_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_en

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_en

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY-voltageZ_en

What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_en

What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_en

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_en

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		Scan element control for triggered data capture.



What:		/sys/.../buffer/scan_elements/in_accel_type

What:		/sys/.../buffer/scan_elements/in_anglvel_type

What:		/sys/.../buffer/scan_elements/in_magn_type

What:		/sys/.../buffer/scan_elements/in_incli_type

What:		/sys/.../buffer/scan_elements/in_voltageY_type

What:		/sys/.../buffer/scan_elements/in_voltage_type

What:		/sys/.../buffer/scan_elements/in_voltageY_supply_type

What:		/sys/.../buffer/scan_elements/in_timestamp_type

What:		/sys/.../buffer/scan_elements/in_pressureY_type

What:		/sys/.../buffer/scan_elements/in_pressure_type

What:		/sys/.../iio:deviceX/scan_elements/in_accel_type

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_type

What:		/sys/.../iio:deviceX/scan_elements/in_magn_type

What:		/sys/.../iio:deviceX/scan_elements/in_incli_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltage_type

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_type

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_type

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_type

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:
@@ -752,29 +752,29 @@ Description: 
		For other storage combinations this attribute will be extended

		appropriately.



What:		/sys/.../buffer/scan_elements/in_accel_type_available

What:		/sys/.../iio:deviceX/scan_elements/in_accel_type_available

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

		If the type parameter can take one of a small set of values,

		this attribute lists them.



What:		/sys/.../buffer/scan_elements/in_voltageY_index

What:		/sys/.../buffer/scan_elements/in_voltageY_supply_index

What:		/sys/.../buffer/scan_elements/in_accel_x_index

What:		/sys/.../buffer/scan_elements/in_accel_y_index

What:		/sys/.../buffer/scan_elements/in_accel_z_index

What:		/sys/.../buffer/scan_elements/in_anglvel_x_index

What:		/sys/.../buffer/scan_elements/in_anglvel_y_index

What:		/sys/.../buffer/scan_elements/in_anglvel_z_index

What:		/sys/.../buffer/scan_elements/in_magn_x_index

What:		/sys/.../buffer/scan_elements/in_magn_y_index

What:		/sys/.../buffer/scan_elements/in_magn_z_index

What:		/sys/.../buffer/scan_elements/in_incli_x_index

What:		/sys/.../buffer/scan_elements/in_incli_y_index

What:		/sys/.../buffer/scan_elements/in_timestamp_index

What:		/sys/.../buffer/scan_elements/in_pressureY_index

What:		/sys/.../buffer/scan_elements/in_pressure_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_index

What:		/sys/.../iio:deviceX/scan_elements/in_voltageY_supply_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_accel_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_anglvel_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_magn_z_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_x_index

What:		/sys/.../iio:deviceX/scan_elements/in_incli_y_index

What:		/sys/.../iio:deviceX/scan_elements/in_timestamp_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressureY_index

What:		/sys/.../iio:deviceX/scan_elements/in_pressure_index

KernelVersion:	2.6.37

Contact:	linux-iio@vger.kernel.org

Description:

Documentation/devicetree/bindings/iio/dac/ad7303.txt

0 → 100644
+23 −0
Original line number Diff line number Diff line 
Analog Devices AD7303 DAC device driver



Required properties:

	- compatible: Must be "adi,ad7303"

	- reg: SPI chip select number for the device

	- spi-max-frequency: Max SPI frequency to use (< 30000000)

	- Vdd-supply: Phandle to the Vdd power supply



Optional properties:

	- REF-supply: Phandle to the external reference voltage supply. This should

	  only be set if there is an external reference voltage connected to the REF

	  pin. If the property is not set Vdd/2 is used as the reference voltage.



Example:



		ad7303@4 {

			compatible = "adi,ad7303";

			reg = <4>;

			spi-max-frequency = <10000000>;

			Vdd-supply = <&vdd_supply>;

			adi,use-external-reference;

			REF-supply = <&vref_supply>;

		};

Documentation/devicetree/bindings/iio/frequency/adf4350.txt

0 → 100644
+86 −0
Original line number Diff line number Diff line 
Analog Devices ADF4350/ADF4351 device driver



Required properties:

	- compatible: Should be one of

		* "adi,adf4350": When using the ADF4350 device

		* "adi,adf4351": When using the ADF4351 device

	- reg: SPI chip select numbert for the device

	- spi-max-frequency: Max SPI frequency to use (< 20000000)

	- clocks: From common clock binding. Clock is phandle to clock for

		ADF435x Reference Clock (CLKIN).



Optional properties:

	- gpios:	 GPIO Lock detect - If set with a valid phandle and GPIO number,

			pll lock state is tested upon read.

	- adi,channel-spacing: Channel spacing in Hz (influences MODULUS).

	- adi,power-up-frequency:	If set in Hz the PLL tunes to

			the desired frequency on probe.

	- adi,reference-div-factor: If set the driver skips dynamic calculation

			and uses this default value instead.

	- adi,reference-doubler-enable: Enables reference doubler.

	- adi,reference-div2-enable: Enables reference divider.

	- adi,phase-detector-polarity-positive-enable: Enables positive phase

			detector polarity. Default = negative.

	- adi,lock-detect-precision-6ns-enable: Enables 6ns lock detect precision.

			Default = 10ns.

	- adi,lock-detect-function-integer-n-enable: Enables lock detect

			for integer-N mode. Default = factional-N mode.

	- adi,charge-pump-current: Charge pump current in mA.

			Default = 2500mA.

	- adi,muxout-select: On chip multiplexer output selection.

			Valid values for the multiplexer output are:

			0: Three-State Output (default)

			1: DVDD

			2: DGND

			3: R-Counter output

			4: N-Divider output

			5: Analog lock detect

			6: Digital lock detect

	- adi,low-spur-mode-enable: Enables low spur mode.

			Default = Low noise mode.

	- adi,cycle-slip-reduction-enable: Enables cycle slip reduction.

	- adi,charge-cancellation-enable: Enabled charge pump

			charge cancellation for integer-N modes.

	- adi,anti-backlash-3ns-enable: Enables 3ns antibacklash pulse width

			 for integer-N modes.

	- adi,band-select-clock-mode-high-enable: Enables faster band

			selection logic.

	- adi,12bit-clk-divider: Clock divider value used when

			adi,12bit-clkdiv-mode != 0

	- adi,clk-divider-mode:

			Valid values for the clkdiv mode are:

			0: Clock divider off (default)

			1: Fast lock enable

			2: Phase resync enable

	- adi,aux-output-enable: Enables auxiliary RF output.

	- adi,aux-output-fundamental-enable: Selects fundamental VCO output on

			the auxiliary RF output. Default = Output of RF dividers.

	- adi,mute-till-lock-enable: Enables Mute-Till-Lock-Detect function.

	- adi,output-power: Output power selection.

			Valid values for the power mode are:

			0: -4dBm (default)

			1: -1dBm

			2: +2dBm

			3: +5dBm

	- adi,aux-output-power: Auxiliary output power selection.

			Valid values for the power mode are:

			0: -4dBm (default)

			1: -1dBm

			2: +2dBm

			3: +5dBm





Example:

		lo_pll0_rx_adf4351: adf4351-rx-lpc@4 {

			compatible = "adi,adf4351";

			reg = <4>;

			spi-max-frequency = <10000000>;

			clocks = <&clk0_ad9523 9>;

			clock-names = "clkin";

			adi,channel-spacing = <10000>;

			adi,power-up-frequency = <2400000000>;

			adi,phase-detector-polarity-positive-enable;

			adi,charge-pump-current = <2500>;

			adi,output-power = <3>;

			adi,mute-till-lock-enable;

		};

drivers/iio/dac/Kconfig

+10 −0
Original line number Diff line number Diff line
@@ -130,6 +130,16 @@ config AD5686 
	  To compile this driver as a module, choose M here: the

	  module will be called ad5686.



config AD7303

	tristate "Analog Devices Analog Devices AD7303 DAC driver"

	depends on SPI

	help

	  Say yes here to build support for Analog Devices AD7303 Digital to Analog

	  Converters (DAC).



	  To compile this driver as module choose M here: the module will be called

	  ad7303.



config MAX517

	tristate "Maxim MAX517/518/519 DAC driver"

	depends on I2C

drivers/iio/dac/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ obj-$(CONFIG_AD5755) += ad5755.o 
obj-$(CONFIG_AD5764) += ad5764.o

obj-$(CONFIG_AD5791) += ad5791.o

obj-$(CONFIG_AD5686) += ad5686.o

obj-$(CONFIG_AD7303) += ad7303.o

obj-$(CONFIG_MAX517) += max517.o

obj-$(CONFIG_MCP4725) += mcp4725.o