summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-01 16:31:55 -0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-03-01 16:31:55 -0800
commitec3c13e4ac3ebeed01acc24ffba7cb1704804e07 (patch)
tree9d70554f317bc4dc7687d5c1c6eb5c36a95bea03 /Documentation
parent3e66848a3249105fe4973b0550b5b6cd42240168 (diff)
parentac65ca682e84cff77e36ad0d71862b33b4be5f9e (diff)
Merge tag 'iio-for-4.6c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes: Third set of IIO new device support, features and cleanups for the 4.6 cycle. Good to see several new contributors in this set - and more generally a number of new 'faces' over this whole cycle. Staging movements * hmc5843 - out of staging. * periodic RTC trigger - driver dropped. This is an ancient driver (brings back some memories ;) that was always somewhat of a bodge. Originally there was a driver that never went into mainline that supported large numbers of periodict timers on the PXA270 via this route. Discussions to have a generic periodic timer subsystem never went anywhere. At the time RTC periodic interrupts were real - now they are emulated using high resolution timers so with the HRT driver this has become pointless. New device support * mpu6050 driver - Add support for the mpu6500. * TI tpl0102 potentiometer - new driver. * Vybrid SoC DAC - new driver. The ADC on this SoC has been supported for a while, this adds a separate driver for the DAC. New Features * hmc5844 - Attributes to configure the bias current (typically part of a self test) This could be done before via a somewhat obscure custom interface. This at least makes it easy to tell what is going on. - Document all custom attributes. * mpu6050 - Add support for calibration offset control and readback. * ms5611 - power regulator support. This is always one that gets added the first time someone has a board that needs it. Here it was needed, hence it was added. Cleanups / minor fixes * tree wide - clean up all the myriad different return values in response to a failure of i2c_check_functionality. After discussions everyone seemed happy wiht -EOPNOTSUPP which seems to describe the situation well. I encouraged a tree wide cleanup to set a good example in future for this. * core - Typos in the iio_event_spec documentation in iio.h * afe4403 - select REGMAP_SPI to avoid dependency issues - mark suspend/resume as __maybe_unused to avoid warnings * afe4404 - mark suspend/resume as __maybe_unused to avoid warnings * atlas-ph-sensor - switch the regmap cache type from linear to rbtree to gain reading of registers on initial startup. It's not immediately obvious, but regmap flat is meant for high performances cases so doesn't read these registers. - use regmap_bulk_read in one case where it was using i2c_smbus_read_i2c_block_data directly (unlike everything else that was through regmap). * ina2xx - stype cleanups (lots of them!) * isl29018 - Get the struct device back from regmap rather than storing another copy of it in the private data. This cleanup makes sense in a number of other drivers so patches may well follow. * mpu6050 - style cleanups (lots of them!) - improved return value handling - use usleep_range to avoid the usual issues with very short msleeps. - add some missing documentation. * ms5611 - use the probed device name for the device rather than the driver name. - select IIO_BUFFER to avoid dependency issues * palmas - drop IRQF_EARLY_RESUME as no longer needed after genirq changes.
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc584315
-rw-r--r--Documentation/ABI/testing/sysfs-bus-iio-vf6109
-rw-r--r--Documentation/devicetree/bindings/iio/dac/vf610-dac.txt20
3 files changed, 44 insertions, 0 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843 b/Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
new file mode 100644
index 000000000000..6275e9f56e6c
--- /dev/null
+++ b/Documentation/ABI/testing/sysfs-bus-iio-magnetometer-hmc5843
@@ -0,0 +1,15 @@
+What: /sys/bus/iio/devices/iio:deviceX/meas_conf
+What: /sys/bus/iio/devices/iio:deviceX/meas_conf_available
+KernelVersion: 4.5
+Contact: linux-iio@vger.kernel.org
+Description:
+ Current configuration and available configurations
+ for the bias current.
+ normal - Normal measurement configurations (default)
+ positivebias - Positive bias configuration
+ negativebias - Negative bias configuration
+ disabled - Only available on HMC5983. Disables magnetic
+ sensor and enables temperature sensor.
+ Note: The effect of this configuration may vary
+ according to the device. For exact documentation
+ check the device's datasheet.
diff --git a/Documentation/ABI/testing/sysfs-bus-iio-vf610 b/Documentation/ABI/testing/sysfs-bus-iio-vf610
index ecbc1f4af921..308a6756d3bf 100644
--- a/Documentation/ABI/testing/sysfs-bus-iio-vf610
+++ b/Documentation/ABI/testing/sysfs-bus-iio-vf610
@@ -5,3 +5,12 @@ Description:
Specifies the hardware conversion mode used. The three
available modes are "normal", "high-speed" and "low-power",
where the last is the default mode.
+
+
+What: /sys/bus/iio/devices/iio:deviceX/out_conversion_mode
+KernelVersion: 4.6
+Contact: linux-iio@vger.kernel.org
+Description:
+ Specifies the hardware conversion mode used within DAC.
+ The two available modes are "high-power" and "low-power",
+ where "low-power" mode is the default mode.
diff --git a/Documentation/devicetree/bindings/iio/dac/vf610-dac.txt b/Documentation/devicetree/bindings/iio/dac/vf610-dac.txt
new file mode 100644
index 000000000000..20c6c7ae9687
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/dac/vf610-dac.txt
@@ -0,0 +1,20 @@
+Freescale vf610 Digital to Analog Converter bindings
+
+The devicetree bindings are for the new DAC driver written for
+vf610 SoCs from Freescale.
+
+Required properties:
+- compatible: Should contain "fsl,vf610-dac"
+- reg: Offset and length of the register set for the device
+- interrupts: Should contain the interrupt for the device
+- clocks: The clock is needed by the DAC controller
+- clock-names: Must contain "dac" matching entry in the clocks property.
+
+Example:
+dac0: dac@400cc000 {
+ compatible = "fsl,vf610-dac";
+ reg = <0x400cc000 0x1000>;
+ interrupts = <55 IRQ_TYPE_LEVEL_HIGH>;
+ clock-names = "dac";
+ clocks = <&clks VF610_CLK_DAC0>;
+};