summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJett Rink <jettrink@chromium.org>2020-12-03 13:51:31 -0700
committerCommit Bot <commit-bot@chromium.org>2021-01-15 03:55:35 +0000
commit28de6a6e3027b7530a023790a2a9f76dfaa14227 (patch)
tree02e79f50b3fa1641eba3dda6ce0554b3f9ac3870
parentb8494d9170a13406996cb2003ff32f80c286bd4c (diff)
downloadchrome-ec-28de6a6e3027b7530a023790a2a9f76dfaa14227.tar.gz
volteer: enable CBI EEPROM access
Turn on the CBI shim module. Define the necessary i2c constants required by CBI module. BUG=b:168032589,b:168032342 TEST=boot volteer and type `cbi` Cq-Depend: chromium:2572736 Change-Id: I989c7588b34b27c5743cc9926e04c8881e6f7165 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/zephyr-chrome/+/2572756 Tested-by: Jett Rink <jettrink@chromium.org> Reviewed-by: Simon Glass <sjg@chromium.org> Commit-Queue: Jett Rink <jettrink@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/2630152 Tested-by: Jack Rosenthal <jrosenth@chromium.org> Commit-Queue: Jack Rosenthal <jrosenth@chromium.org>
-rw-r--r--zephyr/projects/volteer/include/gpio_map.h1
-rw-r--r--zephyr/projects/volteer/include/i2c_map.h5
-rw-r--r--zephyr/projects/volteer/prj.conf2
3 files changed, 8 insertions, 0 deletions
diff --git a/zephyr/projects/volteer/include/gpio_map.h b/zephyr/projects/volteer/include/gpio_map.h
index 01f5c30206..f23d1db1bb 100644
--- a/zephyr/projects/volteer/include/gpio_map.h
+++ b/zephyr/projects/volteer/include/gpio_map.h
@@ -44,6 +44,7 @@
#define GPIO_RSMRST_L_PGOOD NAMED_GPIO(pg_ec_rsmrst_odl)
#define GPIO_SLP_SUS_L NAMED_GPIO(slp_sus_l)
#define GPIO_SYS_RESET_L NAMED_GPIO(sys_rst_odl)
+#define GPIO_WP_L NAMED_GPIO(ec_wp_l)
/*
* Set EC_CROS_GPIO_INTERRUPTS to a space-separated list of GPIO_INT items.
diff --git a/zephyr/projects/volteer/include/i2c_map.h b/zephyr/projects/volteer/include/i2c_map.h
index cecf9dfa19..de174e311a 100644
--- a/zephyr/projects/volteer/include/i2c_map.h
+++ b/zephyr/projects/volteer/include/i2c_map.h
@@ -10,6 +10,9 @@
#include "config.h"
+/* We need registers.h to get the chip specific defines for now */
+#include "registers.h"
+
#define I2C_PORT_ACCEL I2C_PORT_SENSOR
#define I2C_PORT_SENSOR NPCX_I2C_PORT0_0
#define I2C_PORT_USB_C0 NPCX_I2C_PORT1_0
@@ -18,4 +21,6 @@
#define I2C_PORT_POWER NPCX_I2C_PORT5_0
#define I2C_PORT_EEPROM NPCX_I2C_PORT7_0
+#define I2C_ADDR_EEPROM_FLAGS 0x50
+
#endif /* __ZEPHYR_CHROME_I2C_MAP_H */
diff --git a/zephyr/projects/volteer/prj.conf b/zephyr/projects/volteer/prj.conf
index 42bd5af499..976122d038 100644
--- a/zephyr/projects/volteer/prj.conf
+++ b/zephyr/projects/volteer/prj.conf
@@ -10,6 +10,7 @@ CONFIG_PLATFORM_EC_ESPI_VW_SLP_S4=y
# TODO(b/161470456): can we remove the below when zmake generates it?
CONFIG_CROS_EC_RO=y
+
CONFIG_PLATFORM_EC=y
CONFIG_I2C=y
CONFIG_PLATFORM_EC_EXTPOWER_GPIO=y
@@ -17,6 +18,7 @@ CONFIG_PLATFORM_EC_KEYBOARD=y
CONFIG_PLATFORM_EC_KEYBOARD_COL2_INVERTED=y
CONFIG_PLATFORM_EC_LID_SWITCH=y
CONFIG_PLATFORM_EC_POWER_BUTTON=y
+CONFIG_PLATFORM_EC_CBI=y
# Power Sequencing
CONFIG_PLATFORM_EC_POWERSEQ=y