summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Cameron <jic23@kernel.org>2012-05-05 10:56:41 +0100
committerJonathan Cameron <jic23@kernel.org>2012-06-30 10:15:28 +0100
commitcf82cb8128496955a38fa62e1819ceb1d596e2eb (patch)
tree330d177db4e6737e1a2b23a5708259c193c19d8f
parentf699d10202d50a764614ff9191b5c4b9dd75e36c (diff)
downloadblackbird-op-linux-cf82cb8128496955a38fa62e1819ceb1d596e2eb.tar.gz
blackbird-op-linux-cf82cb8128496955a38fa62e1819ceb1d596e2eb.zip
IIO: Add a modifier for x^2+y^2+z^2
There will probably be a number of such modifiers eventually but this one is used in the adis16240 accelerometer driver. Signed-off-by: Jonathan Cameron <jic23@kernel.org>
-rw-r--r--drivers/iio/industrialio-core.c1
-rw-r--r--include/linux/iio/types.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index e42749ec5c3c..bb3c692e49b8 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -71,6 +71,7 @@ static const char * const iio_modifier_names[] = {
[IIO_MOD_Y] = "y",
[IIO_MOD_Z] = "z",
[IIO_MOD_ROOT_SUM_SQUARED_X_Y] = "sqrt(x^2+y^2)",
+ [IIO_MOD_SUM_SQUARED_X_Y_Z] = "x^2+y^2+z^2",
[IIO_MOD_LIGHT_BOTH] = "both",
[IIO_MOD_LIGHT_IR] = "ir",
};
diff --git a/include/linux/iio/types.h b/include/linux/iio/types.h
index 210559ddf8a3..e25040173346 100644
--- a/include/linux/iio/types.h
+++ b/include/linux/iio/types.h
@@ -45,6 +45,7 @@ enum iio_modifier {
IIO_MOD_LIGHT_BOTH,
IIO_MOD_LIGHT_IR,
IIO_MOD_ROOT_SUM_SQUARED_X_Y,
+ IIO_MOD_SUM_SQUARED_X_Y_Z,
};
#define IIO_VAL_INT 1
OpenPOWER on IntegriCloud