summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrover Yen <Grover_Yen@wistron.com>2015-08-06 17:37:21 +0800
committerChromeOS Commit Bot <chromeos-commit-bot@chromium.org>2015-08-21 02:05:29 +0000
commitf2417280e036ecbfcef6ee69e5f985de4f2180c3 (patch)
tree88af189d232b654a9ef3610dd6d757883f14e558
parente712c022d8033f673dd5f340e9283cb710361952 (diff)
downloadchrome-ec-f2417280e036ecbfcef6ee69e5f985de4f2180c3.tar.gz
buddy: Initial board.
Modify GPIO setting and task list. BUG=none BRANCH=none TEST=make -j buildall/tests Change-Id: I9a6cd753bcee1a4fc193d1a4b492a3230c9cb47b Signed-off-by: Grover Yen <Grover_Yen@wistron.com> Reviewed-on: https://chromium-review.googlesource.com/294014 Reviewed-by: Mohammed Habibulla <moch@google.com>
-rw-r--r--board/buddy/ec.tasklist4
-rw-r--r--board/buddy/gpio.inc4
2 files changed, 3 insertions, 5 deletions
diff --git a/board/buddy/ec.tasklist b/board/buddy/ec.tasklist
index cafdb702ed..ac1281571f 100644
--- a/board/buddy/ec.tasklist
+++ b/board/buddy/ec.tasklist
@@ -20,8 +20,6 @@
TASK_ALWAYS(HOOKS, hook_task, NULL, LARGER_TASK_STACK_SIZE) \
TASK_ALWAYS(CHARGER, charger_task, NULL, TASK_STACK_SIZE) \
TASK_NOTEST(CHIPSET, chipset_task, NULL, TASK_STACK_SIZE) \
- TASK_NOTEST(KEYPROTO, keyboard_protocol_task, NULL, TASK_STACK_SIZE) \
TASK_ALWAYS(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
TASK_ALWAYS(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
- TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
- TASK_NOTEST(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE)
+ TASK_ALWAYS(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE)
diff --git a/board/buddy/gpio.inc b/board/buddy/gpio.inc
index 876bf2b598..68e10751c0 100644
--- a/board/buddy/gpio.inc
+++ b/board/buddy/gpio.inc
@@ -7,7 +7,7 @@
/* Inputs with interrupt handlers are first for efficiency */
GPIO(POWER_BUTTON_L, A, 2, GPIO_INT_BOTH_DSLEEP, power_button_interrupt) /* Power button */
-GPIO(LID_OPEN, A, 3, GPIO_INT_BOTH_DSLEEP, lid_interrupt) /* Lid switch */
+GPIO(LID_OPEN, A, 3, GPIO_INT_BOTH_DSLEEP | GPIO_PULL_UP, lid_interrupt) /* Lid switch */
GPIO(AC_PRESENT, H, 3, GPIO_INT_BOTH_DSLEEP, extpower_interrupt) /* AC power present */
GPIO(PCH_BKLTEN, M, 3, GPIO_INT_BOTH, backlight_interrupt) /* Backlight enable signal from PCH */
GPIO(PCH_SLP_S0_L, G, 6, GPIO_INT_BOTH, power_signal_interrupt) /* SLP_S0# signal from PCH */
@@ -33,7 +33,7 @@ GPIO(BOARD_VERSION1, Q, 5, GPIO_INPUT, NULL) /* Board version stuffing
GPIO(BOARD_VERSION2, Q, 6, GPIO_INPUT, NULL) /* Board version stuffing resistor 2 */
GPIO(BOARD_VERSION3, Q, 7, GPIO_INPUT, NULL) /* Board version stuffing resistor 3 */
GPIO(CPU_PGOOD, C, 4, GPIO_INPUT, NULL) /* Power good to the CPU */
-GPIO(BAT_PRESENT_L, B, 4, GPIO_INPUT, NULL) /* Battery present. Repurposed BAT_TEMP */
+GPIO(BAT_PRESENT_L, B, 4, GPIO_INPUT | GPIO_PULL_UP, NULL) /* Battery present. Repurposed BAT_TEMP */
/* Outputs; all unasserted by default except for reset signals */
GPIO(CPU_PROCHOT, B, 1, GPIO_OUT_LOW, NULL) /* Force CPU to think it's overheated */