diff options
author | Lars-Peter Clausen <lars@metafoo.de> | 2012-06-04 11:36:28 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-06-05 14:02:25 +0900 |
commit | dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a (patch) | |
tree | 2858c04b9d18852c1a4f4ca1c60c8e00b6180470 | |
parent | 20374d1a36df3e20cd6742ba376684e5506254a8 (diff) | |
download | linux-3.10-dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a.tar.gz linux-3.10-dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a.tar.bz2 linux-3.10-dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a.zip |
staging:iio: Move DAC drivers out of staging
The IIO DAC drivers are in a reasonably good shape. They all make use of channel
spec and non of them provides non-documented sysfs attributes. Code style should
be OK as well, both checkpatch and coccicheck only report trivial issues.
So lets move the whole folder out of staging.
Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Acked-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/iio/Kconfig | 1 | ||||
-rw-r--r-- | drivers/iio/Makefile | 1 | ||||
-rw-r--r-- | drivers/iio/dac/Kconfig (renamed from drivers/staging/iio/dac/Kconfig) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/Makefile (renamed from drivers/staging/iio/dac/Makefile) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5064.c (renamed from drivers/staging/iio/dac/ad5064.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5360.c (renamed from drivers/staging/iio/dac/ad5360.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5380.c (renamed from drivers/staging/iio/dac/ad5380.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5421.c (renamed from drivers/staging/iio/dac/ad5421.c) | 2 | ||||
-rw-r--r-- | drivers/iio/dac/ad5446.c (renamed from drivers/staging/iio/dac/ad5446.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5446.h (renamed from drivers/staging/iio/dac/ad5446.h) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5504.c (renamed from drivers/staging/iio/dac/ad5504.c) | 3 | ||||
-rw-r--r-- | drivers/iio/dac/ad5624r.h (renamed from drivers/staging/iio/dac/ad5624r.h) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5624r_spi.c (renamed from drivers/staging/iio/dac/ad5624r_spi.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5686.c (renamed from drivers/staging/iio/dac/ad5686.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5764.c (renamed from drivers/staging/iio/dac/ad5764.c) | 0 | ||||
-rw-r--r-- | drivers/iio/dac/ad5791.c (renamed from drivers/staging/iio/dac/ad5791.c) | 3 | ||||
-rw-r--r-- | drivers/iio/dac/max517.c (renamed from drivers/staging/iio/dac/max517.c) | 3 | ||||
-rw-r--r-- | drivers/staging/iio/Kconfig | 1 | ||||
-rw-r--r-- | drivers/staging/iio/Makefile | 1 | ||||
-rw-r--r-- | include/linux/iio/dac/ad5421.h (renamed from drivers/staging/iio/dac/ad5421.h) | 4 | ||||
-rw-r--r-- | include/linux/iio/dac/ad5504.h (renamed from drivers/staging/iio/dac/ad5504.h) | 4 | ||||
-rw-r--r-- | include/linux/iio/dac/ad5791.h (renamed from drivers/staging/iio/dac/ad5791.h) | 4 | ||||
-rw-r--r-- | include/linux/iio/dac/max517.h (renamed from drivers/staging/iio/dac/max517.h) | 4 |
23 files changed, 6 insertions, 25 deletions
diff --git a/drivers/iio/Kconfig b/drivers/iio/Kconfig index 64c88e5cda4..103349f2b3b 100644 --- a/drivers/iio/Kconfig +++ b/drivers/iio/Kconfig @@ -52,5 +52,6 @@ source "drivers/iio/adc/Kconfig" source "drivers/iio/amplifiers/Kconfig" source "drivers/iio/light/Kconfig" source "drivers/iio/frequency/Kconfig" +source "drivers/iio/dac/Kconfig" endif # IIO diff --git a/drivers/iio/Makefile b/drivers/iio/Makefile index bd801c0bbc2..c38fa2a40af 100644 --- a/drivers/iio/Makefile +++ b/drivers/iio/Makefile @@ -13,3 +13,4 @@ obj-y += adc/ obj-y += amplifiers/ obj-y += light/ obj-y += frequency/ +obj-y += dac/ diff --git a/drivers/staging/iio/dac/Kconfig b/drivers/iio/dac/Kconfig index a626f03871e..a626f03871e 100644 --- a/drivers/staging/iio/dac/Kconfig +++ b/drivers/iio/dac/Kconfig diff --git a/drivers/staging/iio/dac/Makefile b/drivers/iio/dac/Makefile index 8ab1d264aab..8ab1d264aab 100644 --- a/drivers/staging/iio/dac/Makefile +++ b/drivers/iio/dac/Makefile diff --git a/drivers/staging/iio/dac/ad5064.c b/drivers/iio/dac/ad5064.c index 276af02520a..276af02520a 100644 --- a/drivers/staging/iio/dac/ad5064.c +++ b/drivers/iio/dac/ad5064.c diff --git a/drivers/staging/iio/dac/ad5360.c b/drivers/iio/dac/ad5360.c index 8fce84fe70b..8fce84fe70b 100644 --- a/drivers/staging/iio/dac/ad5360.c +++ b/drivers/iio/dac/ad5360.c diff --git a/drivers/staging/iio/dac/ad5380.c b/drivers/iio/dac/ad5380.c index 5dfb4451728..5dfb4451728 100644 --- a/drivers/staging/iio/dac/ad5380.c +++ b/drivers/iio/dac/ad5380.c diff --git a/drivers/staging/iio/dac/ad5421.c b/drivers/iio/dac/ad5421.c index ea2f83b4e35..cdbc5bf25c3 100644 --- a/drivers/staging/iio/dac/ad5421.c +++ b/drivers/iio/dac/ad5421.c @@ -19,7 +19,7 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/events.h> -#include "ad5421.h" +#include <linux/iio/dac/ad5421.h> #define AD5421_REG_DAC_DATA 0x1 diff --git a/drivers/staging/iio/dac/ad5446.c b/drivers/iio/dac/ad5446.c index 49f557fc673..49f557fc673 100644 --- a/drivers/staging/iio/dac/ad5446.c +++ b/drivers/iio/dac/ad5446.c diff --git a/drivers/staging/iio/dac/ad5446.h b/drivers/iio/dac/ad5446.h index dfd68ce7427..dfd68ce7427 100644 --- a/drivers/staging/iio/dac/ad5446.h +++ b/drivers/iio/dac/ad5446.h diff --git a/drivers/staging/iio/dac/ad5504.c b/drivers/iio/dac/ad5504.c index 1289e9bc168..242bdc7d004 100644 --- a/drivers/staging/iio/dac/ad5504.c +++ b/drivers/iio/dac/ad5504.c @@ -19,8 +19,7 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> #include <linux/iio/events.h> - -#include "ad5504.h" +#include <linux/iio/dac/ad5504.h> #define AD5505_BITS 12 #define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1) diff --git a/drivers/staging/iio/dac/ad5624r.h b/drivers/iio/dac/ad5624r.h index 5dca3028cdf..5dca3028cdf 100644 --- a/drivers/staging/iio/dac/ad5624r.h +++ b/drivers/iio/dac/ad5624r.h diff --git a/drivers/staging/iio/dac/ad5624r_spi.c b/drivers/iio/dac/ad5624r_spi.c index 6a7d6a48cc6..6a7d6a48cc6 100644 --- a/drivers/staging/iio/dac/ad5624r_spi.c +++ b/drivers/iio/dac/ad5624r_spi.c diff --git a/drivers/staging/iio/dac/ad5686.c b/drivers/iio/dac/ad5686.c index 6948d75e103..6948d75e103 100644 --- a/drivers/staging/iio/dac/ad5686.c +++ b/drivers/iio/dac/ad5686.c diff --git a/drivers/staging/iio/dac/ad5764.c b/drivers/iio/dac/ad5764.c index ffce3044744..ffce3044744 100644 --- a/drivers/staging/iio/dac/ad5764.c +++ b/drivers/iio/dac/ad5764.c diff --git a/drivers/staging/iio/dac/ad5791.c b/drivers/iio/dac/ad5791.c index 5de28c2a57e..2bd2e37280f 100644 --- a/drivers/staging/iio/dac/ad5791.c +++ b/drivers/iio/dac/ad5791.c @@ -19,8 +19,7 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> - -#include "ad5791.h" +#include <linux/iio/dac/ad5791.h> #define AD5791_RES_MASK(x) ((1 << (x)) - 1) #define AD5791_DAC_MASK AD5791_RES_MASK(20) diff --git a/drivers/staging/iio/dac/max517.c b/drivers/iio/dac/max517.c index 403e06fbc39..92c77c82026 100644 --- a/drivers/staging/iio/dac/max517.c +++ b/drivers/iio/dac/max517.c @@ -27,8 +27,7 @@ #include <linux/iio/iio.h> #include <linux/iio/sysfs.h> - -#include "max517.h" +#include <linux/iio/dac/max517.h> #define MAX517_DRV_NAME "max517" diff --git a/drivers/staging/iio/Kconfig b/drivers/staging/iio/Kconfig index 3c8e5ec26ac..04cd6ec1f70 100644 --- a/drivers/staging/iio/Kconfig +++ b/drivers/staging/iio/Kconfig @@ -29,7 +29,6 @@ source "drivers/staging/iio/accel/Kconfig" source "drivers/staging/iio/adc/Kconfig" source "drivers/staging/iio/addac/Kconfig" source "drivers/staging/iio/cdc/Kconfig" -source "drivers/staging/iio/dac/Kconfig" source "drivers/staging/iio/frequency/Kconfig" source "drivers/staging/iio/gyro/Kconfig" source "drivers/staging/iio/impedance-analyzer/Kconfig" diff --git a/drivers/staging/iio/Makefile b/drivers/staging/iio/Makefile index 6a46d5afb38..fa6937d92ee 100644 --- a/drivers/staging/iio/Makefile +++ b/drivers/staging/iio/Makefile @@ -17,7 +17,6 @@ obj-y += accel/ obj-y += adc/ obj-y += addac/ obj-y += cdc/ -obj-y += dac/ obj-y += frequency/ obj-y += gyro/ obj-y += impedance-analyzer/ diff --git a/drivers/staging/iio/dac/ad5421.h b/include/linux/iio/dac/ad5421.h index cd2bb84ff1b..8fd8f057a89 100644 --- a/drivers/staging/iio/dac/ad5421.h +++ b/include/linux/iio/dac/ad5421.h @@ -1,10 +1,6 @@ #ifndef __IIO_DAC_AD5421_H__ #define __IIO_DAC_AD5421_H__ -/* - * TODO: This file needs to go into include/linux/iio - */ - /** * enum ad5421_current_range - Current range the AD5421 is configured for. * @AD5421_CURRENT_RANGE_4mA_20mA: 4 mA to 20 mA (RANGE1,0 pins = 00) diff --git a/drivers/staging/iio/dac/ad5504.h b/include/linux/iio/dac/ad5504.h index d4980bf688b..43895376a9c 100644 --- a/drivers/staging/iio/dac/ad5504.h +++ b/include/linux/iio/dac/ad5504.h @@ -9,10 +9,6 @@ #ifndef SPI_AD5504_H_ #define SPI_AD5504_H_ -/* - * TODO: struct ad5504_platform_data needs to go into include/linux/iio - */ - struct ad5504_platform_data { u16 vref_mv; }; diff --git a/drivers/staging/iio/dac/ad5791.h b/include/linux/iio/dac/ad5791.h index 87a6c922f18..45ee281c666 100644 --- a/drivers/staging/iio/dac/ad5791.h +++ b/include/linux/iio/dac/ad5791.h @@ -9,10 +9,6 @@ #ifndef SPI_AD5791_H_ #define SPI_AD5791_H_ -/* - * TODO: struct ad5791_platform_data needs to go into include/linux/iio - */ - /** * struct ad5791_platform_data - platform specific information * @vref_pos_mv: Vdd Positive Analog Supply Volatge (mV) diff --git a/drivers/staging/iio/dac/max517.h b/include/linux/iio/dac/max517.h index 8106cf24642..f6d1d252f08 100644 --- a/drivers/staging/iio/dac/max517.h +++ b/include/linux/iio/dac/max517.h @@ -8,10 +8,6 @@ #ifndef IIO_DAC_MAX517_H_ #define IIO_DAC_MAX517_H_ -/* - * TODO: struct max517_platform_data needs to go into include/linux/iio - */ - struct max517_platform_data { u16 vref_mv[2]; }; |