[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1319103187-27791-4-git-send-email-jic23@cam.ac.uk>
Date: Thu, 20 Oct 2011 10:33:04 +0100
From: Jonathan Cameron <jic23@....ac.uk>
To: linux-kernel@...r.kernel.org, linux-iio@...r.kernel.org
Cc: linus.ml.walleij@...il.com, zdevai@...il.com,
linux@....linux.org.uk, arnd@...db.de,
broonie@...nsource.wolfsonmicro.com, gregkh@...e.de,
lm-sensors@...sensors.org, guenter.roeck@...csson.com,
khali@...ux-fr.org, thomas.petazzoni@...e-electrons.com,
maxime.ripard@...e-electrons.com,
Jonathan Cameron <jic23@....ac.uk>
Subject: [PATCH 3/6] IIO:CORE: put defs needed by inkern and userspace interfaces into chan_spec.h
Signed-off-by: Jonathan Cameron <jic23@....ac.uk>
---
include/linux/iio/chan_spec.h | 46 +++++++++++++++++++++++++++++++++++++++++
include/linux/iio/iio.h | 33 +----------------------------
2 files changed, 47 insertions(+), 32 deletions(-)
diff --git a/include/linux/iio/chan_spec.h b/include/linux/iio/chan_spec.h
new file mode 100644
index 0000000..933480b
--- /dev/null
+++ b/include/linux/iio/chan_spec.h
@@ -0,0 +1,46 @@
+/*
+ * The industrial I/O channel descriptions
+ *
+ * Copyright (c) 2008-2011 Jonathan Cameron
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published by
+ * the Free Software Foundation.
+ */
+
+#ifndef _IIO_CHAN_SPEC_H_
+#define _IIO_CHAN_SPEC_H_
+
+enum iio_data_type {
+ IIO_RAW,
+ IIO_PROCESSED,
+};
+
+enum iio_direction {
+ IIO_IN,
+ IIO_OUT,
+};
+
+enum iio_chan_type {
+ IIO_VOLTAGE,
+ IIO_CURRENT,
+ IIO_POWER,
+ IIO_CAPACITANCE,
+ IIO_ACCEL,
+ IIO_ANGL_VEL,
+ IIO_MAGN,
+ IIO_LIGHT,
+ IIO_INTENSITY,
+ IIO_PROXIMITY,
+ IIO_TEMP,
+ IIO_INCLI,
+ IIO_ROT,
+ IIO_ANGL,
+ IIO_TIMESTAMP,
+};
+
+#define IIO_VAL_INT 1
+#define IIO_VAL_INT_PLUS_MICRO 2
+#define IIO_VAL_INT_PLUS_NANO 3
+
+#endif
diff --git a/include/linux/iio/iio.h b/include/linux/iio/iio.h
index beedc5c..8b98e92 100644
--- a/include/linux/iio/iio.h
+++ b/include/linux/iio/iio.h
@@ -9,6 +9,7 @@
*/
#include <linux/klist.h>
#include <linux/device.h>
+#include <linux/iio/chan_spec.h>
#ifndef _IIO_H_
#define _IIO_H_
@@ -16,29 +17,6 @@
/* Minimum alignment of priv within iio_dev */
#define IIO_ALIGN L1_CACHE_BYTES
-enum iio_data_type {
- IIO_RAW,
- IIO_PROCESSED,
-};
-
-enum iio_chan_type {
- IIO_VOLTAGE,
- IIO_CURRENT,
- IIO_POWER,
- IIO_CAPACITANCE,
- IIO_ACCEL,
- IIO_ANGL_VEL,
- IIO_MAGN,
- IIO_LIGHT,
- IIO_INTENSITY,
- IIO_PROXIMITY,
- IIO_TEMP,
- IIO_INCLI,
- IIO_ROT,
- IIO_ANGL,
- IIO_TIMESTAMP,
-};
-
enum iio_modifier {
IIO_NO_MOD,
IIO_MOD_X,
@@ -73,15 +51,6 @@ enum iio_chan_info_enum {
IIO_CHAN_INFO_QUADRATURE_CORRECTION_RAW_SEPARATE,
};
-enum iio_direction {
- IIO_IN,
- IIO_OUT,
-};
-
-#define IIO_VAL_INT 1
-#define IIO_VAL_INT_PLUS_MICRO 2
-#define IIO_VAL_INT_PLUS_NANO 3
-
/**
* struct iio_chan_spec - specification of a single channel
* @type: What type of measurement is the channel making.
--
1.7.7
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists