Commit dbdc025b authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Greg Kroah-Hartman

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Acked-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 20374d1a
...@@ -52,5 +52,6 @@ source "drivers/iio/adc/Kconfig" ...@@ -52,5 +52,6 @@ source "drivers/iio/adc/Kconfig"
source "drivers/iio/amplifiers/Kconfig" source "drivers/iio/amplifiers/Kconfig"
source "drivers/iio/light/Kconfig" source "drivers/iio/light/Kconfig"
source "drivers/iio/frequency/Kconfig" source "drivers/iio/frequency/Kconfig"
source "drivers/iio/dac/Kconfig"
endif # IIO endif # IIO
...@@ -13,3 +13,4 @@ obj-y += adc/ ...@@ -13,3 +13,4 @@ obj-y += adc/
obj-y += amplifiers/ obj-y += amplifiers/
obj-y += light/ obj-y += light/
obj-y += frequency/ obj-y += frequency/
obj-y += dac/
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/iio/events.h> #include <linux/iio/events.h>
#include "ad5421.h" #include <linux/iio/dac/ad5421.h>
#define AD5421_REG_DAC_DATA 0x1 #define AD5421_REG_DAC_DATA 0x1
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/iio/events.h> #include <linux/iio/events.h>
#include <linux/iio/dac/ad5504.h>
#include "ad5504.h"
#define AD5505_BITS 12 #define AD5505_BITS 12
#define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1) #define AD5504_RES_MASK ((1 << (AD5505_BITS)) - 1)
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/iio/dac/ad5791.h>
#include "ad5791.h"
#define AD5791_RES_MASK(x) ((1 << (x)) - 1) #define AD5791_RES_MASK(x) ((1 << (x)) - 1)
#define AD5791_DAC_MASK AD5791_RES_MASK(20) #define AD5791_DAC_MASK AD5791_RES_MASK(20)
......
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
#include <linux/iio/iio.h> #include <linux/iio/iio.h>
#include <linux/iio/sysfs.h> #include <linux/iio/sysfs.h>
#include <linux/iio/dac/max517.h>
#include "max517.h"
#define MAX517_DRV_NAME "max517" #define MAX517_DRV_NAME "max517"
......
...@@ -29,7 +29,6 @@ source "drivers/staging/iio/accel/Kconfig" ...@@ -29,7 +29,6 @@ source "drivers/staging/iio/accel/Kconfig"
source "drivers/staging/iio/adc/Kconfig" source "drivers/staging/iio/adc/Kconfig"
source "drivers/staging/iio/addac/Kconfig" source "drivers/staging/iio/addac/Kconfig"
source "drivers/staging/iio/cdc/Kconfig" source "drivers/staging/iio/cdc/Kconfig"
source "drivers/staging/iio/dac/Kconfig"
source "drivers/staging/iio/frequency/Kconfig" source "drivers/staging/iio/frequency/Kconfig"
source "drivers/staging/iio/gyro/Kconfig" source "drivers/staging/iio/gyro/Kconfig"
source "drivers/staging/iio/impedance-analyzer/Kconfig" source "drivers/staging/iio/impedance-analyzer/Kconfig"
......
...@@ -17,7 +17,6 @@ obj-y += accel/ ...@@ -17,7 +17,6 @@ obj-y += accel/
obj-y += adc/ obj-y += adc/
obj-y += addac/ obj-y += addac/
obj-y += cdc/ obj-y += cdc/
obj-y += dac/
obj-y += frequency/ obj-y += frequency/
obj-y += gyro/ obj-y += gyro/
obj-y += impedance-analyzer/ obj-y += impedance-analyzer/
......
#ifndef __IIO_DAC_AD5421_H__ #ifndef __IIO_DAC_AD5421_H__
#define __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. * 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) * @AD5421_CURRENT_RANGE_4mA_20mA: 4 mA to 20 mA (RANGE1,0 pins = 00)
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
#ifndef SPI_AD5504_H_ #ifndef SPI_AD5504_H_
#define SPI_AD5504_H_ #define SPI_AD5504_H_
/*
* TODO: struct ad5504_platform_data needs to go into include/linux/iio
*/
struct ad5504_platform_data { struct ad5504_platform_data {
u16 vref_mv; u16 vref_mv;
}; };
......
...@@ -9,10 +9,6 @@ ...@@ -9,10 +9,6 @@
#ifndef SPI_AD5791_H_ #ifndef SPI_AD5791_H_
#define 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 * struct ad5791_platform_data - platform specific information
* @vref_pos_mv: Vdd Positive Analog Supply Volatge (mV) * @vref_pos_mv: Vdd Positive Analog Supply Volatge (mV)
......
...@@ -8,10 +8,6 @@ ...@@ -8,10 +8,6 @@
#ifndef IIO_DAC_MAX517_H_ #ifndef IIO_DAC_MAX517_H_
#define 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 { struct max517_platform_data {
u16 vref_mv[2]; u16 vref_mv[2];
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment