summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hill <ecgh@chromium.org>2018-01-12 09:08:29 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-01-12 14:31:09 -0800
commitcb8c63280139ec5990cd57668e81151e4b66856b (patch)
treee633e0f6a8f16a73af64d8109b17d7348a31e5b5
parentf77552abc44cf5957812bb40abb84659ef1b4445 (diff)
downloadchrome-ec-cb8c63280139ec5990cd57668e81151e4b66856b.tar.gz
grunt: rename volume GPIOs
BUG=b:64935726 BRANCH=none TEST=press volume buttons, see console messages Change-Id: I327a166e05bd815acc66d2f6e30fe8ae9d6d1cce Signed-off-by: Edward Hill <ecgh@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/864825 Reviewed-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/grunt/board.h2
-rw-r--r--board/grunt/gpio.inc4
2 files changed, 2 insertions, 4 deletions
diff --git a/board/grunt/board.h b/board/grunt/board.h
index 5b1de1b877..117da4eb3f 100644
--- a/board/grunt/board.h
+++ b/board/grunt/board.h
@@ -66,8 +66,6 @@
#define CONFIG_KEYBOARD_PROTOCOL_8042
#define CONFIG_VOLUME_BUTTONS
-#define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL
-#define GPIO_VOLUME_UP_L GPIO_VOLUP_BTN_ODL
#define CONFIG_USB_POWER_DELIVERY
#define CONFIG_CMD_PD_CONTROL
diff --git a/board/grunt/gpio.inc b/board/grunt/gpio.inc
index 9df15dfeb3..7627935dcf 100644
--- a/board/grunt/gpio.inc
+++ b/board/grunt/gpio.inc
@@ -18,8 +18,8 @@ GPIO_INT(POWER_BUTTON_L, PIN(0, 1), GPIO_INT_BOTH, power_button_interrupt)
GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, lid_interrupt)
GPIO_INT(AC_PRESENT, PIN(0, 0), GPIO_INT_BOTH | GPIO_HIB_WAKE_HIGH, extpower_interrupt)
GPIO_INT(WP_L, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt)
-GPIO_INT(VOLDN_BTN_ODL, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
-GPIO_INT(VOLUP_BTN_ODL, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
+GPIO_INT(VOLUME_DOWN_L, PIN(7, 0), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
+GPIO_INT(VOLUME_UP_L, PIN(7, 5), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
GPIO_INT(USB_C0_CABLE_DET, PIN(3, 7), GPIO_INT_RISING, anx74xx_cable_det_interrupt)
GPIO(EN_PWR_A, PIN(E, 2), GPIO_OUT_HIGH) /* Enable Power */