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

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

staging:iio: Move adis library out of staging 



Now that the adis library no longer depends on the sw_ring buffer implementation
we can move it out of staging.

While we are at it also sort the entries in the iio Kconfig and Makefile to be
in alphabetical order.

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

drivers/iio/Kconfig

+4 −3
Original line number Original line Diff line number Diff line
@@ -63,11 +63,12 @@ config IIO_CONSUMERS_PER_TRIGGER 
source "drivers/iio/accel/Kconfig"

source "drivers/iio/accel/Kconfig"

source "drivers/iio/adc/Kconfig"

source "drivers/iio/adc/Kconfig"

source "drivers/iio/amplifiers/Kconfig"

source "drivers/iio/amplifiers/Kconfig"

source "drivers/iio/light/Kconfig"

source "drivers/iio/frequency/Kconfig"

source "drivers/iio/dac/Kconfig"

source "drivers/iio/common/Kconfig"

source "drivers/iio/common/Kconfig"

source "drivers/iio/dac/Kconfig"

source "drivers/iio/frequency/Kconfig"

source "drivers/iio/gyro/Kconfig"

source "drivers/iio/gyro/Kconfig"

source "drivers/iio/imu/Kconfig"

source "drivers/iio/light/Kconfig"

source "drivers/iio/magnetometer/Kconfig"

source "drivers/iio/magnetometer/Kconfig"





endif # IIO
 
endif # IIO

drivers/iio/Makefile

+4 −3
Original line number Original line Diff line number Diff line
@@ -14,9 +14,10 @@ obj-$(CONFIG_IIO_KFIFO_BUF) += kfifo_buf.o 
obj-y += accel/

obj-y += accel/

obj-y += adc/

obj-y += adc/

obj-y += amplifiers/

obj-y += amplifiers/

obj-y += light/

obj-y += frequency/

obj-y += dac/

obj-y += common/

obj-y += common/

obj-y += dac/

obj-y += gyro/

obj-y += gyro/

obj-y += frequency/

obj-y += imu/

obj-y += light/

obj-y += magnetometer/
 
obj-y += magnetometer/

drivers/iio/imu/Kconfig

0 → 100644
+11 −0
Original line number Original line Diff line number Diff line 
config IIO_ADIS_LIB

	tristate

	help

	  A set of IO helper functions for the Analog Devices ADIS* device family.



config IIO_ADIS_LIB_BUFFER

	bool

	select IIO_TRIGGERED_BUFFER

	help

	  A set of buffer helper functions for the Analog Devices ADIS* device

	  family.

drivers/iio/imu/Makefile

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

# Makefile for Inertial Measurement Units

#



adis_lib-y += adis.o

adis_lib-$(CONFIG_IIO_ADIS_LIB_BUFFER) += adis_trigger.o

adis_lib-$(CONFIG_IIO_ADIS_LIB_BUFFER) += adis_buffer.o

obj-$(CONFIG_IIO_ADIS_LIB) += adis_lib.o

drivers/staging/iio/imu/adis.c→drivers/iio/imu/adis.c

+1 −2
Original line number Original line Diff line number Diff line
@@ -20,8 +20,7 @@ 
#include <linux/iio/iio.h>

#include <linux/iio/iio.h>

#include <linux/iio/sysfs.h>

#include <linux/iio/sysfs.h>

#include <linux/iio/buffer.h>

#include <linux/iio/buffer.h>



#include <linux/iio/imu/adis.h>

#include "adis.h"





#define ADIS_MSC_CTRL_DATA_RDY_EN	BIT(2)

#define ADIS_MSC_CTRL_DATA_RDY_EN	BIT(2)

#define ADIS_MSC_CTRL_DATA_RDY_POL_HIGH	BIT(1)

#define ADIS_MSC_CTRL_DATA_RDY_POL_HIGH	BIT(1)