Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8548a63b authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Jonathan Cameron
Browse files

iio: Move generic buffer implementations to sub-directory 



For generic IIO trigger implementations we already have a sub-directory,
but the generic buffer implementations currently reside in the IIO
top-level directory. The main reason is that things have historically grown
into this form.

With more generic buffer implementations on its way now is the perfect time
to clean this up and introduce a sub-directory for generic buffer
implementations to avoid too much clutter in the top-level directory.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent 050ee2f1

Documentation/DocBook/iio.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -578,7 +578,7 @@ 
    work together.

    </para>

    <sect2 id="iiotrigbufsetup"> <title> IIO triggered buffer setup</title>

!Edrivers/iio/industrialio-triggered-buffer.c

!Edrivers/iio/buffer/industrialio-triggered-buffer.c

!Finclude/linux/iio/iio.h iio_buffer_setup_ops

drivers/iio/Kconfig

+1 −21
Original line number Diff line number Diff line
@@ -19,27 +19,7 @@ config IIO_BUFFER 
	  acquisition methods.



if IIO_BUFFER



config IIO_BUFFER_CB

	tristate "IIO callback buffer used for push in-kernel interfaces"

	help

	  Should be selected by any drivers that do in-kernel push

	  usage.  That is, those where the data is pushed to the consumer.



config IIO_KFIFO_BUF

	tristate "Industrial I/O buffering based on kfifo"

	help

	  A simple fifo based on kfifo.  Note that this currently provides

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

	  often to read from the buffer.



config IIO_TRIGGERED_BUFFER

	tristate

	select IIO_TRIGGER

	select IIO_KFIFO_BUF

	help

	  Provides helper functions for setting up triggered buffers.



	source "drivers/iio/buffer/Kconfig"

endif # IIO_BUFFER



config IIO_TRIGGER

drivers/iio/Makefile

+1 −4
Original line number Diff line number Diff line
@@ -7,13 +7,10 @@ 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_BUFFER_CB) += industrialio-buffer-cb.o

obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o

obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o



obj-y += accel/

obj-y += adc/

obj-y += amplifiers/

obj-y += buffer/

obj-y += common/

obj-y += dac/

obj-y += gyro/

drivers/iio/buffer/Kconfig

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

# Industrial I/O generic buffer implementations

#

# When adding new entries keep the list in alphabetical order



config IIO_BUFFER_CB

	tristate "IIO callback buffer used for push in-kernel interfaces"

	help

	  Should be selected by any drivers that do in-kernel push

	  usage.  That is, those where the data is pushed to the consumer.



config IIO_KFIFO_BUF

	tristate "Industrial I/O buffering based on kfifo"

	help

	  A simple fifo based on kfifo.  Note that this currently provides

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

	  often to read from the buffer.



config IIO_TRIGGERED_BUFFER

	tristate

	select IIO_TRIGGER

	select IIO_KFIFO_BUF

	help

	  Provides helper functions for setting up triggered buffers.

drivers/iio/buffer/Makefile

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

# Makefile for the industrial I/O buffer implementations

#



# When adding new entries keep the list in alphabetical order

obj-$(CONFIG_IIO_BUFFER_CB) += industrialio-buffer-cb.o

obj-$(CONFIG_IIO_TRIGGERED_BUFFER) += industrialio-triggered-buffer.o

obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o