cr50: Align the CCD interfaces to match the traditional servos

The change moves interfaces:
 #1 -> #7 for EC console
 #3 -> #8 for CPU console
 #8 -> #9 for Cr50 console (EC3PO), shared with USBPD

BUG=b:37473185
TEST=Tested on servo v4 with CCD, started servod and checked the
EC/CPU/Cr50 consoles.

Change-Id: I55ef8f1b61230e60d777fa4c388ffb5a7463d5d0
Reviewed-on: https://chromium-review.googlesource.com/489610
Commit-Ready: Wai-Hong Tam <waihong@google.com>
Tested-by: Wai-Hong Tam <waihong@google.com>
Reviewed-by: Mary Ruthven <mruthven@chromium.org>
diff --git a/servo/servo_interfaces.py b/servo/servo_interfaces.py
index 5a72b33..08ae114 100644
--- a/servo/servo_interfaces.py
+++ b/servo/servo_interfaces.py
@@ -97,17 +97,17 @@
 for vid, pid in CCD_DEFAULTS:
   INTERFACE_DEFAULTS[vid][pid] = \
     ['dummy',
-     {'name': 'stm32_uart', 'interface': 2}, # 1: EC_PD
+     'dummy',                                # 1
      {'name': 'stm32_i2c', 'interface': 5},  # 2: i2c
-     {'name': 'stm32_uart', 'interface': 1}, # 3: AP
-     {'name': 'stm32_uart', 'interface': 0}, # 4: cr50 console
-     'dummy',                                # 5: HID: intf 1
-     'dummy',                                # 6: USB FW: intf 4
-     'dummy',                                # 7: SPI: intf 5
-     {'name': 'ec3po_uart',                  # 8: cr50 console
+     'dummy',                                # 3
+     {'name': 'stm32_uart', 'interface': 0}, # 4: Cr50 console
+     'dummy',                                # 5
+     'dummy',                                # 6
+     {'name': 'stm32_uart', 'interface': 2}, # 7: EC/PD
+     {'name': 'stm32_uart', 'interface': 1}, # 8: AP
+     {'name': 'ec3po_uart',                  # 9: EC3PO(Cr50)
       'raw_pty': 'raw_cr50_console_pty'},
-     'dummy',                                # 9: dummy
-     {'name': 'ec3po_uart',                  #10: dut ec console
+     {'name': 'ec3po_uart',                  #10: EC3PO(EC)
       'raw_pty': 'raw_ec_uart_pty'},
     ]