diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 10:14:26 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-08-05 10:14:26 +0400 |
| commit | a083c4f2158fb214a42e0739f8aac6955a3ce8df (patch) | |
| tree | 7eb07292be99f5203dce37578aa94e049a9c4b9c /drivers/iio/Kconfig | |
| parent | b59fe845916db1812473c9310e490b6c375d6255 (diff) | |
| parent | cd6fe06588423ff4cca85c85c4402027b04dccf1 (diff) | |
| download | linux-a083c4f2158fb214a42e0739f8aac6955a3ce8df.tar.xz | |
Merge tag 'iio-for-3.12a' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into staging-next
Jonathan writes:
First round of new IIO drivers, features and cleanups for the 3.12 cycle.
There has been a lot of good work going into IIO recently, some of which
missed this pull request purely because I haven't caught up with all my
emails.
Core changes
1) Introduction of devm_iio_device_alloc/free and conversions of lots of
drivers (37 + patches so far mostly from Sachin)
2) A Kconfig option to enabled some debug logging subsystem wide.
New drivers
1) Nuvoton NAU7802 adc driver
2) Avago APDS9300 ambient light sensor driver.
Staging graduations
1) ADIS16260 gyroscope (after a lot fo cleaning up from Lars-Peter)
New driver features
1) ST-sensors gain control of which pin is used for dataready.
2) mcp4725 gains eeprom saving (a later fix deals with a wrong return type
bug in that patch)
3) A number of drivers have gained module alias' to aid autoloading.
Cleanups and minor bug fixes.
1) A number of typos in Kconfig comments
2) Drop remaining mentions of ring buffers (now just buffers)
3) Overrestrictive i2c function checking in the invensense mpu6050 driver
4) Some help text clarifications.
5) store_eeprom is now used in several drivers so move to generic abi docs.
6) Update dac power down options.
7) Add some error handlign to mxs-lradc on stmp_reset_block call.
8) Lars fixed the alphabetical order in various files and added comments
to try and prevent them getting messed up again.
9) Dropped some remaining 'reset' attributes for drivers. We have never
seen a reason why these should be available. Finally the macro
used to define many of these has gone.
10) lps331ap gets an easier to check temperature scale implementation.
11) Various cleanups for the hmc5843 from Peter with a view to getting
it ready for a staging graduation.
Quite a few other little typo fixes etc.
Diffstat (limited to 'drivers/iio/Kconfig')
| -rw-r--r-- | drivers/iio/Kconfig | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index 9af763a90d93..b682f6f54501 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -12,6 +12,13 @@ menuconfig IIO if IIO +config IIO_DEBUG + boolean "Debug support for Industrial I/O" + depends on DEBUG_KERNEL + help + Say "yes" to enable debug messaging (like dev_dbg and pr_debug) + support in Industrial I/O subsystem and drivers. + config IIO_BUFFER bool "Enable buffer support within IIO" help @@ -23,15 +30,14 @@ if IIO_BUFFER config IIO_BUFFER_CB boolean "IIO callback buffer used for push in-kernel interfaces" help - Should be selected by any drivers that do-inkernel push + Should be selected by any drivers that do in-kernel push usage. That is, those where the data is pushed to the consumer. config IIO_KFIFO_BUF select IIO_TRIGGER tristate "Industrial I/O buffering based on kfifo" help - A simple fifo based on kfifo. Use this if you want a fifo - rather than a ring buffer. Note that this currently provides + A simple fifo based on kfifo. Note that this currently provides no buffer events so it is up to userspace to work out how often to read from the buffer. @@ -49,7 +55,7 @@ config IIO_TRIGGER help Provides IIO core support for triggers. Currently these are used to initialize capture of samples to push into - ring buffers. The triggers are effectively a 'capture + buffers. The triggers are effectively a 'capture data now' interrupt. config IIO_CONSUMERS_PER_TRIGGER |