Merge tag 'iio-for-4.6a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes: First round of new IIO device support, features and cleanups for the 4.6 cycle. Device Support * ad5761 - new driver * at91_sama5d2 ADC. - new driver and MAINTAINERS entry. - minor cleanups followed. * atlas pH-SM - new driver (this has possibly the prettiest data sheet I've ever seen) * mcp3422 - mcp3425 ADC added. * mcp4725 - mcp4726 DAC added. * mma8452 - mma8451q accelerometer added. * mpl115 - mpl115a1 added (a lot bigger than it seems as this is an SPI part whereas previous parts were i2c). * si7005 - Hoperf th02 (seems to be a repackaged part) * si7020 - Hoperf th06 (seems to be a repackaged part) New features * Core - IIO_PH type. Does what it says on the tin. * max30100 - LED current configuration support. * mcp320x - more differential measurement combinations. * mma8452 - free fall deteciton - opt3001 - enable operation without a IRQ line. - device tree docs. Somehow the original docs have disappeared down a rabbit hole, so here is a new set. * st-sensors - Support active-low interrupts. Cleanups and minor / not so minor reworks * Documentation - drop some defunct ABI from the docs in staging. * presure / Kconfig - white space cleanup. * ad7150 - BIT macro usage - Alignment fixes * ad7192 - false indent fixed. * ak8975 - constify the ak_def structures * axp288 - drop a redundant double const. * dht11 - substantial reliability improvements by being more tolerant of missing start bits. - simplify the decoding algorithm * mma8452 - whitespace cleanup * mpl115 - don't bother setting i2c_client_data as nothing uses it. * mpu6050 - drop unused function parameter. * opt3001 - extract integration time as constants. - trivial refactoring.
This commit is contained in:
@@ -119,6 +119,8 @@ struct st_sensor_bdu {
|
||||
* @addr: address of the register.
|
||||
* @mask_int1: mask to enable/disable IRQ on INT1 pin.
|
||||
* @mask_int2: mask to enable/disable IRQ on INT2 pin.
|
||||
* @addr_ihl: address to enable/disable active low on the INT lines.
|
||||
* @mask_ihl: mask to enable/disable active low on the INT lines.
|
||||
* struct ig1 - represents the Interrupt Generator 1 of sensors.
|
||||
* @en_addr: address of the enable ig1 register.
|
||||
* @en_mask: mask to write the on/off value for enable.
|
||||
@@ -127,6 +129,8 @@ struct st_sensor_data_ready_irq {
|
||||
u8 addr;
|
||||
u8 mask_int1;
|
||||
u8 mask_int2;
|
||||
u8 addr_ihl;
|
||||
u8 mask_ihl;
|
||||
struct {
|
||||
u8 en_addr;
|
||||
u8 en_mask;
|
||||
|
44
include/linux/platform_data/ad5761.h
Normal file
44
include/linux/platform_data/ad5761.h
Normal file
@@ -0,0 +1,44 @@
|
||||
/*
|
||||
* AD5721, AD5721R, AD5761, AD5761R, Voltage Output Digital to Analog Converter
|
||||
*
|
||||
* Copyright 2016 Qtechnology A/S
|
||||
* 2016 Ricardo Ribalda <ricardo.ribalda@gmail.com>
|
||||
*
|
||||
* Licensed under the GPL-2.
|
||||
*/
|
||||
#ifndef __LINUX_PLATFORM_DATA_AD5761_H__
|
||||
#define __LINUX_PLATFORM_DATA_AD5761_H__
|
||||
|
||||
/**
|
||||
* enum ad5761_voltage_range - Voltage range the AD5761 is configured for.
|
||||
* @AD5761_VOLTAGE_RANGE_M10V_10V: -10V to 10V
|
||||
* @AD5761_VOLTAGE_RANGE_0V_10V: 0V to 10V
|
||||
* @AD5761_VOLTAGE_RANGE_M5V_5V: -5V to 5V
|
||||
* @AD5761_VOLTAGE_RANGE_0V_5V: 0V to 5V
|
||||
* @AD5761_VOLTAGE_RANGE_M2V5_7V5: -2.5V to 7.5V
|
||||
* @AD5761_VOLTAGE_RANGE_M3V_3V: -3V to 3V
|
||||
* @AD5761_VOLTAGE_RANGE_0V_16V: 0V to 16V
|
||||
* @AD5761_VOLTAGE_RANGE_0V_20V: 0V to 20V
|
||||
*/
|
||||
|
||||
enum ad5761_voltage_range {
|
||||
AD5761_VOLTAGE_RANGE_M10V_10V,
|
||||
AD5761_VOLTAGE_RANGE_0V_10V,
|
||||
AD5761_VOLTAGE_RANGE_M5V_5V,
|
||||
AD5761_VOLTAGE_RANGE_0V_5V,
|
||||
AD5761_VOLTAGE_RANGE_M2V5_7V5,
|
||||
AD5761_VOLTAGE_RANGE_M3V_3V,
|
||||
AD5761_VOLTAGE_RANGE_0V_16V,
|
||||
AD5761_VOLTAGE_RANGE_0V_20V,
|
||||
};
|
||||
|
||||
/**
|
||||
* struct ad5761_platform_data - AD5761 DAC driver platform data
|
||||
* @voltage_range: Voltage range the AD5761 is configured for
|
||||
*/
|
||||
|
||||
struct ad5761_platform_data {
|
||||
enum ad5761_voltage_range voltage_range;
|
||||
};
|
||||
|
||||
#endif
|
Reference in New Issue
Block a user