summaryrefslogtreecommitdiff
path: root/board/waddledoo
diff options
context:
space:
mode:
authorAseda Aboagye <aaboagye@google.com>2020-01-06 15:25:33 -0800
committerJustin TerAvest <teravest@chromium.org>2020-01-07 18:46:20 +0000
commitceaa05993490943b19cdf61bcd195cf016d31827 (patch)
tree97e43c52a1da6f6ebf79bbee30388369476ee452 /board/waddledoo
parent38f229344c427f9db05a6ed760314b96998acff4 (diff)
downloadchrome-ec-ceaa05993490943b19cdf61bcd195cf016d31827.tar.gz
waddledoo: Add volume button support
waddledoo has dedicated volume buttons. BUG=b:146172102 BRANCH=None TEST=`make -j BOARD=waddledoo` Change-Id: I49c5f02d6e8ac66d4dac55208fb55aa16f83f5c4 Signed-off-by: Aseda Aboagye <aaboagye@google.com> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/ec/+/1989116 Tested-by: Aseda Aboagye <aaboagye@chromium.org> Commit-Queue: Aseda Aboagye <aaboagye@chromium.org> Auto-Submit: Aseda Aboagye <aaboagye@chromium.org> Reviewed-by: Diana Z <dzigterman@chromium.org>
Diffstat (limited to 'board/waddledoo')
-rw-r--r--board/waddledoo/board.c1
-rw-r--r--board/waddledoo/board.h2
-rw-r--r--board/waddledoo/gpio.inc5
3 files changed, 7 insertions, 1 deletions
diff --git a/board/waddledoo/board.c b/board/waddledoo/board.c
index 019849bd94..a302d4d529 100644
--- a/board/waddledoo/board.c
+++ b/board/waddledoo/board.c
@@ -6,6 +6,7 @@
/* Waddledoo board-specific configuration */
#include "adc_chip.h"
+#include "button.h"
#include "common.h"
#include "compile_time_macros.h"
#include "gpio.h"
diff --git a/board/waddledoo/board.h b/board/waddledoo/board.h
index 84a8286a91..328488ddb5 100644
--- a/board/waddledoo/board.h
+++ b/board/waddledoo/board.h
@@ -20,6 +20,8 @@
#define GPIO_PCH_PWRBTN_L GPIO_EC_AP_PWR_BTN_ODL
#define GPIO_PCH_WAKE_L GPIO_EC_AP_WAKE_ODL
#define GPIO_POWER_BUTTON_L GPIO_H1_EC_PWR_BTN_ODL
+#define GPIO_VOLUME_UP_L GPIO_VOLUP_BTN_ODL
+#define GPIO_VOLUME_DOWN_L GPIO_VOLDN_BTN_ODL
#define GPIO_WP GPIO_EC_WP_OD
/* I2C configuration */
diff --git a/board/waddledoo/gpio.inc b/board/waddledoo/gpio.inc
index 7b1fea7541..b4f8d994b8 100644
--- a/board/waddledoo/gpio.inc
+++ b/board/waddledoo/gpio.inc
@@ -11,6 +11,9 @@
*/
GPIO_INT(H1_EC_PWR_BTN_ODL, PIN(0, 1), GPIO_INT_BOTH | GPIO_PULL_UP, power_button_interrupt)
+GPIO_INT(VOLDN_BTN_ODL, PIN(4, 0), GPIO_INT_BOTH | GPIO_PULL_UP | GPIO_SEL_1P8V, button_interrupt)
+/* TODO(b:147257497) Fix this and EN_PP5000_U before board rev 0. */
+GPIO_INT(VOLUP_BTN_ODL, PIN(A, 4), GPIO_INT_BOTH | GPIO_PULL_UP | GPIO_SEL_1P8V, button_interrupt)
GPIO_INT(LID_OPEN, PIN(D, 2), GPIO_INT_BOTH, lid_interrupt)
GPIO_INT(EC_WP_OD, PIN(A, 1), GPIO_INT_BOTH, switch_interrupt)
@@ -35,7 +38,7 @@ GPIO(EN_VCCIO_EXT, PIN(6, 1), GPIO_OUT_LOW)
GPIO(EN_VCCST, PIN(A, 7), GPIO_OUT_LOW)
GPIO(EN_PP3300_PEN, PIN(6, 3), GPIO_OUT_LOW)
GPIO(EN_PP3300_A, PIN(0, 3), GPIO_OUT_LOW)
-GPIO(EN_PP5000_U, PIN(A, 4), GPIO_OUT_LOW)
+GPIO(EN_PP5000_U, PIN(7, 3), GPIO_OUT_LOW)
GPIO(EN_SLP_Z, PIN(8, 3), GPIO_OUT_LOW)
GPIO(EN_KB_BL, PIN(6, 0), GPIO_OUT_LOW)
GPIO(EN_BL_OD, PIN(D, 3), GPIO_ODR_LOW)