summaryrefslogtreecommitdiffstats
path: root/drivers/iio
Commit message (Collapse)AuthorAgeFilesLines
...
| * | iio: proximity: as3935: remove redundant MODULE_ALIASMatt Ranostay2016-05-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | MODULE_ALIAS isn't needed since the module name is the same as the alias defined. Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: magnetometer: bmc150: Document Bosch supported chipsDaniel Baluta2016-05-291-0/+2
| | | | | | | | | | | | | | | | | | | | | bmc150 driver supports also BMC156 and BMM150 chips. Signed-off-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: chemical: atlas-ph-sensor: add EC featureMatt Ranostay2016-05-292-5/+125
| | | | | | | | | | | | | | | Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: electricalconductivity: add IIO_ELECTRICALCONDUCTIVITY typeMatt Ranostay2016-05-291-0/+1
| | | | | | | | | | | | | | | Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: chemical: atlas-ph-sensor: reorg driver to allow multiple chipsMatt Ranostay2016-05-291-55/+90
| | | | | | | | | | | | | | | Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ad799x: use iio helper function to guarantee direct modeAlison Schofield2016-05-291-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ad7923: use iio helper function to guarantee direct modeAlison Schofield2016-05-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ad7887: use iio helper function to guarantee direct modeAlison Schofield2016-05-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ad7476: use iio helper function to guarantee direct modeAlison Schofield2016-05-291-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the code that guarantees the device stays in direct mode with iio_device_claim_direct_mode() which does same. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ad7266: claim direct mode during sensor readAlison Schofield2016-05-291-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Driver was checking for direct mode but not locking it down. Use iio_device_claim_direct_mode() to guarantee device stays in direct mode. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Acked-by: Daniel Baluta <daniel.baluta@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio:st_sensors: fix power regulator usageGregor Boirie2016-05-295-21/+56
| | | | | | | | | | | | | | | | | | | | | Ensure failure to enable power regulators is properly handled. Signed-off-by: Gregor Boirie <gregor.boirie@parrot.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio:st_sensors: emulate SMBus block read if neededGregor Boirie2016-05-291-2/+2
| | | | | | | | | | | | | | | | | | | | | Use SMBus "block read" protocol only when supported by adapter. Signed-off-by: Gregor Boirie <gregor.boirie@parrot.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio:st_sensors: unexport st_sensors_get_buffer_elementGregor Boirie2016-05-291-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Remove st_sensors_get_buffer_element symbol export since not explicitly used outside of st_sensors driver. Signed-off-by: Gregor Boirie <gregor.boirie@parrot.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio:st_pressure:initial lps22hb sensor supportGregor Boirie2016-05-295-5/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initial support for ST LPS22HB pressure sensor. Datasheet: http://www2.st.com/resource/en/datasheet/lps22hb.pdf Features: * pressure data and timestamping channels * sampling frequency selection * interrupt based trigger * over I2C or SPI Signed-off-by: Gregor Boirie <gregor.boirie@parrot.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: triggers: Make trigger ops structure explicitly non optional.Jonathan Cameron2016-05-291-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This structure has not been optional for a long time (if ever) but the code implies that it is. As we then use it later in a fashion that would crash if it was in fact NULL, it's inconsistent so fix it up by removing unnecessary checks. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ti-ads1015: add datasheet namesMatt Ranostay2016-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Add datasheet names for ADC channels to allow iio consumers access. Signed-off-by: Matt Ranostay <matt.ranostay@intel.com> Acked-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: pressure: bmp280: add humidity supportMatt Ranostay2016-05-212-3/+200
| | | | | | | | | | | | | | | | | | | | | | | | Enable humidity support for the BME280 part Signed-off-by: Matt Ranostay <matt.ranostay@intel.com> Acked-by: Vlad Dogaru <vlad.dogaru@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: light: jsa1212: remove unneeded i2c check functionality testAlison Schofield2016-05-211-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This driver does not call i2c_smbus_read|write_byte_data(), so remove the corresponding functionality test. It uses regmap to handle byte transfers transparently. Signed-off-by: Alison Schofield <amsfield22@gmail.com> Reviewed-by:Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> Reviewed-by: Matt Ranostay <matt.ranostay@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: nau7802: Expose possible gains in sysfsQuentin Schulz2016-05-211-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Nuvoton NAU7802 ADC is able to adjust its gain but prior knowledge of its possible values was required to adjust it. Users had to guess the possible gain values based on the ADC datasheet or on this driver's code. This exposes the possible values in the in_voltage_scale_available file of each nau7802 ADC device. The gain is set for the whole ADC and is therefore not configurable by channel. Thus, there exists only one in_voltage_scale_available file for each nau7802 ADC device even if it has two separate channels. Signed-off-by: Quentin Schulz <quentin.schulz@free-electrons.com> Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: max5487: Add support for Maxim digital potentiometersCristina Moraru2016-05-213-0/+173
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add implementation for Maxim MAX5487, MAX5488, MAX5489 digital potentiometers. Datasheet: http://datasheets.maximintegrated.com/en/ds/MAX5487-MAX5489.pdf Signed-off-by: Cristina Moraru <cristina.moraru09@gmail.com> CC: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: Export I2C module alias informationJavier Martinez Canillas2016-05-215-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The I2C drivers have an i2c_device_id array but that information isn't exported to the modules using the MODULE_DEVICE_TABLE() macro. So the modules autoloading won't work if the I2C device is registered using OF or legacy board files due missing alias information in the modules. The issue was found using Kieran Bingham's coccinelle semantic patch: https://lkml.org/lkml/2016/5/10/520 Signed-off-by: Javier Martinez Canillas <javier@osg.samsung.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: accel: Add triggered buffer support for BMA220Tiberiu Breana2016-05-211-2/+63
| | | | | | | | | | | | | | | Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: adc: ti-ads1015: add support for ADS1115 partMatt Ranostay2016-05-211-15/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TI ADS1115 is a 16-bit resolution ADC that is register map compatible with the ADS1015 device. Signed-off-by: Matt Ranostay <matt.ranostay@intel.com> Acked-by: Daniel Baluta <daniel.baluta@intel.com> Acked-by: Crt Mori <cmo@melexis.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: magn: Add support for BMM150 magnetometerDaniel Baluta2016-05-212-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BMM150 is register compatible with magnetometer part of BMC156. Datasheet is at: http://www.mouser.com/ds/2/783/BST-BMM150-DS001-01-786480.pdf Signed-off-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: accel: Add support for Bosch BMA220Tiberiu Breana2016-05-143-0/+288
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds basic support for the Bosch Sensortec BMA220 digital triaxial acceleration sensor. The device datasheet can be found here: http://www.mouser.com/pdfdocs/BSTBMA220DS00308.PDF Includes: - raw readings - ACPI detection - power management Signed-off-by: Tiberiu Breana <tiberiu.a.breana@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: potentiometer: tpl0102: remove unneeded i2c check functionality testMatt Ranostay2016-05-141-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Actually I2C_FUNC_SMBUS_WORD_DATA isn't need for this device, and regmap handles all single byte reads transparently. Signed-off-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: mma8452: add support for oversampling ratioMartin Kepplinger2016-05-041-25/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds the following sysfs files according to the iio ABI: -rw-r--r-- 4096 in_accel_oversampling_ratio -r--r--r-- 4096 in_accel_oversampling_ratio_available Internally, the device knows about 4 different power modes that differ in oversampling ratio (and power consumption). We just show the user what oversampling ratio(s) is/are available, depending on the current frequency. The referenced table in the datasheets makes it easier to understand. Signed-off-by: Martin Kepplinger <martink@posteo.de> Signed-off-by: Christoph Muellner <christoph.muellner@theobroma-systems.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: dummy: Convert IIO dummy to configfsDaniel Baluta2016-05-042-65/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We register a new device type named "dummy", this will create a configfs entry under: * /config/iio/devices/dummy. Creating dummy devices is now as simple as: $ mkdir /config/iio/devices/dummy/my_dummy_device Signed-off-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: Add support for creating IIO devices via configfsDaniel Baluta2016-05-043-0/+191
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar with support for creating triggers via configfs. Devices will be hosted under: * /config/iio/devices We allow users to register "device types" under: * /config/iio/devices/<device_types>/ Signed-off-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe4404: ENSEPGAIN is part of CONTROL2 registerAndrew F. Davis2016-05-041-3/+3
| | | | | | | | | | | | | | | | | | | | | Rename this definition, no functional changes. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Remove unused definitionsAndrew F. Davis2016-05-042-57/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | These definitions are not currently used and if the functionality they represent is needed the values should be added back to a table for easy userspace use. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Match LED currents to stagesAndrew F. Davis2016-05-042-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | The current channel number for the LEDs should match the stage number that they are active during, fix this here. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Make gain settings a modifier for the stagesAndrew F. Davis2016-05-042-24/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the TIA gain settings are exported to userspace as sysfs entries that do not clearly represent their internal relation to the sampling stages. The gain settings are enabled on a per-stage basis, this can be seen in figure 24 of the current AFE4404 datasheet. These gain settings should therefore be tied to the channels that are read during these stages. Make this change here. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Use regmap fieldsAndrew F. Davis2016-05-043-155/+144
| | | | | | | | | | | | | | | | | | | | | | | | These drivers can use regmap fields to access fields in registers, this allows us to remove some macros/defines and simplify code, do this here. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Remove channel namesAndrew F. Davis2016-05-043-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These AFEs have 4 ADC mesuring stages (called LED2, ALED2, LED1, and ALED1 in the datasheet), we map these as channels, these stages can serve different purposes depending on the application. For instance the AFE4404 has an additional LED (LED3), this LED can be timed to be active during stage 2 (or anystage, but the datasheet describes this case and the name of the stage reflects this use). This ability is used further in upcoming parts that tie the front-end gain and the LED timings together. For these reasons we remove explicit naming the channels. Without channel names it is best that the index numbers are in order to match the stage number, reorder the channel numbers. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe4404: Remove LED3 input channelAndrew F. Davis2016-05-041-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | Input channel LED3 is only an alias for stage ALED2, this virtual channel does nothing for us, remove this channel. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Remove unneeded offset handlingAndrew F. Davis2016-05-041-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | No channel in the afe4403 driver has IIO_CHAN_INFO_OFFSET set so remove the handlers for this. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Fix scan_index assignmentAndrew F. Davis2016-05-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The LED channels are not scannable and so scan_index should be negative, fix this here. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Always use separate gain valuesAndrew F. Davis2016-05-043-98/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Locking the two gain stages to the same setting adds no value for us, so initialize them as unlocked and remove the sysfs for unlocking them. This also allows us to greatly simplify showing and setting the gain registers. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Remove unneeded initializersAndrew F. Davis2016-05-042-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | The drivers set some register values during initialization that can be set at runtime, these defaults were used in testing but are not necessary, remove these. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Remove of_match_ptr and ifdefsAndrew F. Davis2016-05-042-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | The drivers DT tables are not built-in when OF is not enabled, this does not save us enough to justify ugly ifdefs. Clean this up. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: health/afe440x: Fix kernel-doc formatAndrew F. Davis2016-05-042-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | Fix kernel-doc formatting for structs, and while we are making little fixes, clarify the module description and update the copywrite. Signed-off-by: Andrew F. Davis <afd@ti.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | imu: bmi160: Add avail frequency and scale attributesDaniel Baluta2016-05-041-0/+27
| | | | | | | | | | | | | | | Signed-off-by: Daniel Baluta <daniel.baluta@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: mxs-lradc: disable only masked channels in mxs_lradc_hw_stopStefan Wahren2016-05-041-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disabling of the touchscreen IRQs should be done in mxs_lradc_disable_ts. So disable only the masked virtual channels in mxs_lradc_hw_stop and finally remove the unused function mxs_lradc_irq_en_mask. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de> Tested-by: Marek Vasut <marex@denx.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: mxs-lradc: remove mxs_lradc_ts_unregisterStefan Wahren2016-05-041-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After using devm_input_allocate_device for registration the function mxs_lradc_ts_unregister isn't necessary anymore since mxs_lradc_ts_close already does the job. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Suggested-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: mxs-lradc: simplify TS registrationStefan Wahren2016-05-041-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch simplifies the TS registration of mxs-lradc by using devm_input_allocate_device. Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com> Reviewed-by: Marek Vasut <marex@denx.de> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: accel: Add support for Freescale MMA7660FCConstantin Musca2016-05-043-0/+289
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimal implementation of an IIO driver for the Freescale MMA7660FC 3-axis accelerometer. Datasheet: http://www.nxp.com/files/sensors/doc/data_sheet/MMA7660FC.pdf Includes: - ACPI support; - read_raw for x,y,z axes; - reading and setting the scale (range) parameter. - power management Signed-off-by: Constantin Musca <constantin.musca@intel.com> Reviewed-by: Martin Klepplinger <martink@posteo.de> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
| * | iio: ak8975: Support adapters limited to BYTE_DATACrestez Dan Leonard2016-05-011-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The device has simple 8-bit registers but the driver incorrectly uses block or word reads without checking functionality bits. Fix by using i2c_smbus_read_i2c_block_data_or_emulated instead of i2c_smbus_read_i2c_block_data or i2c_smbus_read_word_data. This will check functionality bits and use the fastest available transfer method. Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
* | | Merge tag 'staging-4.7-rc1' of ↵Linus Torvalds2016-05-2099-643/+7634
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging Pull staging and IIO driver updates from Greg KH: "Here's the big staging and iio driver update for 4.7-rc1. I think we almost broke even with this release, only adding a few more lines than we removed, which isn't bad overall given that there's a bunch of new iio drivers added. The Lustre developers seem to have woken up from their sleep and have been doing a great job in cleaning up the code and pruning unused or old cruft, the filesystem is almost readable :) Other than that, just a lot of basic coding style cleanups in the churn. All have been in linux-next for a while with no reported issues" * tag 'staging-4.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (938 commits) Staging: emxx_udc: emxx_udc: fixed coding style issue staging/gdm724x: fix "alignment should match open parenthesis" issues staging/gdm724x: Fix avoid CamelCase staging: unisys: rename misleading var ii with frag staging: unisys: visorhba: switch success handling to error handling staging: unisys: visorhba: main path needs to flow down the left margin staging: unisys: visorinput: handle_locking_key() simplifications staging: unisys: visorhba: fail gracefully for thread creation failures staging: unisys: visornic: comment restructuring and removing bad diction staging: unisys: fix format string %Lx to %llx for u64 staging: unisys: remove unused struct members staging: unisys: visorchannel: correct variable misspelling staging: unisys: visorhba: replace functionlike macro with function staging: dgnc: Need to check for NULL of ch staging: dgnc: remove redundant condition check staging: dgnc: fix 'line over 80 characters' staging: dgnc: clean up the dgnc_get_modem_info() staging: lustre: lnet: enable configuration per NI interface staging: lustre: o2iblnd: properly set ibr_why staging: lustre: o2iblnd: remove last of kiblnd_tunables_fini ...
| * \ \ Merge 4.6-rc7 into staging-nextGreg Kroah-Hartman2016-05-092-3/+5
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | This fixes some merge issues with some iio drivers that were found in linux-next. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>