diff options
| author | Ben Lok <ben.lok@mediatek.com> | 2015-08-31 14:35:01 +0800 |
|---|---|---|
| committer | chrome-bot <chrome-bot@chromium.org> | 2015-08-31 22:59:52 -0700 |
| commit | c2cf0fb198feea043a331e5d2156979d23f1aa46 (patch) | |
| tree | 606be714410424767317523693737dd7748a7920 /power | |
| parent | a030c63bafb3e18619b2ec325c0a6b2de3c4bfe7 (diff) | |
| download | chrome-ec-c2cf0fb198feea043a331e5d2156979d23f1aa46.tar.gz | |
oak: enable MBKP events for PD events
(refer to CL:273620) enable the MKBP event feature to send host event
and wire up the PD specific events.
But, CONFIG_MKBP_EVENT conflicts with CONFIG_KEYBOARD_PROTOCOL_MKBP,
due to the GPIO name of EC interrupt pin. Align the GPIO naming of EC
interrupt pin to EC_INT_L.
BRANCH=none
BUG=chrome-os-partner:44643
TEST=On Oak rev3, plug/unplug USB devices and add kernel trace to see
the PD events happening.
Change-Id: I10de9c6611583bb6165bdc1848e542d4b8bba954
Signed-off-by: Ben Lok <ben.lok@mediatek.com>
Reviewed-on: https://chromium-review.googlesource.com/296012
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Rong Chang <rongchang@chromium.org>
Diffstat (limited to 'power')
| -rw-r--r-- | power/mediatek.c | 4 | ||||
| -rw-r--r-- | power/rockchip.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/power/mediatek.c b/power/mediatek.c index b0bba88387..78f004970b 100644 --- a/power/mediatek.c +++ b/power/mediatek.c @@ -475,7 +475,7 @@ static void power_off(void) GPIO_INPUT); /* Change EC_INT to low */ - gpio_set_level(GPIO_EC_INT, 0); + gpio_set_level(GPIO_EC_INT_L, 0); lid_opened = 0; enable_sleep(SLEEP_MASK_AP_RUN); @@ -589,7 +589,7 @@ static void power_on(void) /* enable interrupt */ gpio_set_flags(GPIO_SUSPEND_L, INT_BOTH_PULL_UP); - gpio_set_flags(GPIO_EC_INT, GPIO_OUTPUT | GPIO_OUT_HIGH); + gpio_set_flags(GPIO_EC_INT_L, GPIO_OUTPUT | GPIO_OUT_HIGH); disable_sleep(SLEEP_MASK_AP_RUN); #ifdef HAS_TASK_POWERLED diff --git a/power/rockchip.c b/power/rockchip.c index cbb06fc2af..7a2955af68 100644 --- a/power/rockchip.c +++ b/power/rockchip.c @@ -370,7 +370,7 @@ static void power_off(void) chipset_turn_off_power_rails(); /* Change SUSPEND_L and EC_INT pin to high-Z to reduce power draw. */ gpio_set_flags(GPIO_SUSPEND_L, GPIO_INPUT); - gpio_set_flags(GPIO_EC_INT, GPIO_INPUT); + gpio_set_flags(GPIO_EC_INT_L, GPIO_INPUT); /* Wait till we actually turn off to not mess up the state machine. */ while (power_get_signals() & IN_POWER_GOOD) { @@ -453,7 +453,7 @@ enum power_state power_handle_state(enum power_state state) /* setup misc gpio for S3/S0 functionality */ gpio_set_flags(GPIO_SUSPEND_L, GPIO_INPUT | GPIO_INT_BOTH | GPIO_PULL_DOWN); - gpio_set_flags(GPIO_EC_INT, GPIO_OUTPUT + gpio_set_flags(GPIO_EC_INT_L, GPIO_OUTPUT | GPIO_OUT_HIGH); /* Call hooks now that AP is running */ |