summaryrefslogtreecommitdiff
path: root/board/hammer/board.c
diff options
context:
space:
mode:
authorNicolas Boichat <drinkcat@chromium.org>2017-12-15 16:02:30 +0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-29 05:24:45 -0800
commit31c1fc6d43cac12f380a023481e5320892c480d2 (patch)
treed6622d99ef8bcda072ea2867b3c61701f0483ec1 /board/hammer/board.c
parent14e6afb4f211a2cf2a9e9c469806ec8fa0870d9d (diff)
downloadchrome-ec-31c1fc6d43cac12f380a023481e5320892c480d2.tar.gz
whiskers: Update GPIO for next revision
Looks more similar to original hammer. BRANCH=none BUG=b:68934906 TEST=make BOARD=whiskers -j Change-Id: I0f10240f8c3237b20f60a1217e167ad9539e3953 Signed-off-by: Nicolas Boichat <drinkcat@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/853574 Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Diffstat (limited to 'board/hammer/board.c')
-rw-r--r--board/hammer/board.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/hammer/board.c b/board/hammer/board.c
index f9ac182934..42a35332ac 100644
--- a/board/hammer/board.c
+++ b/board/hammer/board.c
@@ -66,8 +66,8 @@ BUILD_ASSERT(ARRAY_SIZE(usb_strings) == USB_STR_COUNT);
/* I2C ports */
const struct i2c_port_t i2c_ports[] = {
- {"touchpad", I2C_PORT_TOUCHPAD, 400,
- GPIO_TOUCHPAD_I2C_SCL, GPIO_TOUCHPAD_I2C_SDA},
+ {"master", I2C_PORT_MASTER, 400,
+ GPIO_MASTER_I2C_SCL, GPIO_MASTER_I2C_SDA},
#ifdef BOARD_WAND
{"charger", I2C_PORT_CHARGER, 100,
GPIO_CHARGER_I2C_SCL, GPIO_CHARGER_I2C_SDA},
@@ -199,7 +199,7 @@ int board_has_keyboard_backlight(void)
*/
void board_usb_wake(void)
{
-#ifdef BOARD_WAND
+#if defined(BOARD_WAND) || defined(BOARD_WHISKERS)
/* FIXME: Implement side-band wake for wand. */
#else
/*