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

Commit f40a2839 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drivers: iio: imu: fixed asm330 early buff bugs"

parents 517cd300 fdc8d364

arch/arm/configs/mdm9607-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ CONFIG_INPUT_GPIO=m 
CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_ENABLE_SMI_ACC_GYRO_BUFFERING=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y
@@ -360,8 +361,10 @@ CONFIG_ENABLE_ACC_GYRO_BUFFERING=y 
CONFIG_INV_MPU_IIO_IAM20680=y

CONFIG_INV_MPU_IIO_I2C=y

CONFIG_INV_MPU_IIO_SPI=y

CONFIG_ENABLE_IAM_ACC_GYRO_BUFFERING=y

CONFIG_INV_TESTING=y

CONFIG_IIO_ST_ASM330LHH=y

CONFIG_ENABLE_ASM_ACC_GYRO_BUFFERING=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y

arch/arm/configs/mdm9607_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ CONFIG_INPUT_GPIO=m 
CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_ENABLE_SMI_ACC_GYRO_BUFFERING=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y
@@ -360,8 +361,10 @@ CONFIG_ENABLE_ACC_GYRO_BUFFERING=y 
CONFIG_INV_MPU_IIO_IAM20680=y

CONFIG_INV_MPU_IIO_I2C=y

CONFIG_INV_MPU_IIO_SPI=y

CONFIG_ENABLE_IAM_ACC_GYRO_BUFFERING=y

CONFIG_INV_TESTING=y

CONFIG_IIO_ST_ASM330LHH=y

CONFIG_ENABLE_ASM_ACC_GYRO_BUFFERING=y

CONFIG_CORESIGHT=y

CONFIG_CORESIGHT_EVENT=y

CONFIG_CORESIGHT_FUSE=y

drivers/iio/imu/st_asm330lhh/st_asm330lhh_buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -225,8 +225,8 @@ static void store_acc_gyro_boot_sample(struct st_asm330lhh_sensor *sensor, 
			<  sensor->max_buffer_time) {

		if (sensor->bufsample_cnt < ASM_MAXSAMPLE) {

			sensor->asm_samplist[sensor->bufsample_cnt]->xyz[0] = x;

			sensor->asm_samplist[sensor->bufsample_cnt]->xyz[1] = x;

			sensor->asm_samplist[sensor->bufsample_cnt]->xyz[2] = x;

			sensor->asm_samplist[sensor->bufsample_cnt]->xyz[1] = y;

			sensor->asm_samplist[sensor->bufsample_cnt]->xyz[2] = z;

			sensor->asm_samplist[sensor->bufsample_cnt]->tsec =

				ktime_to_timespec(sensor->timestamp).tv_sec;

			sensor->asm_samplist[sensor->bufsample_cnt]->tnsec =

drivers/iio/imu/st_asm330lhh/st_asm330lhh_core.c

+1 −1
Original line number Diff line number Diff line
@@ -847,7 +847,7 @@ static void st_asm330lhh_enable_acc_gyro(struct st_asm330lhh_hw *hw) 
			continue;

		sensor = iio_priv(hw->iio_devs[i]);

		sensor->odr = 104;

		sensor->watermark = 3;

		sensor->watermark = 30;

		st_asm330lhh_update_fifo(hw->iio_devs[i], false);



		if (sensor->id == ST_ASM330LHH_ID_ACC)