From 819239f00b0a4d1335b2f2a7cab7b4630fc9c096 Mon Sep 17 00:00:00 2001 From: younghun kim Date: Tue, 19 Jul 2016 17:07:33 +0900 Subject: Fix interrupt disabling problem for gpio volume button. Remove "task_disable_irq()" function call in EC_RTC_ALARM_CLEAR case. Host command "RTC_SET_ALARM" with 0 second does not disable volume key interrupt. BUG=chrome-os-partner:55401 BRANCH=none TEST=check EC UART log message. If you press volume up/down button - Before HC 0x47 (RTC_SET_ALARM Command with 0 second) Log : Button 'Volume Up/Down' was released. - After HC0x47 Log : Button 'Volume Up/Down' was released. GPIO volume key is still enable. Change-Id: I8d8a4fa4927046b76a49ac4833b6a710db2e05be Signed-off-by: younghun kim Reviewed-on: https://chromium-review.googlesource.com/361670 Commit-Ready: Wonjoon Lee Tested-by: Younghun Kim Reviewed-by: Shawn N --- chip/npcx/system.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'chip/npcx/system.c') diff --git a/chip/npcx/system.c b/chip/npcx/system.c index 2e8493be98..ca20c7ae91 100644 --- a/chip/npcx/system.c +++ b/chip/npcx/system.c @@ -422,7 +422,9 @@ void system_set_rtc_alarm(uint32_t seconds, uint32_t microseconds) uint32_t cur_secs, alarm_secs; if (seconds == EC_RTC_ALARM_CLEAR) { - system_reset_rtc_alarm(); + CLEAR_BIT(NPCX_WTC, NPCX_WTC_WIE); + SET_BIT(NPCX_WTC, NPCX_WTC_PTO); + return; } -- cgit v1.2.1