servod: update fpmcu_chip/usbpd_chip among overlay files

For nami, add 'fpmcu_chip'.
For nocturne and zoombini, remove 'usbpd_chip' alias.
For eve, remove 'uspbd_chip' and 'fpmcu_chip', which do
not exist any more.

BUG=b:125837387
BRANCH=none
TEST=manually ran dut-control

[nocturne]
$ dut-control ec_chip; dut-control fpmcu_chip; dut-control usbpd_chip
ec_chip:npcx_spi
fpmcu_chip:stm32
usbpd_chip:unknown

[zoombini]
$ dut-control ec_chip; dut-control fpmcu_chip; dut-control usbpd_chip
ec_chip:npcx_spi
fpmcu_chip:stm32
usbpd_chip:unknown

[eve]
$ dut-control ec_chip; dut-control fpmcu_chip; dut-control usbpd_chip
ec_chip:npcx_spi
fpmcu_chip:unknown
usbpd_chip:unknown

[nami]
$ dut-control ec_chip; dut-control fpmcu_chip; dut-control usbpd_chip
ec_chip:npcx_spi
fpmcu_chip:stm32
usbpd_chip:unknown

Change-Id: I84cd710203ce411f33ecc02c30553df66b45e85a
Signed-off-by: Namyoon Woo <namyoon@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1497319
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Daisuke Nojiri <dnojiri@chromium.org>
Reviewed-by: Wai-Hong Tam <waihong@google.com>
diff --git a/servo/data/ec_common.xml b/servo/data/ec_common.xml
index 66b1398..9da64c0 100644
--- a/servo/data/ec_common.xml
+++ b/servo/data/ec_common.xml
@@ -127,4 +127,10 @@
     <params cmd="get" subtype="chip" interface="servo"
     drv="cros_chip" chip="unknown" />
   </control>
+  <control>
+    <name>fpmcu_chip</name>
+    <doc>Fingerprint MCU chip name (read-only)</doc>
+    <params cmd="get" subtype="chip" interface="servo"
+    drv="cros_chip" chip="unknown" />
+  </control>
 </root>
diff --git a/servo/data/servo_eve_overlay.xml b/servo/data/servo_eve_overlay.xml
index 0eb7d1e..2e72862 100644
--- a/servo/data/servo_eve_overlay.xml
+++ b/servo/data/servo_eve_overlay.xml
@@ -26,11 +26,4 @@
     <params clobber_ok="" cmd="get" subtype="chip" interface="servo"
     drv="cros_chip" chip="npcx_spi"/>
   </control>
-  <control>
-    <name>fpmcu_chip</name>
-    <alias>usbpd_chip</alias>
-    <doc>FP MCU chip name (read-only)</doc>
-    <params clobber_ok="" cmd="get" subtype="chip" interface="servo"
-    drv="cros_chip" chip="stm32"/>
-  </control>
 </root>
diff --git a/servo/data/servo_nami_overlay.xml b/servo/data/servo_nami_overlay.xml
index 7c220e9..71b3af8 100644
--- a/servo/data/servo_nami_overlay.xml
+++ b/servo/data/servo_nami_overlay.xml
@@ -31,6 +31,12 @@
     drv="cros_chip" chip="npcx_spi"/>
   </control>
   <control>
+    <name>fpmcu_chip</name>
+    <doc>FP MCU chip name (read-only)</doc>
+    <params clobber_ok="" cmd="get" subtype="chip" interface="servo"
+    drv="cros_chip" chip="stm32"/>
+  </control>
+  <control>
     <name>lid_open</name>
     <doc>emulated lid switch on ec</doc>
     <params subtype="lid_open" interface="10" drv="ec" map="yesno"
diff --git a/servo/data/servo_nocturne_overlay.xml b/servo/data/servo_nocturne_overlay.xml
index 2fa768e..7294a56 100644
--- a/servo/data/servo_nocturne_overlay.xml
+++ b/servo/data/servo_nocturne_overlay.xml
@@ -40,7 +40,6 @@
   </control>
   <control>
     <name>fpmcu_chip</name>
-    <alias>usbpd_chip</alias>
     <doc>FP MCU chip name (read-only)</doc>
     <params clobber_ok="" cmd="get" subtype="chip" interface="servo"
     drv="cros_chip" chip="stm32"/>
diff --git a/servo/data/servo_zoombini_overlay.xml b/servo/data/servo_zoombini_overlay.xml
index bf0436e..180a491 100644
--- a/servo/data/servo_zoombini_overlay.xml
+++ b/servo/data/servo_zoombini_overlay.xml
@@ -31,7 +31,6 @@
   </control>
   <control>
     <name>fpmcu_chip</name>
-    <alias>usbpd_chip</alias>
     <doc>FP MCU chip name (read-only)</doc>
     <params clobber_ok="" cmd="get" subtype="chip" interface="servo"
     drv="cros_chip" chip="stm32"/>