Merge tag 'iio-for-5.3b' of... (c55cc97a) · Commits · 戴 / test

Documentation/ABI/testing/sysfs-bus-iio

+5 −2

Original line number	Diff line number	Diff line
		@@ -61,8 +61,11 @@ What: /sys/bus/iio/devices/triggerX/sampling_frequency_available
		KernelVersion: 2.6.35
		Contact: linux-iio@vger.kernel.org
		Description:
		When the internal sampling clock can only take a small
		discrete set of values, this file lists those available.
		When the internal sampling clock can only take a specific set of
		frequencies, we can specify the available values with:
		- a small discrete set of values like "0 2 4 6 8"
		- a range with minimum, step and maximum frequencies like
		"[min step max]"

		What: /sys/bus/iio/devices/iio:deviceX/oversampling_ratio
		KernelVersion: 2.6.38

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

0 → 100644

+44 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_frequency
		KernelVersion:
		Contact: linux-iio@vger.kernel.org
		Description:
		Stores the PLL frequency in Hz for channel Y.
		Reading returns the actual frequency in Hz.
		The ADF4371 has an integrated VCO with fundamendal output
		frequency ranging from 4000000000 Hz 8000000000 Hz.

		out_altvoltage0_frequency:
		A divide by 1, 2, 4, 8, 16, 32 or circuit generates
		frequencies from 62500000 Hz to 8000000000 Hz.
		out_altvoltage1_frequency:
		This channel duplicates the channel 0 frequency
		out_altvoltage2_frequency:
		A frequency doubler generates frequencies from
		8000000000 Hz to 16000000000 Hz.
		out_altvoltage3_frequency:
		A frequency quadrupler generates frequencies from
		16000000000 Hz to 32000000000 Hz.

		Note: writes to one of the channels will affect the frequency of
		all the other channels, since it involves changing the VCO
		fundamental output frequency.

		What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_name
		KernelVersion:
		Contact: linux-iio@vger.kernel.org
		Description:
		Reading returns the datasheet name for channel Y:

		out_altvoltage0_name: RF8x
		out_altvoltage1_name: RFAUX8x
		out_altvoltage2_name: RF16x
		out_altvoltage3_name: RF32x

		What: /sys/bus/iio/devices/iio:deviceX/out_altvoltageY_powerdown
		KernelVersion:
		Contact: linux-iio@vger.kernel.org
		Description:
		This attribute allows the user to power down the PLL and it's
		RFOut buffers.
		Writing 1 causes the specified channel to power down.
		Clearing returns to normal operation.

Documentation/devicetree/bindings/iio/accel/adi,adxl372.yaml

0 → 100644

+63 −0

Original line number	Diff line number	Diff line
		# SPDX-License-Identifier: GPL-2.0
		%YAML 1.2
		---
		$id: http://devicetree.org/schemas/iio/accelerometers/adi,adxl372.yaml#
		$schema: http://devicetree.org/meta-schemas/core.yaml#

		title: Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer

		maintainers:
		- Stefan Popa <stefan.popa@analog.com>

		description: \|
		Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer that supports
		both I2C & SPI interfaces
		https://www.analog.com/en/products/adxl372.html

		properties:
		compatible:
		enum:
		- adi,adxl372

		reg:
		maxItems: 1

		interrupts:
		maxItems: 1

		required:
		- compatible
		- reg
		- interrupts

		examples:
		- \|
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/interrupt-controller/irq.h>
		i2c0 {
		#address-cells = <1>;
		#size-cells = <0>;

		/* Example for a I2C device node */
		accelerometer@53 {
		compatible = "adi,adxl372";
		reg = <0x53>;
		interrupt-parent = <&gpio>;
		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
		};
		};
		- \|
		#include <dt-bindings/gpio/gpio.h>
		#include <dt-bindings/interrupt-controller/irq.h>
		spi0 {
		#address-cells = <1>;
		#size-cells = <0>;

		accelerometer@0 {
		compatible = "adi,adxl372";
		reg = <0>;
		spi-max-frequency = <1000000>;
		interrupt-parent = <&gpio>;
		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
		};
		};

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

deleted100644 → 0

+0 −33

Original line number	Diff line number	Diff line
		Analog Devices ADXL372 3-Axis, +/-(200g) Digital Accelerometer

		http://www.analog.com/media/en/technical-documentation/data-sheets/adxl372.pdf

		Required properties:
		- compatible : should be "adi,adxl372"
		- reg: the I2C address or SPI chip select number for the device

		Required properties for SPI bus usage:
		- spi-max-frequency: Max SPI frequency to use

		Optional properties:
		- interrupts: interrupt mapping for IRQ as documented in
		Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

		Example for a I2C device node:

		accelerometer@53 {
		compatible = "adi,adxl372";
		reg = <0x53>;
		interrupt-parent = <&gpio>;
		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
		};

		Example for a SPI device node:

		accelerometer@0 {
		compatible = "adi,adxl372";
		reg = <0>;
		spi-max-frequency = <1000000>;
		interrupt-parent = <&gpio>;
		interrupts = <25 IRQ_TYPE_EDGE_FALLING>;
		};

Documentation/devicetree/bindings/iio/adc/adi,ad7124.txt

deleted100644 → 0

+0 −75

Original line number	Diff line number	Diff line
		Analog Devices AD7124 ADC device driver

		Required properties for the AD7124:
		- compatible: Must be one of "adi,ad7124-4" or "adi,ad7124-8"
		- reg: SPI chip select number for the device
		- spi-max-frequency: Max SPI frequency to use
		see: Documentation/devicetree/bindings/spi/spi-bus.txt
		- clocks: phandle to the master clock (mclk)
		see: Documentation/devicetree/bindings/clock/clock-bindings.txt
		- clock-names: Must be "mclk".
		- interrupts: IRQ line for the ADC
		see: Documentation/devicetree/bindings/interrupt-controller/interrupts.txt

		Required properties:
		* #address-cells: Must be 1.
		* #size-cells: Must be 0.

		Subnode(s) represent the external channels which are connected to the ADC.
		Each subnode represents one channel and has the following properties:
		Required properties:
		* reg: The channel number. It can have up to 4 channels on ad7124-4
		and 8 channels on ad7124-8, numbered from 0 to 15.
		* diff-channels: see: Documentation/devicetree/bindings/iio/adc/adc.txt

		Optional properties:
		* bipolar: see: Documentation/devicetree/bindings/iio/adc/adc.txt
		* adi,reference-select: Select the reference source to use when
		converting on the the specific channel. Valid values are:
		0: REFIN1(+)/REFIN1(−).
		1: REFIN2(+)/REFIN2(−).
		3: AVDD
		If this field is left empty, internal reference is selected.

		Optional properties:
		- refin1-supply: refin1 supply can be used as reference for conversion.
		- refin2-supply: refin2 supply can be used as reference for conversion.
		- avdd-supply: avdd supply can be used as reference for conversion.

		Example:
		adc@0 {
		compatible = "adi,ad7124-4";
		reg = <0>;
		spi-max-frequency = <5000000>;
		interrupts = <25 2>;
		interrupt-parent = <&gpio>;
		refin1-supply = <&adc_vref>;
		clocks = <&ad7124_mclk>;
		clock-names = "mclk";

		#address-cells = <1>;
		#size-cells = <0>;

		channel@0 {
		reg = <0>;
		diff-channels = <0 1>;
		adi,reference-select = <0>;
		};

		channel@1 {
		reg = <1>;
		bipolar;
		diff-channels = <2 3>;
		adi,reference-select = <0>;
		};

		channel@2 {
		reg = <2>;
		diff-channels = <4 5>;
		};

		channel@3 {
		reg = <3>;
		diff-channels = <6 7>;
		};
		};

Admin message