Commit a980e046 authored by Jonathan Cameron's avatar Jonathan Cameron Committed by Greg Kroah-Hartman
Browse files

IIO: Move the core files to drivers/iio 



Take the core support + the kfifo buffer implentation out of
staging.  Whilst we are far from done in improving this subsystem
it is now at a stage where the userspae interfaces (provided by
the core) can be considered stable.

Drivers will follow over a longer time scale.

Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 06458e27

drivers/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -140,4 +140,6 @@ source "drivers/virt/Kconfig" 


source "drivers/devfreq/Kconfig"



source "drivers/iio/Kconfig"



endmenu

drivers/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -134,3 +134,4 @@ obj-$(CONFIG_VIRT_DRIVERS) += virt/ 
obj-$(CONFIG_HYPERV)		+= hv/



obj-$(CONFIG_PM_DEVFREQ)	+= devfreq/

obj-$(CONFIG_IIO)		+= iio/

drivers/iio/Kconfig

0 → 100644
+51 −0
Original line number Diff line number Diff line 
#

# Industrial I/O subsytem configuration

#



menuconfig IIO

	tristate "Industrial I/O support"

	depends on GENERIC_HARDIRQS

	help

	  The industrial I/O subsystem provides a unified framework for

	  drivers for many different types of embedded sensors using a

	  number of different physical interfaces (i2c, spi, etc). See

	  Documentation/iio for more information.



if IIO



config IIO_BUFFER

	bool "Enable buffer support within IIO"

	help

	  Provide core support for various buffer based data

	  acquisition methods.



if IIO_BUFFER



config IIO_KFIFO_BUF

	select IIO_TRIGGER

	tristate "Industrial I/O buffering based on kfifo"

	help

	  A simple fifo based on kfifo.  Use this if you want a fifo

	  rather than a ring buffer. Note that this currently provides

	  no buffer events so it is up to userspace to work out how

	  often to read from the buffer.



endif # IIO_BUFFER



config IIO_TRIGGER

	boolean "Enable triggered sampling support"

	help

	  Provides IIO core support for triggers.  Currently these

	  are used to initialize capture of samples to push into

	  ring buffers.  The triggers are effectively a 'capture

	  data now' interrupt.



config IIO_CONSUMERS_PER_TRIGGER

       int "Maximum number of consumers per trigger"

       depends on IIO_TRIGGER

       default "2"

       help

	This value controls the maximum number of consumers that a

	given trigger may handle. Default is 2.



endif # IIO

drivers/iio/Makefile

0 → 100644
+10 −0
Original line number Diff line number Diff line 
#

# Makefile for the industrial I/O core.

#



obj-$(CONFIG_IIO) += industrialio.o

industrialio-y := industrialio-core.o industrialio-event.o inkern.o

industrialio-$(CONFIG_IIO_BUFFER) += industrialio-buffer.o

industrialio-$(CONFIG_IIO_TRIGGER) += industrialio-trigger.o



obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o