From c7a8be08da50eb5e30eaa6555079c10b8e23521a Mon Sep 17 00:00:00 2001 From: Jonathan Cameron Date: Sun, 2 Jun 2013 20:00:00 +0100 Subject: [PATCH] iio:triggers:interrupt trigger - move out of staging. This is now a very simple trigger indeed but useful in many common cases. Signed-off-by: Jonathan Cameron Reviewed-by: Lars-Peter Clausen --- drivers/iio/trigger/Kconfig | 9 +++++++++ drivers/iio/trigger/Makefile | 1 + drivers/{staging => }/iio/trigger/iio-trig-interrupt.c | 0 drivers/staging/iio/trigger/Kconfig | 6 ------ drivers/staging/iio/trigger/Makefile | 1 - 5 files changed, 10 insertions(+), 7 deletions(-) rename drivers/{staging => }/iio/trigger/iio-trig-interrupt.c (100%) diff --git a/drivers/iio/trigger/Kconfig b/drivers/iio/trigger/Kconfig index a4e68db..360fd50 100644 --- a/drivers/iio/trigger/Kconfig +++ b/drivers/iio/trigger/Kconfig @@ -3,6 +3,15 @@ # menu "Triggers - standalone" +config IIO_INTERRUPT_TRIGGER + tristate "Generic interrupt trigger" + help + Provides support for using an interrupt of any type as an IIO + trigger. This may be provided by a gpio driver for example. + + To compile this driver as a module, choose M here: the + module will be called iio-trig-interrupt. + config IIO_SYSFS_TRIGGER tristate "SYSFS trigger" depends on SYSFS diff --git a/drivers/iio/trigger/Makefile b/drivers/iio/trigger/Makefile index e0b2183..ce319a5 100644 --- a/drivers/iio/trigger/Makefile +++ b/drivers/iio/trigger/Makefile @@ -2,4 +2,5 @@ # Makefile for triggers not associated with iio-devices # +obj-$(CONFIG_IIO_INTERRUPT_TRIGGER) += iio-trig-interrupt.o obj-$(CONFIG_IIO_SYSFS_TRIGGER) += iio-trig-sysfs.o diff --git a/drivers/staging/iio/trigger/iio-trig-interrupt.c b/drivers/iio/trigger/iio-trig-interrupt.c similarity index 100% rename from drivers/staging/iio/trigger/iio-trig-interrupt.c rename to drivers/iio/trigger/iio-trig-interrupt.c diff --git a/drivers/staging/iio/trigger/Kconfig b/drivers/staging/iio/trigger/Kconfig index 4ecb213..2fd18c6 100644 --- a/drivers/staging/iio/trigger/Kconfig +++ b/drivers/staging/iio/trigger/Kconfig @@ -12,12 +12,6 @@ config IIO_PERIODIC_RTC_TRIGGER Provides support for using periodic capable real time clocks as IIO triggers. -config IIO_INTERRUPT_TRIGGER - tristate "Generic interrupt trigger" - help - Provides support for using interrupts of various types as IIO - triggers. These may be provided by a gpio driver for example. - config IIO_BFIN_TMR_TRIGGER tristate "Blackfin TIMER trigger" depends on BLACKFIN diff --git a/drivers/staging/iio/trigger/Makefile b/drivers/staging/iio/trigger/Makefile index 48f2236..238481b 100644 --- a/drivers/staging/iio/trigger/Makefile +++ b/drivers/staging/iio/trigger/Makefile @@ -3,5 +3,4 @@ # obj-$(CONFIG_IIO_PERIODIC_RTC_TRIGGER) += iio-trig-periodic-rtc.o -obj-$(CONFIG_IIO_INTERRUPT_TRIGGER) += iio-trig-interrupt.o obj-$(CONFIG_IIO_BFIN_TMR_TRIGGER) += iio-trig-bfin-timer.o -- 2.7.4