Merge "input: vl53l0: Enable laser sensor Kconfig and Makefile entries"
This commit is contained in:
commit
41ad85e5be
4 changed files with 14 additions and 3 deletions
|
@ -834,4 +834,14 @@ config INPUT_DRV2667_HAPTICS
|
|||
|
||||
source "drivers/input/misc/ots_pat9125/Kconfig"
|
||||
|
||||
config INPUT_STMVL53L0
|
||||
tristate "STM VL53L0 Proximity support"
|
||||
depends on INPUT && I2C
|
||||
help
|
||||
Say Y here if you want to use STMicroelectronics's proximity sensor
|
||||
through I2C interface.
|
||||
|
||||
To compile this driver as a module, choose M here: the
|
||||
module will be called stmvl53l0.
|
||||
|
||||
endif
|
||||
|
|
|
@ -80,3 +80,4 @@ obj-$(CONFIG_INPUT_XEN_KBDDEV_FRONTEND) += xen-kbdfront.o
|
|||
obj-$(CONFIG_INPUT_YEALINK) += yealink.o
|
||||
obj-$(CONFIG_INPUT_IDEAPAD_SLIDEBAR) += ideapad_slidebar.o
|
||||
obj-$(CONFIG_INPUT_PIXART_OTS_PAT9125_SWITCH) += ots_pat9125/
|
||||
obj-$(CONFIG_INPUT_STMVL53L0) += vl53L0/
|
||||
|
|
|
@ -9,12 +9,12 @@ FEATURE_USE_CCI := true
|
|||
ifeq ($(FEATURE_USE_CCI), true)
|
||||
ccflags-y += -Idrivers/input/misc/vl53L0/inc -DCAMERA_CCI
|
||||
else
|
||||
ccflags-y += -Idrivers/input/misc/vl53L0/inc
|
||||
ccflags-y += -Idrivers/input/misc/vl53L0/inc
|
||||
endif
|
||||
|
||||
ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/io
|
||||
ccflags-y += -Idrivers/media/platform/msm/camera_v2
|
||||
ccflags-y += -Idrivers/media/platform/msm/camera_v2/common
|
||||
ccflags-y += -Idrivers/media/platform/msm/camera_v2/sensor/cci
|
||||
obj-$(CONFIG_STMVL53L0) += stmvl53l0.o
|
||||
obj-$(CONFIG_INPUT_STMVL53L0) += stmvl53l0.o
|
||||
stmvl53l0-objs := stmvl53l0_module.o stmvl53l0_module-i2c.o stmvl53l0_module-cci.o src/vl53l0_api_calibration.o src/vl53l0_api_core.o src/vl53l0_api_histogram.o src/vl53l0_api_ranging.o src/vl53l0_api_strings.o src/vl53l0_api.o src/vl53l0_platform.o src/vl53l0_i2c_platform.o src/vl53l0_port_i2c.o src/vl53l010_api.o src/vl53l010_tuning.o
|
||||
|
|
|
@ -51,7 +51,7 @@
|
|||
#define MSM_CAMERA_SUBDEV_IR_LED 17
|
||||
#define MSM_CAMERA_SUBDEV_IR_CUT 18
|
||||
#define MSM_CAMERA_SUBDEV_EXT 19
|
||||
|
||||
#define MSM_CAMERA_SUBDEV_TOF 20
|
||||
#define MSM_MAX_CAMERA_SENSORS 5
|
||||
|
||||
/* The below macro is defined to put an upper limit on maximum
|
||||
|
|
Loading…
Add table
Reference in a new issue