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

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

Merge "ARCH: arm: defconfig: Enable SMI130 driver config for MDM9x07"

parents ac2e3c8a b083a065

arch/arm/configs/mdm9607-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -217,6 +217,9 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y

arch/arm/configs/mdm9607_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -216,6 +216,9 @@ CONFIG_INPUT_EVDEV=y 
CONFIG_INPUT_MISC=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_SERIO_LIBPS2=y

# CONFIG_LEGACY_PTYS is not set

CONFIG_SERIAL_MSM_HS=y

drivers/input/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -208,6 +208,8 @@ source "drivers/input/touchscreen/Kconfig" 


source "drivers/input/misc/Kconfig"



source "drivers/input/sensors/smi130/Kconfig"



endif



menu "Hardware I/O ports"

drivers/input/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -28,3 +28,4 @@ obj-$(CONFIG_INPUT_APMPOWER) += apm-power.o 
obj-$(CONFIG_INPUT_KEYRESET)	+= keyreset.o

obj-$(CONFIG_INPUT_KEYCOMBO)	+= keycombo.o

obj-$(CONFIG_SENSORS_HALL)	+= hall_sensor.o

obj-y	+= sensors/smi130/

drivers/input/sensors/smi130/smi130_acc.c

+4 −4
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ 
#include "bs_log.h"

#define DRIVER_VERSION "0.0.53.0"

#define ACC_NAME  "ACC"

#define SMI_ACC2X2_ENABLE_INT1 1

#define SMI_ACC2X2_ENABLE_INT2 1

#define CONFIG_SMI_ACC_ENABLE_NEWDATA_INT 1



#define SENSOR_NAME                 "smi130_acc"
@@ -6802,7 +6802,7 @@ static void smi130_acc_irq_work_func(struct work_struct *work) 
#endif



	smi130_acc_get_interruptstatus1(smi130_acc->smi130_acc_client, &status);

	PINFO("smi130_acc_irq_work_func, status = 0x%x\n", status);

	PDEBUG("smi130_acc_irq_work_func, status = 0x%x\n", status);



#ifdef CONFIG_SIG_MOTION

	if (status & 0x04)	{
@@ -7480,8 +7480,8 @@ static struct i2c_driver smi130_acc_driver = { 
		.name   = SENSOR_NAME,

		.of_match_table = smi130_acc_of_match,

	},

	//.suspend    = smi130_acc_suspend,

	//.resume     = smi130_acc_resume,

	.suspend    = smi130_acc_suspend,

	.resume     = smi130_acc_resume,

	.id_table   = smi130_acc_id,

	.probe      = smi130_acc_probe,

	.remove     = smi130_acc_remove,