---

yaml --- r: 317210 b: refs/heads/master c: dbdc025 h: refs/heads/master v: v3
git-mirror · Jun 5, 2012 · b85d11e · b85d11e
1 parent 7de223f
commit b85d11e
Show file tree

Hide file tree

Showing 24 changed files with 7 additions and 26 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20374d1a36df3e20cd6742ba376684e5506254a8
+refs/heads/master: dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a
diff --git a/trunk/drivers/iio/Kconfig b/trunk/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/trunk/drivers/iio/Makefile b/trunk/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/trunk/drivers/staging/iio/dac/Kconfig → trunk/drivers/iio/dac/Kconfig b/trunk/drivers/staging/iio/dac/Kconfig → trunk/drivers/iio/dac/Kconfig
diff --git a/trunk/drivers/staging/iio/dac/Makefile → trunk/drivers/iio/dac/Makefile b/trunk/drivers/staging/iio/dac/Makefile → trunk/drivers/iio/dac/Makefile
diff --git a/trunk/drivers/staging/iio/dac/ad5064.c → trunk/drivers/iio/dac/ad5064.c b/trunk/drivers/staging/iio/dac/ad5064.c → trunk/drivers/iio/dac/ad5064.c
diff --git a/trunk/drivers/staging/iio/dac/ad5360.c → trunk/drivers/iio/dac/ad5360.c b/trunk/drivers/staging/iio/dac/ad5360.c → trunk/drivers/iio/dac/ad5360.c
diff --git a/trunk/drivers/staging/iio/dac/ad5380.c → trunk/drivers/iio/dac/ad5380.c b/trunk/drivers/staging/iio/dac/ad5380.c → trunk/drivers/iio/dac/ad5380.c
diff --git a/trunk/drivers/staging/iio/dac/ad5421.c → trunk/drivers/iio/dac/ad5421.c b/trunk/drivers/staging/iio/dac/ad5421.c → trunk/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/trunk/drivers/staging/iio/dac/ad5446.c → trunk/drivers/iio/dac/ad5446.c b/trunk/drivers/staging/iio/dac/ad5446.c → trunk/drivers/iio/dac/ad5446.c
diff --git a/trunk/drivers/staging/iio/dac/ad5446.h → trunk/drivers/iio/dac/ad5446.h b/trunk/drivers/staging/iio/dac/ad5446.h → trunk/drivers/iio/dac/ad5446.h
diff --git a/trunk/drivers/staging/iio/dac/ad5504.c → trunk/drivers/iio/dac/ad5504.c b/trunk/drivers/staging/iio/dac/ad5504.c → trunk/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/trunk/drivers/staging/iio/dac/ad5624r.h → trunk/drivers/iio/dac/ad5624r.h b/trunk/drivers/staging/iio/dac/ad5624r.h → trunk/drivers/iio/dac/ad5624r.h
diff --git a/trunk/drivers/staging/iio/dac/ad5624r_spi.c → trunk/drivers/iio/dac/ad5624r_spi.c b/trunk/drivers/staging/iio/dac/ad5624r_spi.c → trunk/drivers/iio/dac/ad5624r_spi.c
diff --git a/trunk/drivers/staging/iio/dac/ad5686.c → trunk/drivers/iio/dac/ad5686.c b/trunk/drivers/staging/iio/dac/ad5686.c → trunk/drivers/iio/dac/ad5686.c
diff --git a/trunk/drivers/staging/iio/dac/ad5764.c → trunk/drivers/iio/dac/ad5764.c b/trunk/drivers/staging/iio/dac/ad5764.c → trunk/drivers/iio/dac/ad5764.c
diff --git a/trunk/drivers/staging/iio/dac/ad5791.c → trunk/drivers/iio/dac/ad5791.c b/trunk/drivers/staging/iio/dac/ad5791.c → trunk/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/trunk/drivers/staging/iio/dac/max517.c → trunk/drivers/iio/dac/max517.c b/trunk/drivers/staging/iio/dac/max517.c → trunk/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/trunk/drivers/staging/iio/Kconfig b/trunk/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/trunk/drivers/staging/iio/Makefile b/trunk/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/trunk/drivers/staging/iio/dac/ad5421.h → trunk/include/linux/iio/dac/ad5421.h b/trunk/drivers/staging/iio/dac/ad5421.h → trunk/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/trunk/drivers/staging/iio/dac/ad5504.h → trunk/include/linux/iio/dac/ad5504.h b/trunk/drivers/staging/iio/dac/ad5504.h → trunk/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/trunk/drivers/staging/iio/dac/ad5791.h → trunk/include/linux/iio/dac/ad5791.h b/trunk/drivers/staging/iio/dac/ad5791.h → trunk/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/trunk/drivers/staging/iio/dac/max517.h → trunk/include/linux/iio/dac/max517.h b/trunk/drivers/staging/iio/dac/max517.h → trunk/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];
 };