counter: Move counter enums to uapi header

This is in preparation for a subsequent patch implementing a character
device interface for the Counter subsystem.

Reviewed-by: David Lechner <david@lechnology.com>
Signed-off-by: William Breathitt Gray <vilhelm.gray@gmail.com>
Link: https://lore.kernel.org/r/962a5f2027fafcf4f77c10e1baf520463960d1ee.1632884256.git.vilhelm.gray@gmail.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index b98a34fcec4b4a3c8c82e64cea1e74373025183e..8310a42abdab9a3d977ea071b95c0829ab0d3931 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4804,6 +4804,7 @@ F:        Documentation/ABI/testing/sysfs-bus-counter
 F:     Documentation/driver-api/generic-counter.rst
 F:     drivers/counter/
 F:     include/linux/counter.h
+F:     include/uapi/linux/counter.h
 
 CP2615 I2C DRIVER
 M:     Bence Csókás <bence98@sch.bme.hu>

diff --git a/include/linux/counter.h b/include/linux/counter.h
index 445f22d8bfe2d9b11be140a65643b9c150e8889e..7c9f7e23953a0bc86969d52777880ef4f975ea56 100644 (file)
--- a/include/linux/counter.h
+++ b/include/linux/counter.h
@@ -9,6 +9,7 @@
 #include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/types.h>
+#include <uapi/linux/counter.h>
 
 struct counter_device;
 struct counter_count;
@@ -27,47 +28,6 @@ enum counter_comp_type {
        COUNTER_COMP_COUNT_MODE,
 };
 
-enum counter_scope {
-       COUNTER_SCOPE_DEVICE,
-       COUNTER_SCOPE_SIGNAL,
-       COUNTER_SCOPE_COUNT,
-};
-
-enum counter_count_direction {
-       COUNTER_COUNT_DIRECTION_FORWARD,
-       COUNTER_COUNT_DIRECTION_BACKWARD,
-};
-
-enum counter_count_mode {
-       COUNTER_COUNT_MODE_NORMAL,
-       COUNTER_COUNT_MODE_RANGE_LIMIT,
-       COUNTER_COUNT_MODE_NON_RECYCLE,
-       COUNTER_COUNT_MODE_MODULO_N,
-};
-
-enum counter_function {
-       COUNTER_FUNCTION_INCREASE,
-       COUNTER_FUNCTION_DECREASE,
-       COUNTER_FUNCTION_PULSE_DIRECTION,
-       COUNTER_FUNCTION_QUADRATURE_X1_A,
-       COUNTER_FUNCTION_QUADRATURE_X1_B,
-       COUNTER_FUNCTION_QUADRATURE_X2_A,
-       COUNTER_FUNCTION_QUADRATURE_X2_B,
-       COUNTER_FUNCTION_QUADRATURE_X4,
-};
-
-enum counter_signal_level {
-       COUNTER_SIGNAL_LEVEL_LOW,
-       COUNTER_SIGNAL_LEVEL_HIGH,
-};
-
-enum counter_synapse_action {
-       COUNTER_SYNAPSE_ACTION_NONE,
-       COUNTER_SYNAPSE_ACTION_RISING_EDGE,
-       COUNTER_SYNAPSE_ACTION_FALLING_EDGE,
-       COUNTER_SYNAPSE_ACTION_BOTH_EDGES,
-};
-
 /**
  * struct counter_comp - Counter component node
  * @type:              Counter component data type

diff --git a/include/uapi/linux/counter.h b/include/uapi/linux/counter.h
new file mode 100644 (file)
index 0000000..6113938
--- /dev/null
+++ b/include/uapi/linux/counter.h
@@ -0,0 +1,56 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
+ * Userspace ABI for Counter character devices
+ * Copyright (C) 2020 William Breathitt Gray
+ */
+#ifndef _UAPI_COUNTER_H_
+#define _UAPI_COUNTER_H_
+
+/* Component scope definitions */
+enum counter_scope {
+       COUNTER_SCOPE_DEVICE,
+       COUNTER_SCOPE_SIGNAL,
+       COUNTER_SCOPE_COUNT,
+};
+
+/* Count direction values */
+enum counter_count_direction {
+       COUNTER_COUNT_DIRECTION_FORWARD,
+       COUNTER_COUNT_DIRECTION_BACKWARD,
+};
+
+/* Count mode values */
+enum counter_count_mode {
+       COUNTER_COUNT_MODE_NORMAL,
+       COUNTER_COUNT_MODE_RANGE_LIMIT,
+       COUNTER_COUNT_MODE_NON_RECYCLE,
+       COUNTER_COUNT_MODE_MODULO_N,
+};
+
+/* Count function values */
+enum counter_function {
+       COUNTER_FUNCTION_INCREASE,
+       COUNTER_FUNCTION_DECREASE,
+       COUNTER_FUNCTION_PULSE_DIRECTION,
+       COUNTER_FUNCTION_QUADRATURE_X1_A,
+       COUNTER_FUNCTION_QUADRATURE_X1_B,
+       COUNTER_FUNCTION_QUADRATURE_X2_A,
+       COUNTER_FUNCTION_QUADRATURE_X2_B,
+       COUNTER_FUNCTION_QUADRATURE_X4,
+};
+
+/* Signal values */
+enum counter_signal_level {
+       COUNTER_SIGNAL_LEVEL_LOW,
+       COUNTER_SIGNAL_LEVEL_HIGH,
+};
+
+/* Action mode values */
+enum counter_synapse_action {
+       COUNTER_SYNAPSE_ACTION_NONE,
+       COUNTER_SYNAPSE_ACTION_RISING_EDGE,
+       COUNTER_SYNAPSE_ACTION_FALLING_EDGE,
+       COUNTER_SYNAPSE_ACTION_BOTH_EDGES,
+};
+
+#endif /* _UAPI_COUNTER_H_ */