From: boger <boger@goodix.com>
Date: Wed, 23 Jun 2021 15:14:33 +0800
Subject: goodixmoc: add PID 609C/6584/658C/6592/659C

add some new PID support,
609C: Framework fingerprint sensor
65xx: Thinkpad series fingerprint sensor

Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/libfprint/+bug/1945296
---
 data/autosuspend.hwdb                |  9 +++++++--
 libfprint/drivers/goodixmoc/goodix.c | 13 +++++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/data/autosuspend.hwdb b/data/autosuspend.hwdb
index 7d03dba..38e9d17 100644
--- a/data/autosuspend.hwdb
+++ b/data/autosuspend.hwdb
@@ -128,11 +128,16 @@ usb:v1C7Ap0603*
 
 # Supported by libfprint driver goodixmoc
 usb:v27C6p5840*
-usb:v27C6p6496*
+usb:v27C6p609C*
 usb:v27C6p60A2*
-usb:v27C6p63AC*
 usb:v27C6p639C*
+usb:v27C6p63AC*
+usb:v27C6p6496*
+usb:v27C6p6584*
+usb:v27C6p658C*
+usb:v27C6p6592*
 usb:v27C6p6594*
+usb:v27C6p659C*
 usb:v27C6p6A94*
  ID_AUTOSUSPEND=1
 
diff --git a/libfprint/drivers/goodixmoc/goodix.c b/libfprint/drivers/goodixmoc/goodix.c
index 38b6ff4..667efb0 100644
--- a/libfprint/drivers/goodixmoc/goodix.c
+++ b/libfprint/drivers/goodixmoc/goodix.c
@@ -1317,6 +1317,10 @@ gx_fp_probe (FpDevice *device)
     {
     case 0x6496:
     case 0x60A2:
+    case 0x609C:
+    case 0x639C:
+    case 0x63AC:
+    case 0x6A94:
       self->max_enroll_stage = 12;
       break;
 
@@ -1531,11 +1535,16 @@ fpi_device_goodixmoc_init (FpiDeviceGoodixMoc *self)
 
 static const FpIdEntry id_table[] = {
   { .vid = 0x27c6,  .pid = 0x5840,  },
-  { .vid = 0x27c6,  .pid = 0x6496,  },
+  { .vid = 0x27c6,  .pid = 0x609C,  },
   { .vid = 0x27c6,  .pid = 0x60A2,  },
-  { .vid = 0x27c6,  .pid = 0x63AC,  },
   { .vid = 0x27c6,  .pid = 0x639C,  },
+  { .vid = 0x27c6,  .pid = 0x63AC,  },
+  { .vid = 0x27c6,  .pid = 0x6496,  },
+  { .vid = 0x27c6,  .pid = 0x6584,  },
+  { .vid = 0x27c6,  .pid = 0x658C,  },
+  { .vid = 0x27c6,  .pid = 0x6592,  },
   { .vid = 0x27c6,  .pid = 0x6594,  },
+  { .vid = 0x27c6,  .pid = 0x659C,  },
   { .vid = 0x27c6,  .pid = 0x6A94,  },
   { .vid = 0,  .pid = 0,  .driver_data = 0 },   /* terminating entry */
 };