From b85d11e5dbd7559f52ff3722173a5e6a6856a397 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 4 Jun 2012 11:36:28 +0200
Subject: [PATCH] --- yaml --- r: 317210 b: refs/heads/master c:
 dbdc025bb239ce62c9b4d28c459a98f22ce9ec0a h: refs/heads/master v: v3

---
 [refs]                                                    | 2 +-
 trunk/drivers/iio/Kconfig                                 | 1 +
 trunk/drivers/iio/Makefile                                | 1 +
 trunk/drivers/{staging => }/iio/dac/Kconfig               | 0
 trunk/drivers/{staging => }/iio/dac/Makefile              | 0
 trunk/drivers/{staging => }/iio/dac/ad5064.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5360.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5380.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5421.c              | 2 +-
 trunk/drivers/{staging => }/iio/dac/ad5446.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5446.h              | 0
 trunk/drivers/{staging => }/iio/dac/ad5504.c              | 3 +--
 trunk/drivers/{staging => }/iio/dac/ad5624r.h             | 0
 trunk/drivers/{staging => }/iio/dac/ad5624r_spi.c         | 0
 trunk/drivers/{staging => }/iio/dac/ad5686.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5764.c              | 0
 trunk/drivers/{staging => }/iio/dac/ad5791.c              | 3 +--
 trunk/drivers/{staging => }/iio/dac/max517.c              | 3 +--
 trunk/drivers/staging/iio/Kconfig                         | 1 -
 trunk/drivers/staging/iio/Makefile                        | 1 -
 trunk/{drivers/staging => include/linux}/iio/dac/ad5421.h | 4 ----
 trunk/{drivers/staging => include/linux}/iio/dac/ad5504.h | 4 ----
 trunk/{drivers/staging => include/linux}/iio/dac/ad5791.h | 4 ----
 trunk/{drivers/staging => include/linux}/iio/dac/max517.h | 4 ----
 24 files changed, 7 insertions(+), 26 deletions(-)
 rename trunk/drivers/{staging => }/iio/dac/Kconfig (100%)
 rename trunk/drivers/{staging => }/iio/dac/Makefile (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5064.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5360.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5380.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5421.c (99%)
 rename trunk/drivers/{staging => }/iio/dac/ad5446.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5446.h (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5504.c (99%)
 rename trunk/drivers/{staging => }/iio/dac/ad5624r.h (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5624r_spi.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5686.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5764.c (100%)
 rename trunk/drivers/{staging => }/iio/dac/ad5791.c (99%)
 rename trunk/drivers/{staging => }/iio/dac/max517.c (99%)
 rename trunk/{drivers/staging => include/linux}/iio/dac/ad5421.h (92%)
 rename trunk/{drivers/staging => include/linux}/iio/dac/ad5504.h (74%)
 rename trunk/{drivers/staging => include/linux}/iio/dac/ad5791.h (87%)
 rename trunk/{drivers/staging => include/linux}/iio/dac/max517.h (76%)

diff --git a/[refs] b/[refs]
index e30e08f4e251..6fb2fbb7f5a3 100644
--- 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
index 64c88e5cda4d..103349f2b3b5 100644
--- 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
index bd801c0bbc2f..c38fa2a40af2 100644
--- 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 b/trunk/drivers/iio/dac/Kconfig
similarity index 100%
rename from trunk/drivers/staging/iio/dac/Kconfig
rename to trunk/drivers/iio/dac/Kconfig
diff --git a/trunk/drivers/staging/iio/dac/Makefile b/trunk/drivers/iio/dac/Makefile
similarity index 100%
rename from trunk/drivers/staging/iio/dac/Makefile
rename to trunk/drivers/iio/dac/Makefile
diff --git a/trunk/drivers/staging/iio/dac/ad5064.c b/trunk/drivers/iio/dac/ad5064.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5064.c
rename to trunk/drivers/iio/dac/ad5064.c
diff --git a/trunk/drivers/staging/iio/dac/ad5360.c b/trunk/drivers/iio/dac/ad5360.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5360.c
rename to trunk/drivers/iio/dac/ad5360.c
diff --git a/trunk/drivers/staging/iio/dac/ad5380.c b/trunk/drivers/iio/dac/ad5380.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5380.c
rename to trunk/drivers/iio/dac/ad5380.c
diff --git a/trunk/drivers/staging/iio/dac/ad5421.c b/trunk/drivers/iio/dac/ad5421.c
similarity index 99%
rename from trunk/drivers/staging/iio/dac/ad5421.c
rename to trunk/drivers/iio/dac/ad5421.c
index ea2f83b4e357..cdbc5bf25c31 100644
--- a/trunk/drivers/staging/iio/dac/ad5421.c
+++ b/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 b/trunk/drivers/iio/dac/ad5446.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5446.c
rename to trunk/drivers/iio/dac/ad5446.c
diff --git a/trunk/drivers/staging/iio/dac/ad5446.h b/trunk/drivers/iio/dac/ad5446.h
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5446.h
rename to trunk/drivers/iio/dac/ad5446.h
diff --git a/trunk/drivers/staging/iio/dac/ad5504.c b/trunk/drivers/iio/dac/ad5504.c
similarity index 99%
rename from trunk/drivers/staging/iio/dac/ad5504.c
rename to trunk/drivers/iio/dac/ad5504.c
index 1289e9bc1688..242bdc7d0044 100644
--- a/trunk/drivers/staging/iio/dac/ad5504.c
+++ b/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 b/trunk/drivers/iio/dac/ad5624r.h
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5624r.h
rename to trunk/drivers/iio/dac/ad5624r.h
diff --git a/trunk/drivers/staging/iio/dac/ad5624r_spi.c b/trunk/drivers/iio/dac/ad5624r_spi.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5624r_spi.c
rename to trunk/drivers/iio/dac/ad5624r_spi.c
diff --git a/trunk/drivers/staging/iio/dac/ad5686.c b/trunk/drivers/iio/dac/ad5686.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5686.c
rename to trunk/drivers/iio/dac/ad5686.c
diff --git a/trunk/drivers/staging/iio/dac/ad5764.c b/trunk/drivers/iio/dac/ad5764.c
similarity index 100%
rename from trunk/drivers/staging/iio/dac/ad5764.c
rename to trunk/drivers/iio/dac/ad5764.c
diff --git a/trunk/drivers/staging/iio/dac/ad5791.c b/trunk/drivers/iio/dac/ad5791.c
similarity index 99%
rename from trunk/drivers/staging/iio/dac/ad5791.c
rename to trunk/drivers/iio/dac/ad5791.c
index 5de28c2a57ef..2bd2e37280ff 100644
--- a/trunk/drivers/staging/iio/dac/ad5791.c
+++ b/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 b/trunk/drivers/iio/dac/max517.c
similarity index 99%
rename from trunk/drivers/staging/iio/dac/max517.c
rename to trunk/drivers/iio/dac/max517.c
index 403e06fbc39e..92c77c82026c 100644
--- a/trunk/drivers/staging/iio/dac/max517.c
+++ b/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
index 3c8e5ec26ac1..04cd6ec1f70f 100644
--- 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
index 6a46d5afb380..fa6937d92ee3 100644
--- 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 b/trunk/include/linux/iio/dac/ad5421.h
similarity index 92%
rename from trunk/drivers/staging/iio/dac/ad5421.h
rename to trunk/include/linux/iio/dac/ad5421.h
index cd2bb84ff1b0..8fd8f057a890 100644
--- a/trunk/drivers/staging/iio/dac/ad5421.h
+++ b/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 b/trunk/include/linux/iio/dac/ad5504.h
similarity index 74%
rename from trunk/drivers/staging/iio/dac/ad5504.h
rename to trunk/include/linux/iio/dac/ad5504.h
index d4980bf688bf..43895376a9ca 100644
--- a/trunk/drivers/staging/iio/dac/ad5504.h
+++ b/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 b/trunk/include/linux/iio/dac/ad5791.h
similarity index 87%
rename from trunk/drivers/staging/iio/dac/ad5791.h
rename to trunk/include/linux/iio/dac/ad5791.h
index 87a6c922f18e..45ee281c6660 100644
--- a/trunk/drivers/staging/iio/dac/ad5791.h
+++ b/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 b/trunk/include/linux/iio/dac/max517.h
similarity index 76%
rename from trunk/drivers/staging/iio/dac/max517.h
rename to trunk/include/linux/iio/dac/max517.h
index 8106cf24642a..f6d1d252f08d 100644
--- a/trunk/drivers/staging/iio/dac/max517.h
+++ b/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];
 };