Skip to content

Commit 74ae38d

Browse files
Joseph WuJoseph Wu
Joseph Wu
authored and
Joseph Wu
committed
Revert "Sensors: [PATCH 1/3] Invensense 5.1.2 IIO driver release."
This reverts commit 08f02f8.
1 parent eb72d03 commit 74ae38d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4466
-5964
lines changed

arch/arm/configs/tegra3_android_defconfig

+1-2
Original file line numberDiff line numberDiff line change
@@ -456,11 +456,10 @@ CONFIG_IIO=y
456456
CONFIG_IIO_BUFFER=y
457457
CONFIG_IIO_KFIFO_BUF=y
458458
CONFIG_INV_MPU_IIO=y
459-
CONFIG_INV_TESTING=y
460459
CONFIG_SENSORS_ISL29028=y
461460
CONFIG_SENSORS_LTR558=y
461+
CONFIG_AMI306=y
462462
CONFIG_RIL=y
463-
CONFIG_INV_AMI306_IIO=y
464463
CONFIG_EXT2_FS=y
465464
CONFIG_EXT2_FS_XATTR=y
466465
CONFIG_EXT2_FS_POSIX_ACL=y

drivers/staging/iio/Kconfig

-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ source "drivers/staging/iio/dac/Kconfig"
7070
source "drivers/staging/iio/dds/Kconfig"
7171
source "drivers/staging/iio/gyro/Kconfig"
7272
source "drivers/staging/iio/imu/Kconfig"
73-
source "drivers/staging/iio/inv_test/Kconfig"
7473
source "drivers/staging/iio/light/Kconfig"
7574
source "drivers/staging/iio/magnetometer/Kconfig"
7675
source "drivers/staging/iio/meter/Kconfig"

drivers/staging/iio/Makefile

-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ obj-y += dac/
2626
obj-y += dds/
2727
obj-y += gyro/
2828
obj-y += imu/
29-
obj-y += inv_test/
3029
obj-y += light/
3130
obj-y += magnetometer/
3231
obj-y += meter/

drivers/staging/iio/buffer.h

+4-5
Original file line numberDiff line numberDiff line change
@@ -166,13 +166,12 @@ ssize_t iio_buffer_store_enable(struct device *dev,
166166
ssize_t iio_buffer_show_enable(struct device *dev,
167167
struct device_attribute *attr,
168168
char *buf);
169-
170-
#define IIO_BUFFER_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUGO, \
171-
iio_buffer_read_length, \
169+
#define IIO_BUFFER_LENGTH_ATTR DEVICE_ATTR(length, S_IRUGO | S_IWUSR, \
170+
iio_buffer_read_length, \
172171
iio_buffer_write_length)
173172

174-
#define IIO_BUFFER_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUGO, \
175-
iio_buffer_show_enable, \
173+
#define IIO_BUFFER_ENABLE_ATTR DEVICE_ATTR(enable, S_IRUGO | S_IWUSR, \
174+
iio_buffer_show_enable, \
176175
iio_buffer_store_enable)
177176

178177
int iio_sw_buffer_preenable(struct iio_dev *indio_dev);

drivers/staging/iio/imu/Kconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@ config ADIS16400
1414
adis16365, adis16400 and adis16405 triaxial inertial sensors
1515
(adis16400 series also have magnetometers).
1616

17-
source "drivers/staging/iio/imu/inv_mpu/Kconfig"
17+
source "drivers/staging/iio/imu/mpu/Kconfig"
1818
endmenu

drivers/staging/iio/imu/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ adis16400-y := adis16400_core.o
66
adis16400-$(CONFIG_IIO_BUFFER) += adis16400_ring.o adis16400_trigger.o
77
obj-$(CONFIG_ADIS16400) += adis16400.o
88

9-
obj-y += inv_mpu/
9+
obj-y += mpu/

drivers/staging/iio/imu/inv_mpu/Kconfig

-24
This file was deleted.

0 commit comments

Comments
 (0)