0180233b451c8deeb2fd13aa9eeb1a21702dacdd4265a6967e26631a.patch

From 85439e87dbe5ceb0cd5190d4967d80f5dbdf0236 Mon Sep 17 00:00:00 2001
From: Gwendal Grignou <gwendal@chromium.org>
Date: Tue, 8 Sep 2015 09:46:08 -0700
Subject: [PATCH] CHROMIUM: iio: core: Add double tap gesture

Add double tap as possible gesture.
This is an inteface change: however, the sysfs entry is based on string,
so if other gestures are added on the trunk in the meantime, we will
still be able to merge this change.

BUG=chrome-os-partner:44754
TEST=compile. Check with cros_iio_activity driver.

Change-Id: I7700b02a8172b59975f8c1eda3e4e3b6d1b93508
Signed-off-by: Gwendal Grignou <gwendal@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/297838
Reviewed-by: Dmitry Torokhov <dtor@chromium.org>
Conflicts:
	drivers/iio/industrialio-core.c
	include/linux/iio/types.h
[rebase44(groeck): Resolved conflicts]
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Conflicts:
	include/linux/iio/types.h
[rebase49(groeck): Resolved conflicts]
Signed-off-by: Guenter Roeck <groeck@chromium.org>
Conflicts:
	include/uapi/linux/iio/types.h
[rebase419(groeck): Resolved conflicts]
Signed-off-by: Guenter Roeck <groeck@chromium.org>
[rebase54(gwendal): Resolved conflicts]
Conflicts:
	drivers/iio/industrialio-core.c
	include/uapi/linux/iio/types.h
[rebase510(groeck): Context conflicts]
Signed-off-by: Guenter Roeck <groeck@chromium.org>
---
 drivers/iio/industrialio-core.c | 1 +
 include/uapi/linux/iio/types.h  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c
index 151ff39933548c73b3362b89e230ad7bb30c807d..61922ee7daf83e182cd5a93118945ddf3406b842 100644
--- a/drivers/iio/industrialio-core.c
+++ b/drivers/iio/industrialio-core.c
@@ -140,6 +140,7 @@ static const char * const iio_modifier_names[] = {
 	[IIO_MOD_PITCH] = "pitch",
 	[IIO_MOD_YAW] = "yaw",
 	[IIO_MOD_ROLL] = "roll",
+	[IIO_MOD_DOUBLE_TAP] = "double_tap",
 };
 
 /* relies on pairs of these shared then separate */
diff --git a/include/uapi/linux/iio/types.h b/include/uapi/linux/iio/types.h
index c79f2f046a0be1c6d71a0bcb9e6378b8bce04b3c..b8f6259ab18550ff8a963f9fe7da630cae94e1e5 100644
--- a/include/uapi/linux/iio/types.h
+++ b/include/uapi/linux/iio/types.h
@@ -101,6 +101,7 @@ enum iio_modifier {
 	IIO_MOD_PITCH,
 	IIO_MOD_YAW,
 	IIO_MOD_ROLL,
+	IIO_MOD_DOUBLE_TAP,
 };
 
 enum iio_event_type {
-- 
2.38.1.584.g0f3c55d4c2-goog