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

Commit 78a1022e authored Apr 02, 2021 by Hongjie GAO Committed by Gerrit Code Review Apr 02, 2021

Merge "[ALM:10980806] [FP4-125] FingerPrint bring up - kernel" into sm7225_r_fp4

parents c175a55d 0da18fab

arch/arm64/configs/vendor/fp4-perf_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -285,7 +285,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_HDCP_QSEECOM=y
		CONFIG_QSEECOM=y
		CONFIG_UID_SYS_STATS=y
		CONFIG_FPR_FPC=y
		# CONFIG_FPR_FPC is not set
		CONFIG_CHIPONE_FINGERPRINT=y
		CONFIG_SCSI=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_CHR_DEV_SG=y

arch/arm64/configs/vendor/fp4_defconfig

+2 −1

Original line number	Diff line number	Diff line
		@@ -291,7 +291,8 @@ CONFIG_BLK_DEV_RAM_SIZE=8192
		CONFIG_HDCP_QSEECOM=y
		CONFIG_QSEECOM=y
		CONFIG_UID_SYS_STATS=y
		CONFIG_FPR_FPC=y
		# CONFIG_FPR_FPC is not set
		CONFIG_CHIPONE_FINGERPRINT=y
		CONFIG_SCSI=y
		CONFIG_BLK_DEV_SD=y
		CONFIG_CHR_DEV_SG=y

drivers/misc/Kconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -637,6 +637,7 @@ source "drivers/misc/cxl/Kconfig"
		source "drivers/misc/ocxl/Kconfig"
		source "drivers/misc/cardreader/Kconfig"
		source "drivers/misc/fpr_FingerprintCard/Kconfig"
		source "drivers/misc/fpsensor_chipone/Kconfig"
		source "drivers/misc/aw8695/Kconfig"
		endmenu

drivers/misc/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -76,4 +76,5 @@ obj-$(CONFIG_WIGIG_SENSING_SPI) += wigig_sensing.o
		obj-$(CONFIG_QTI_MAXIM_FAN_CONTROLLER) += max31760.o
		obj-$(CONFIG_QTI_XR_SMRTVWR_MISC) += qxr-stdalonevwr.o
		obj-$(CONFIG_FPR_FPC) += fpr_FingerprintCard/
		obj-$(CONFIG_CHIPONE_FINGERPRINT) += fpsensor_chipone/
		obj-$(CONFIG_AW8695_HAPTIC) += aw8695/

drivers/misc/fpsensor_chipone/Kconfig

0 → 100644

+6 −0

Original line number	Diff line number	Diff line
		config CHIPONE_FINGERPRINT
		tristate "Chipone Finger Print Driver"
		help
		Chipone Finger Print Supported