Skip to content

Commit

Permalink
iio: Move IIO Dummy Driver out of staging
Browse files Browse the repository at this point in the history
This patch moves the reference IIO dummy driver from drivers/staging/iio
into a separate folder, drivers/iio/dummy and adds the proper Kconfig
and Makefile for it.

A new config menu entry called IIO dummy driver has also been added
in the Industrial I/O support menu, corresponding to this driver.

Signed-off-by: Cristina Opriceana <cristina.opriceana@gmail.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
  • Loading branch information
Cristina Opriceana authored and Jonathan Cameron committed Oct 25, 2015
1 parent f0b1643 commit 415f792
Show file tree
Hide file tree
Showing 12 changed files with 79 additions and 32 deletions.
1 change: 1 addition & 0 deletions drivers/iio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ source "drivers/iio/amplifiers/Kconfig"
source "drivers/iio/chemical/Kconfig"
source "drivers/iio/common/Kconfig"
source "drivers/iio/dac/Kconfig"
source "drivers/iio/dummy/Kconfig"
source "drivers/iio/frequency/Kconfig"
source "drivers/iio/gyro/Kconfig"
source "drivers/iio/humidity/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/iio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ obj-y += buffer/
obj-y += chemical/
obj-y += common/
obj-y += dac/
obj-y += dummy/
obj-y += gyro/
obj-y += frequency/
obj-y += humidity/
Expand Down
35 changes: 35 additions & 0 deletions drivers/iio/dummy/Kconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
#
# Industrial I/O subsystem Dummy Driver configuration
#
menu "IIO dummy driver"
depends on IIO

config IIO_DUMMY_EVGEN
tristate

config IIO_SIMPLE_DUMMY
tristate "An example driver with no hardware requirements"
help
Driver intended mainly as documentation for how to write
a driver. May also be useful for testing userspace code
without hardware.

if IIO_SIMPLE_DUMMY

config IIO_SIMPLE_DUMMY_EVENTS
bool "Event generation support"
select IIO_DUMMY_EVGEN
help
Add some dummy events to the simple dummy driver.

config IIO_SIMPLE_DUMMY_BUFFER
bool "Buffered capture support"
select IIO_BUFFER
select IIO_TRIGGER
select IIO_KFIFO_BUF
help
Add buffered data capture to the simple dummy driver.

endif # IIO_SIMPLE_DUMMY

endmenu
10 changes: 10 additions & 0 deletions drivers/iio/dummy/Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#
# Makefile for the IIO Dummy Driver
#

obj-$(CONFIG_IIO_SIMPLE_DUMMY) += iio_dummy.o
iio_dummy-y := iio_simple_dummy.o
iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_EVENTS) += iio_simple_dummy_events.o
iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_BUFFER) += iio_simple_dummy_buffer.o

obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
54 changes: 27 additions & 27 deletions drivers/staging/iio/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -17,32 +17,32 @@ source "drivers/staging/iio/meter/Kconfig"
source "drivers/staging/iio/resolver/Kconfig"
source "drivers/staging/iio/trigger/Kconfig"

config IIO_DUMMY_EVGEN
tristate

config IIO_SIMPLE_DUMMY
tristate "An example driver with no hardware requirements"
help
Driver intended mainly as documentation for how to write
a driver. May also be useful for testing userspace code
without hardware.

if IIO_SIMPLE_DUMMY

config IIO_SIMPLE_DUMMY_EVENTS
bool "Event generation support"
select IIO_DUMMY_EVGEN
help
Add some dummy events to the simple dummy driver.

config IIO_SIMPLE_DUMMY_BUFFER
bool "Buffered capture support"
select IIO_BUFFER
select IIO_TRIGGER
select IIO_KFIFO_BUF
help
Add buffered data capture to the simple dummy driver.

endif # IIO_SIMPLE_DUMMY
#config IIO_DUMMY_EVGEN
# tristate
#
#config IIO_SIMPLE_DUMMY
# tristate "An example driver with no hardware requirements"
# help
# Driver intended mainly as documentation for how to write
# a driver. May also be useful for testing userspace code
# without hardware.

#if IIO_SIMPLE_DUMMY

#config IIO_SIMPLE_DUMMY_EVENTS
# bool "Event generation support"
# select IIO_DUMMY_EVGEN
# help
# Add some dummy events to the simple dummy driver.

#config IIO_SIMPLE_DUMMY_BUFFER
# bool "Buffered capture support"
# select IIO_BUFFER
# select IIO_TRIGGER
# select IIO_KFIFO_BUF
# help
# Add buffered data capture to the simple dummy driver.

#endif # IIO_SIMPLE_DUMMY

endmenu
10 changes: 5 additions & 5 deletions drivers/staging/iio/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
# Makefile for the industrial I/O core.
#

obj-$(CONFIG_IIO_SIMPLE_DUMMY) += iio_dummy.o
iio_dummy-y := iio_simple_dummy.o
iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_EVENTS) += iio_simple_dummy_events.o
iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_BUFFER) += iio_simple_dummy_buffer.o
#obj-$(CONFIG_IIO_SIMPLE_DUMMY) += iio_dummy.o
#iio_dummy-y := iio_simple_dummy.o
#iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_EVENTS) += iio_simple_dummy_events.o
#iio_dummy-$(CONFIG_IIO_SIMPLE_DUMMY_BUFFER) += iio_simple_dummy_buffer.o

obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o
#obj-$(CONFIG_IIO_DUMMY_EVGEN) += iio_dummy_evgen.o

obj-y += accel/
obj-y += adc/
Expand Down

0 comments on commit 415f792

Please sign in to comment.