From 47c47c40565bd3c41315dab98a5c1f267b49e5bf Mon Sep 17 00:00:00 2001
From: eddielan <eddielan@google.com>
Date: Wed, 22 Jun 2022 14:10:54 +0800
Subject: [PATCH] fingerprint: Enable SW42 version

Bug: 232500959
Test: make android.hardware.biometrics.fingerprint-service.fpc42
Test: make fingerprint.fpc
Test: Enroll/verify on device

Change-Id: I8c514f5c0fb0d7d81fe5fc6fc43d756a6616cf81
---
 conf/init.tangorpro.rc | 10 ++++++++--
 device-tangorpro.mk    | 11 +++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/conf/init.tangorpro.rc b/conf/init.tangorpro.rc
index bdd0d95..0bbbc06 100644
--- a/conf/init.tangorpro.rc
+++ b/conf/init.tangorpro.rc
@@ -5,6 +5,8 @@ on init
     # NFC streset tool name
     setprop persist.vendor.nfc.streset libstreset21
     setprop persist.vendor.se.streset libstreset21
+    # Load FPC's internal lib
+    setprop ro.hardware.fingerprint "fpc"
 
 # When ro.build.flavor=factory_tangorpro-userdebug, add vendor/bin/factory to default path
 on init && property:ro.build.flavor=factory_tangorpro-userdebug
@@ -58,8 +60,12 @@ on property:vendor.all.modules.ready=1 && property:persist.sys.tap_gesture=0
 
 # Fingerprint
 on post-fs-data
-    chown system system /dev/goodix_fp
-    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/g7.app
+    # Fingerprint
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/clk_enable
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/hw_reset
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/irq
+    chown system system /sys/devices/platform/odm/odm:fp_fpc1020/wakeup_enable
+    exec_background - system shell -- /vendor/bin/trusty_apploader /vendor/firmware/1540.app
 
 # Wifi
 on post-fs-data
diff --git a/device-tangorpro.mk b/device-tangorpro.mk
index a322990..b3ebfe5 100644
--- a/device-tangorpro.mk
+++ b/device-tangorpro.mk
@@ -128,14 +128,9 @@ include device/google/tangorpro/bluetooth/syna_default.mk
 # 	ro.hardware.keystore=software \
 # 	ro.hardware.gatekeeper=software
 
-## Fingerprint HAL
-#GOODIX_CONFIG_BUILD_VERSION := g7_trusty
-#include device/google/gs101/fingerprint/udfps_common.mk
-#ifeq ($(filter factory%, $(TARGET_PRODUCT)),)
-#include device/google/gs101/fingerprint/udfps_shipping.mk
-#else
-#include device/google/gs101/fingerprint/udfps_factory.mk
-#endif
+# Fingerprint
+include device/google/gs101/fingerprint/fpc1540/sw42/fpc1540.mk
+FPC_MODULE_TYPE=1542_S
 
 # Trusty liboemcrypto.so
 PRODUCT_SOONG_NAMESPACES += vendor/google_devices/tangorpro/prebuilts