Merge 3.4-rc5 into staging-next (d2102677) · Commits · e / devices / android_kernel_oneplus_sm7250

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

+17 −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:
		@@ -453,10 +457,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 +498,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 +564,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 +728,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/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 */
		};

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -3384,6 +3384,7 @@ IIO SUBSYSTEM AND DRIVERS
		M: Jonathan Cameron <jic23@cam.ac.uk>
		L: linux-iio@vger.kernel.org
		S: Maintained
		F: drivers/iio/
		F: drivers/staging/iio/

		IKANOS/ADI EAGLE ADSL USB DRIVER

drivers/Kconfig

+4 −0

Original line number	Diff line number	Diff line
		@@ -140,4 +140,8 @@ source "drivers/virt/Kconfig"

		source "drivers/devfreq/Kconfig"

		source "drivers/iio/Kconfig"

		source "drivers/vme/Kconfig"

		endmenu