summaryrefslogtreecommitdiff
path: root/board
diff options
context:
space:
mode:
authorRandall Spangler <rspangler@chromium.org>2012-10-29 14:13:36 -0700
committerGerrit <chrome-bot@google.com>2012-10-30 14:50:03 -0700
commita21ea56e76ff71849d45f59608c0beb7bede4c02 (patch)
treed8e3bd5d57920878f9603cf4c3fee7b39b371188 /board
parent80467aff915c638b1c3f96a51becffd493791962 (diff)
downloadchrome-ec-a21ea56e76ff71849d45f59608c0beb7bede4c02.tar.gz
Rename power_button module to switch
Since it handles not just power button, but also lid switch, AC detect, and other switches. No functional changes; just renaming. BUG=chrome-os-partner:15579 BRANCH=none TEST=boot system, power on/off with power button Change-Id: I51628a52293f7207715f5f6bf368a08fe6c3dbce Signed-off-by: Randall Spangler <rspangler@chromium.org> Reviewed-on: https://gerrit.chromium.org/gerrit/36821
Diffstat (limited to 'board')
-rw-r--r--board/link/board.c18
-rw-r--r--board/link/ec.tasklist2
2 files changed, 10 insertions, 10 deletions
diff --git a/board/link/board.c b/board/link/board.c
index e4fbb53423..dae823e3b6 100644
--- a/board/link/board.c
+++ b/board/link/board.c
@@ -9,34 +9,34 @@
#include "gpio.h"
#include "i2c.h"
#include "lm4_adc.h"
-#include "power_button.h"
#include "registers.h"
+#include "switch.h"
#include "util.h"
#include "x86_power.h"
#ifndef CONFIG_TASK_X86POWER
#define x86_power_interrupt NULL
#endif
-#ifndef CONFIG_TASK_POWERBTN
-#define power_button_interrupt NULL
+#ifndef CONFIG_TASK_SWITCH
+#define switch_interrupt NULL
#endif
/* GPIO signal list. Must match order from enum gpio_signal. */
const struct gpio_info gpio_list[GPIO_COUNT] = {
/* Inputs with interrupt handlers are first for efficiency */
{"POWER_BUTTONn", LM4_GPIO_K, (1<<7), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
{"LID_SWITCHn", LM4_GPIO_K, (1<<5), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
/* Other inputs */
{"THERMAL_DATA_READYn", LM4_GPIO_B, (1<<4), 0, NULL},
{"AC_PRESENT", LM4_GPIO_H, (1<<3), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
{"BOARD_VERSION1", LM4_GPIO_H, (1<<6), 0, NULL},
{"BOARD_VERSION2", LM4_GPIO_L, (1<<6), 0, NULL},
{"BOARD_VERSION3", LM4_GPIO_L, (1<<7), 0, NULL},
{"PCH_BKLTEN", LM4_GPIO_J, (1<<3), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
{"PCH_SLP_An", LM4_GPIO_G, (1<<5), GPIO_INT_BOTH,
x86_power_interrupt},
{"PCH_SLP_ME_CSW_DEVn", LM4_GPIO_G, (1<<4), GPIO_INT_BOTH,
@@ -68,11 +68,11 @@ const struct gpio_info gpio_list[GPIO_COUNT] = {
{"PGOOD_VGFX_CORE", LM4_GPIO_D, (1<<2), GPIO_INT_BOTH,
x86_power_interrupt},
{"RECOVERYn", LM4_GPIO_H, (1<<7), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
{"USB1_STATUSn", LM4_GPIO_E, (1<<7), 0, NULL},
{"USB2_STATUSn", LM4_GPIO_E, (1<<1), 0, NULL},
{"WRITE_PROTECT", LM4_GPIO_J, (1<<4), GPIO_INT_BOTH,
- power_button_interrupt},
+ switch_interrupt},
/* Outputs; all unasserted by default except for reset signals */
{"CPU_PROCHOT", LM4_GPIO_F, (1<<2), GPIO_OUT_LOW, NULL},
{"ENABLE_1_5V_DDR", LM4_GPIO_H, (1<<5), GPIO_OUT_LOW, NULL},
diff --git a/board/link/ec.tasklist b/board/link/ec.tasklist
index e74140d93d..72d55d010f 100644
--- a/board/link/ec.tasklist
+++ b/board/link/ec.tasklist
@@ -28,5 +28,5 @@
TASK(I8042CMD, i8042_command_task, NULL, TASK_STACK_SIZE) \
TASK(HOSTCMD, host_command_task, NULL, TASK_STACK_SIZE) \
TASK(CONSOLE, console_task, NULL, LARGER_TASK_STACK_SIZE) \
- TASK(POWERBTN, power_button_task, NULL, TASK_STACK_SIZE) \
+ TASK(SWITCH, switch_task, NULL, TASK_STACK_SIZE) \
TASK(KEYSCAN, keyboard_scan_task, NULL, TASK_STACK_SIZE)