Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Lars-Peter Clausen and committed by
Greg Kroah-Hartman
dbdc025b 20374d1a

+6 -25
+1
drivers/iio/Kconfig
··· 52 52 source "drivers/iio/amplifiers/Kconfig" 53 53 source "drivers/iio/light/Kconfig" 54 54 source "drivers/iio/frequency/Kconfig" 55 + source "drivers/iio/dac/Kconfig" 55 56 56 57 endif # IIO
+1
drivers/iio/Makefile
··· 13 13 obj-y += amplifiers/ 14 14 obj-y += light/ 15 15 obj-y += frequency/ 16 + obj-y += dac/
-1
drivers/staging/iio/Kconfig
··· 29 29 source "drivers/staging/iio/adc/Kconfig" 30 30 source "drivers/staging/iio/addac/Kconfig" 31 31 source "drivers/staging/iio/cdc/Kconfig" 32 - source "drivers/staging/iio/dac/Kconfig" 33 32 source "drivers/staging/iio/frequency/Kconfig" 34 33 source "drivers/staging/iio/gyro/Kconfig" 35 34 source "drivers/staging/iio/impedance-analyzer/Kconfig"
-1
drivers/staging/iio/Makefile
··· 17 17 obj-y += adc/ 18 18 obj-y += addac/ 19 19 obj-y += cdc/ 20 - obj-y += dac/ 21 20 obj-y += frequency/ 22 21 obj-y += gyro/ 23 22 obj-y += impedance-analyzer/
drivers/staging/iio/dac/Kconfig drivers/iio/dac/Kconfig
drivers/staging/iio/dac/Makefile drivers/iio/dac/Makefile
drivers/staging/iio/dac/ad5064.c drivers/iio/dac/ad5064.c
drivers/staging/iio/dac/ad5360.c drivers/iio/dac/ad5360.c
drivers/staging/iio/dac/ad5380.c drivers/iio/dac/ad5380.c
+1 -1
drivers/staging/iio/dac/ad5421.c drivers/iio/dac/ad5421.c
··· 19 19 #include <linux/iio/iio.h> 20 20 #include <linux/iio/sysfs.h> 21 21 #include <linux/iio/events.h> 22 - #include "ad5421.h" 22 + #include <linux/iio/dac/ad5421.h> 23 23 24 24 25 25 #define AD5421_REG_DAC_DATA 0x1
-4
drivers/staging/iio/dac/ad5421.h include/linux/iio/dac/ad5421.h
··· 1 1 #ifndef __IIO_DAC_AD5421_H__ 2 2 #define __IIO_DAC_AD5421_H__ 3 3 4 - /* 5 - * TODO: This file needs to go into include/linux/iio 6 - */ 7 - 8 4 /** 9 5 * enum ad5421_current_range - Current range the AD5421 is configured for. 10 6 * @AD5421_CURRENT_RANGE_4mA_20mA: 4 mA to 20 mA (RANGE1,0 pins = 00)
drivers/staging/iio/dac/ad5446.c drivers/iio/dac/ad5446.c
drivers/staging/iio/dac/ad5446.h drivers/iio/dac/ad5446.h
+1 -2
drivers/staging/iio/dac/ad5504.c drivers/iio/dac/ad5504.c
··· 19 19 #include <linux/iio/iio.h> 20 20 #include <linux/iio/sysfs.h> 21 21 #include <linux/iio/events.h> 22 - 23 - #include "ad5504.h" 22 + #include <linux/iio/dac/ad5504.h> 24 23 25 24 #define AD5505_BITS 12 26 25 #define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1)
-4
drivers/staging/iio/dac/ad5504.h include/linux/iio/dac/ad5504.h
··· 9 9 #ifndef SPI_AD5504_H_ 10 10 #define SPI_AD5504_H_ 11 11 12 - /* 13 - * TODO: struct ad5504_platform_data needs to go into include/linux/iio 14 - */ 15 - 16 12 struct ad5504_platform_data { 17 13 u16 vref_mv; 18 14 };
drivers/staging/iio/dac/ad5624r.h drivers/iio/dac/ad5624r.h
drivers/staging/iio/dac/ad5624r_spi.c drivers/iio/dac/ad5624r_spi.c
drivers/staging/iio/dac/ad5686.c drivers/iio/dac/ad5686.c
drivers/staging/iio/dac/ad5764.c drivers/iio/dac/ad5764.c
+1 -2
drivers/staging/iio/dac/ad5791.c drivers/iio/dac/ad5791.c
··· 19 19 20 20 #include <linux/iio/iio.h> 21 21 #include <linux/iio/sysfs.h> 22 - 23 - #include "ad5791.h" 22 + #include <linux/iio/dac/ad5791.h> 24 23 25 24 #define AD5791_RES_MASK(x) ((1 << (x)) - 1) 26 25 #define AD5791_DAC_MASK AD5791_RES_MASK(20)
-4
drivers/staging/iio/dac/ad5791.h include/linux/iio/dac/ad5791.h
··· 9 9 #ifndef SPI_AD5791_H_ 10 10 #define SPI_AD5791_H_ 11 11 12 - /* 13 - * TODO: struct ad5791_platform_data needs to go into include/linux/iio 14 - */ 15 - 16 12 /** 17 13 * struct ad5791_platform_data - platform specific information 18 14 * @vref_pos_mv: Vdd Positive Analog Supply Volatge (mV)
+1 -2
drivers/staging/iio/dac/max517.c drivers/iio/dac/max517.c
··· 27 27 28 28 #include <linux/iio/iio.h> 29 29 #include <linux/iio/sysfs.h> 30 - 31 - #include "max517.h" 30 + #include <linux/iio/dac/max517.h> 32 31 33 32 #define MAX517_DRV_NAME "max517" 34 33
-4
drivers/staging/iio/dac/max517.h include/linux/iio/dac/max517.h
··· 8 8 #ifndef IIO_DAC_MAX517_H_ 9 9 #define IIO_DAC_MAX517_H_ 10 10 11 - /* 12 - * TODO: struct max517_platform_data needs to go into include/linux/iio 13 - */ 14 - 15 11 struct max517_platform_data { 16 12 u16 vref_mv[2]; 17 13 };