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

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

Merge "defconfig: msm: Enable SMI130 driver config for sdxpoorwills target"

parents e1fa12ee ff8290ff

arch/arm/configs/sdxpoorwills-auto-perf_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -241,6 +241,7 @@ CONFIG_INPUT_MISC=y 
CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_INPUT_GPIO=m

CONFIG_SMI130=y

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

arch/arm/configs/sdxpoorwills-auto_defconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -235,6 +235,7 @@ CONFIG_INPUT_MISC=y 
CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_QPNP_POWER_ON=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_UINPUT=y

CONFIG_INPUT_GPIO=m

CONFIG_INPUT_GPIO=m

CONFIG_SMI130=y

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_BOSCH_DRIVER_LOG_FUNC=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

CONFIG_SENSORS_SMI_ACC2X2_ENABLE_INT2=y

drivers/input/sensors/smi130/Kconfig

+11 −3
Original line number Original line Diff line number Diff line 
#

#

# Makefile for Bosch sensors driver.

# Makefile for Bosch sensors driver.

#

#

menuconfig SMI130

	bool "Enable smi130 drivers"

	help

	Say Y here, and a list of smi130 drivers will be displayed.

	 This option does not affect the kernel.



	If unsure, say N.



if SMI130



config BOSCH_DRIVER_LOG_FUNC

config BOSCH_DRIVER_LOG_FUNC

	tristate "Bosch Sensortec driver smart log function support"

	tristate "Bosch Sensortec driver smart log function support"

	depends on (I2C || SPI_MASTER) && SYSFS

	depends on (I2C || SPI_MASTER) && SYSFS
@@ -116,6 +126,4 @@ depends on SENSORS_SMI_ACC4XY 
	help

	help

	 If you say yes here, you get support for Bosch Sensortec's

	 If you say yes here, you get support for Bosch Sensortec's

	 sensor driver of SMI_ACC4XY with mag sensor support.

	 sensor driver of SMI_ACC4XY with mag sensor support.



endif