diff options
| author | Randall Spangler <rspangler@chromium.org> | 2013-04-19 16:28:49 -0700 |
|---|---|---|
| committer | ChromeBot <chrome-bot@google.com> | 2013-04-22 16:44:37 -0700 |
| commit | 57b77a3a8f2748b8a11d74a71d043f8cd61311db (patch) | |
| tree | 2d73819c80f6d0d3b1b91985ea24c48452d59be7 /chip | |
| parent | dcb2425f45ce69b149e19467ed412842f440894a (diff) | |
| download | chrome-ec-57b77a3a8f2748b8a11d74a71d043f8cd61311db.tar.gz | |
Active-low Link GPIOs end with _L, not n.
This is now consistent with other boards.
No functional changes, just renaming,
BUG=chrome-os-partner:18343
BRANCH=none
TEST=build link, bds
Change-Id: Ifd7c1ec608ab61f5f66800e91803ffafe1d944b6
Signed-off-by: Randall Spangler <rspangler@chromium.org>
Reviewed-on: https://gerrit.chromium.org/gerrit/48804
Reviewed-by: Bill Richardson <wfrichar@chromium.org>
Diffstat (limited to 'chip')
| -rw-r--r-- | chip/lm4/lpc.c | 10 | ||||
| -rw-r--r-- | chip/lm4/switch.c | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/chip/lm4/lpc.c b/chip/lm4/lpc.c index fa221fd71e..00f9e7273e 100644 --- a/chip/lm4/lpc.c +++ b/chip/lm4/lpc.c @@ -113,9 +113,9 @@ static void lpc_manual_irq(int irq_num) */ static void lpc_generate_smi(void) { - gpio_set_level(GPIO_PCH_SMIn, 0); + gpio_set_level(GPIO_PCH_SMI_L, 0); udelay(65); - gpio_set_level(GPIO_PCH_SMIn, 1); + gpio_set_level(GPIO_PCH_SMI_L, 1); if (host_events & event_mask[LPC_HOST_EVENT_SMI]) CPRINTF("[%T smi 0x%08x]\n", @@ -251,7 +251,7 @@ void lpc_comx_put_char(int c) * Update the host event status. * * Sends a pulse if masked event status becomes non-zero: - * - SMI pulse via EC_SMIn GPIO + * - SMI pulse via EC_SMI_L GPIO * - SCI pulse via LPC0SCI */ static void update_host_event_status(void) { @@ -286,9 +286,9 @@ static void update_host_event_status(void) { /* Update level-sensitive wake signal */ if (host_events & event_mask[LPC_HOST_EVENT_WAKE]) - gpio_set_level(GPIO_PCH_WAKEn, 0); + gpio_set_level(GPIO_PCH_WAKE_L, 0); else - gpio_set_level(GPIO_PCH_WAKEn, 1); + gpio_set_level(GPIO_PCH_WAKE_L, 1); /* Send pulse on SMI signal if needed */ if (need_smi) diff --git a/chip/lm4/switch.c b/chip/lm4/switch.c index 76e28c95fd..237f130712 100644 --- a/chip/lm4/switch.c +++ b/chip/lm4/switch.c @@ -126,7 +126,7 @@ static void update_other_switches(void) else *memmap_switches &= ~EC_SWITCH_WRITE_PROTECT_DISABLED; - if (gpio_get_level(GPIO_RECOVERYn) == 0) + if (gpio_get_level(GPIO_RECOVERY_L) == 0) *memmap_switches |= EC_SWITCH_DEDICATED_RECOVERY; else *memmap_switches &= ~EC_SWITCH_DEDICATED_RECOVERY; @@ -144,7 +144,7 @@ static void set_pwrbtn_to_pch(int high) } CPRINTF("[%T PB PCH pwrbtn=%s]\n", high ? "HIGH" : "LOW"); - gpio_set_level(GPIO_PCH_PWRBTNn, high); + gpio_set_level(GPIO_PCH_PWRBTN_L, high); } /** @@ -161,7 +161,7 @@ static int raw_power_button_pressed(void) if (!lid_is_open()) return 0; - return gpio_get_level(GPIO_POWER_BUTTONn) ? 0 : 1; + return gpio_get_level(GPIO_POWER_BUTTON_L) ? 0 : 1; } static void update_backlight(void) @@ -504,8 +504,8 @@ static void switch_init(void) *host_get_memmap(EC_MEMMAP_SWITCHES_VERSION) = 1; /* Enable interrupts, now that we've initialized */ - gpio_enable_interrupt(GPIO_POWER_BUTTONn); - gpio_enable_interrupt(GPIO_RECOVERYn); + gpio_enable_interrupt(GPIO_POWER_BUTTON_L); + gpio_enable_interrupt(GPIO_RECOVERY_L); gpio_enable_interrupt(GPIO_WRITE_PROTECT); } DECLARE_HOOK(HOOK_INIT, switch_init, HOOK_PRIO_DEFAULT); @@ -539,7 +539,7 @@ void switch_interrupt(enum gpio_signal signal) { /* Reset debounce time for the changed signal */ switch (signal) { - case GPIO_POWER_BUTTONn: + case GPIO_POWER_BUTTON_L: /* Reset power button debounce time */ tdebounce_pwr = get_time().val + PWRBTN_DEBOUNCE_US; if (raw_power_button_pressed()) { |