Эх сурвалжийг харах

iio:trigger:sysfs Move out of staging.

This simple driver is rather useful. No issues about its interface
have been raised for some time hence the proposal to move it out
of staging.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Jonathan Cameron 12 жил өмнө
parent
commit
e64e7d5c8c

+ 3 - 0
drivers/iio/Kconfig

@@ -70,5 +70,8 @@ source "drivers/iio/gyro/Kconfig"
 source "drivers/iio/imu/Kconfig"
 source "drivers/iio/imu/Kconfig"
 source "drivers/iio/light/Kconfig"
 source "drivers/iio/light/Kconfig"
 source "drivers/iio/magnetometer/Kconfig"
 source "drivers/iio/magnetometer/Kconfig"
+if IIO_TRIGGER
+   source "drivers/iio/trigger/Kconfig"
+endif #IIO_TRIGGER
 
 
 endif # IIO
 endif # IIO

+ 1 - 0
drivers/iio/Makefile

@@ -21,3 +21,4 @@ obj-y += frequency/
 obj-y += imu/
 obj-y += imu/
 obj-y += light/
 obj-y += light/
 obj-y += magnetometer/
 obj-y += magnetometer/
+obj-y += trigger/

+ 17 - 0
drivers/iio/trigger/Kconfig

@@ -0,0 +1,17 @@
+#
+# Industrial I/O standalone triggers
+#
+menu "Triggers - standalone"
+
+config IIO_SYSFS_TRIGGER
+	tristate "SYSFS trigger"
+	depends on SYSFS
+	select IRQ_WORK
+	help
+	  Provides support for using SYSFS entry as IIO triggers.
+	  If unsure, say N (but it's safe to say "Y").
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called iio-trig-sysfs.
+
+endmenu

+ 5 - 0
drivers/iio/trigger/Makefile

@@ -0,0 +1,5 @@
+#
+# Makefile for triggers not associated with iio-devices
+#
+
+obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o

+ 0 - 0
drivers/staging/iio/trigger/iio-trig-sysfs.c → drivers/iio/trigger/iio-trig-sysfs.c


+ 0 - 11
drivers/staging/iio/trigger/Kconfig

@@ -18,17 +18,6 @@ config IIO_GPIO_TRIGGER
 	help
 	help
 	  Provides support for using GPIO pins as IIO triggers.
 	  Provides support for using GPIO pins as IIO triggers.
 
 
-config IIO_SYSFS_TRIGGER
-	tristate "SYSFS trigger"
-	depends on SYSFS
-	select IRQ_WORK
-	help
-	  Provides support for using SYSFS entry as IIO triggers.
-	  If unsure, say N (but it's safe to say "Y").
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called iio-trig-sysfs.
-
 config IIO_BFIN_TMR_TRIGGER
 config IIO_BFIN_TMR_TRIGGER
 	tristate "Blackfin TIMER trigger"
 	tristate "Blackfin TIMER trigger"
 	depends on BLACKFIN
 	depends on BLACKFIN

+ 0 - 1
drivers/staging/iio/trigger/Makefile

@@ -4,5 +4,4 @@
 
 
 obj-$(CONFIG_IIO_PERIODIC_RTC_TRIGGER) += iio-trig-periodic-rtc.o
 obj-$(CONFIG_IIO_PERIODIC_RTC_TRIGGER) += iio-trig-periodic-rtc.o
 obj-$(CONFIG_IIO_GPIO_TRIGGER) += iio-trig-gpio.o
 obj-$(CONFIG_IIO_GPIO_TRIGGER) += iio-trig-gpio.o
-obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o
 obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o
 obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o