summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaisuke Nojiri <dnojiri@chromium.org>2016-11-18 12:25:56 -0800
committerchrome-bot <chrome-bot@chromium.org>2016-11-21 16:07:48 -0800
commit88685f6a667f1a3b283fd29d4f4269766be06e72 (patch)
tree538534c77d66569e494cceb290044008c4cbc91b
parenta6cbc2b868f166dc388c8252807b53178c2677ad (diff)
downloadchrome-ec-88685f6a667f1a3b283fd29d4f4269766be06e72.tar.gz
Reef: Swap Volume Up and Down GPIOs
The button closer to the hinge is assigned to volume down and the one closer to the user is assigned to volume up. This change swaps the GPIO assignments to fix the UX. BUG=chrome-os-partner:60057 BRANCH=none TEST=Verified the one closer to the hinge increases the volume and the one closer to the user descreases the volume. Change-Id: I3e716da288839c3f5be608fb2d63f277bbde1bc7 Signed-off-by: Daisuke Nojiri <dnojiri@chromium.org> Reviewed-on: https://chromium-review.googlesource.com/412981
-rw-r--r--board/reef/gpio.inc11
1 files changed, 8 insertions, 3 deletions
diff --git a/board/reef/gpio.inc b/board/reef/gpio.inc
index 3517fe9b23..21efc87c33 100644
--- a/board/reef/gpio.inc
+++ b/board/reef/gpio.inc
@@ -29,9 +29,14 @@ GPIO_INT(AC_PRESENT, PIN(C, 1), GPIO_INT_BOTH, extpower_interrupt) /* ACOK_OD
/* TODO: We might remove external pull-up for POWER_BUTTON_L in EVT */
GPIO_INT(POWER_BUTTON_L, PIN(0, 4), GPIO_INT_BOTH, power_button_interrupt) /* MECH_PWR_BTN_ODL */
GPIO_INT(LID_OPEN, PIN(6, 7), GPIO_INT_BOTH, lid_interrupt)
-GPIO_INT(EC_VOLDN_BTN_ODL, PIN(8, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
-GPIO_INT(EC_VOLUP_BTN_ODL, PIN(8, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
-GPIO_INT(TABLET_MODE, PIN(3, 6), GPIO_INT_BOTH, tablet_mode_interrupt)
+/* Volume up and down buttons need to be swapped. The one closer to the hinge
+ * should be volume up and the one closer to the user should be volume down.
+ * (cros.bug/p/60057) */
+GPIO_INT(EC_VOLDN_BTN_ODL_SWAPPED, PIN(8, 3), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
+GPIO_INT(EC_VOLUP_BTN_ODL_SWAPPED, PIN(8, 2), GPIO_INT_BOTH | GPIO_PULL_UP, button_interrupt)
+#define GPIO_EC_VOLDN_BTN_ODL GPIO_EC_VOLUP_BTN_ODL_SWAPPED
+#define GPIO_EC_VOLUP_BTN_ODL GPIO_EC_VOLDN_BTN_ODL_SWAPPED
+/* Tablet switch is active-low. L: lid is attached (360 position) H: detached */GPIO_INT(TABLET_MODE, PIN(3, 6), GPIO_INT_BOTH, tablet_mode_interrupt)
GPIO_INT(WP_L, PIN(4, 0), GPIO_INT_BOTH | GPIO_SEL_1P8V, switch_interrupt) /* EC_WP_ODL */