commit 15c2dcbdcc125d5be186ff18bd3a593c9afc2af3
author Vic Yang <victoryang@chromium.org> Mon Jun 02 10:31:54 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Jun 03 20:40:03 2014 +0000
tree cdacfd1c744741ad5454e4b1986570967de4c12b
parent 65443c1f0dcc0d5c0983f8f8c177cf852e05a3fa

FAFT: split wp_voltage and spi_voltage in FAFT config

The write protect reference voltage and SPI voltage are not necessarily
the same. Make them two separate options so that we can configure them
to be different.

BUG=chrome-os-partner:29210
TEST=Grep 'vref' and check each one is using the correct config value.

Change-Id: I5cc30ea364f482a0febd66bfd99d857630bfa401
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/202381
Reviewed-by: Wai-Hong Tam <waihong@chromium.org>
Reviewed-by: David Hendricks <dhendrix@chromium.org>

server/cros/faft/config/DEFAULTS.py

diff --git a/server/cros/faft/config/DEFAULTS.py b/server/cros/faft/config/DEFAULTS.py
index 8fd38f9..ed65729 100644
--- a/server/cros/faft/config/DEFAULTS.py
+++ b/server/cros/faft/config/DEFAULTS.py
@@ -27,6 +27,7 @@
     ec_capability = list()
     gbb_version = 1.1
     wp_voltage = 'pp1800'
+    spi_voltage = 'pp1800'
     key_checker = [[0x29, 'press'],
                    [0x32, 'press'],
                    [0x32, 'release'],

server/cros/faft/config/link.py

diff --git a/server/cros/faft/config/link.py b/server/cros/faft/config/link.py
index 508bad2..76e2333 100644
--- a/server/cros/faft/config/link.py
+++ b/server/cros/faft/config/link.py
@@ -6,6 +6,7 @@
 
 
 class Values(object):
+    """FAFT config values for Link."""
     firmware_screen = 7
     dev_screen = 4
     chrome_ec = True
@@ -15,3 +16,4 @@
                      'keyboard', 'lid', 'x86', 'thermal',
                      'usb', 'peci', 'kblight', 'smart_usb_charge']
     wp_voltage = 'pp3300'
+    spi_voltage = 'pp3300'

server/cros/faft/config/rambi.py

diff --git a/server/cros/faft/config/rambi.py b/server/cros/faft/config/rambi.py
index a7c96ff..36d9cf2 100644
--- a/server/cros/faft/config/rambi.py
+++ b/server/cros/faft/config/rambi.py
@@ -15,3 +15,4 @@
     firmware_screen = 7
     long_rec_combo = True
     wp_voltage = 'pp1800'
+    spi_voltage = 'pp1800'

server/cros/faft/config/slippy.py

diff --git a/server/cros/faft/config/slippy.py b/server/cros/faft/config/slippy.py
index 4aa7268..8757ec9 100644
--- a/server/cros/faft/config/slippy.py
+++ b/server/cros/faft/config/slippy.py
@@ -6,6 +6,7 @@
 
 
 class Values(object):
+    """FAFT config values for Slippy."""
     # Measured boot-to-console as ~110ms, so this is safe
     ec_boot_to_console = 0.6
     chrome_ec = True
@@ -14,3 +15,4 @@
                             'keyboard', 'lid', 'x86', 'thermal',
                             'usb', 'peci']
     wp_voltage = 'pp3300'
+    spi_voltage = 'pp3300'

server/cros/servo/firmware_programmer.py

diff --git a/server/cros/servo/firmware_programmer.py b/server/cros/servo/firmware_programmer.py
index 0b20509..8d30a71 100644
--- a/server/cros/servo/firmware_programmer.py
+++ b/server/cros/servo/firmware_programmer.py
@@ -163,7 +163,7 @@
         faft_config = FAFTConfig(self._servo.get_board())
         self._fw_path = path
         self._servo_prog_state = (
-            'spi2_vref:%s' % faft_config.wp_voltage,
+            'spi2_vref:%s' % faft_config.spi_voltage,
             'spi2_buf_en:on',
             'spi2_buf_on_flex_en:on',
             'spi_hold:off',