diff options
| author | Vic Yang <victoryang@chromium.org> | 2013-04-23 20:28:15 +0800 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-23 10:39:10 -0700 |
| commit | 4d96bf649de38e989016fd9a467ab243ace436f7 (patch) | |
| tree | 651c154680b6452fb1636db9acb5b39afaffa663 | |
| parent | 2dd01e59eac4a25164bc4c3a76280a57a7fca6c7 (diff) | |
| download | chrome-ec-4d96bf649de38e989016fd9a467ab243ace436f7.tar.gz | |
Unify lid switch GPIO name
Link uses LID_SWITCH_L but it means the same thing as LID_OPEN. Changing
it to LID_OPEN so that all boards use the same name.
No functional changes, just renaming.
BUG=chrome-os-partner:18343
TEST=build link, bds
BRANCH=none
Change-Id: I74893e1365ad3068f13e7fe948f1a54c6c6301bb
Signed-off-by: Vic Yang <victoryang@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48893
Reviewed-by: Randall Spangler <rspangler@chromium.org>
| -rw-r--r-- | board/link/board.c | 2 | ||||
| -rw-r--r-- | board/link/board.h | 2 | ||||
| -rw-r--r-- | common/lid_switch.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/board/link/board.c b/board/link/board.c index b4e631d2f3..05c55750a2 100644 --- a/board/link/board.c +++ b/board/link/board.c @@ -25,7 +25,7 @@ const struct gpio_info gpio_list[GPIO_COUNT] = { /* Inputs with interrupt handlers are first for efficiency */ {"POWER_BUTTON_L", LM4_GPIO_K, (1<<7), GPIO_INT_BOTH, switch_interrupt}, - {"LID_SWITCH_L", LM4_GPIO_K, (1<<5), GPIO_INT_BOTH, + {"LID_OPEN", LM4_GPIO_K, (1<<5), GPIO_INT_BOTH, lid_interrupt}, /* Other inputs */ {"THERMAL_DATA_READY_L", LM4_GPIO_B, (1<<4), 0, NULL}, diff --git a/board/link/board.h b/board/link/board.h index b8cc44df97..b382723ea6 100644 --- a/board/link/board.h +++ b/board/link/board.h @@ -122,7 +122,7 @@ enum adc_channel enum gpio_signal { /* Inputs with interrupt handlers are first for efficiency */ GPIO_POWER_BUTTON_L = 0, /* Power button */ - GPIO_LID_SWITCH_L, /* Lid switch */ + GPIO_LID_OPEN, /* Lid switch */ GPIO_THERMAL_DATA_READY_L, /* Data ready from I2C thermal sensor */ /* Other inputs */ GPIO_AC_PRESENT, /* AC power present */ diff --git a/common/lid_switch.c b/common/lid_switch.c index b866bad0f7..0f83f7c318 100644 --- a/common/lid_switch.c +++ b/common/lid_switch.c @@ -28,7 +28,7 @@ static int debounced_lid_open; /* Debounced lid state */ */ static int raw_lid_open(void) { - return gpio_get_level(GPIO_LID_SWITCH_L) ? 1 : 0; + return gpio_get_level(GPIO_LID_OPEN) ? 1 : 0; } /** @@ -77,7 +77,7 @@ static void lid_init(void) debounced_lid_open = 1; /* Enable interrupts, now that we've initialized */ - gpio_enable_interrupt(GPIO_LID_SWITCH_L); + gpio_enable_interrupt(GPIO_LID_OPEN); } DECLARE_HOOK(HOOK_INIT, lid_init, HOOK_PRIO_INIT_LID); |