summaryrefslogtreecommitdiff
path: root/chip
diff options
context:
space:
mode:
authoryounghun kim <young-h.kim@samsung.com>2016-07-19 17:07:33 +0900
committerchrome-bot <chrome-bot@chromium.org>2016-07-20 04:52:15 -0700
commit819239f00b0a4d1335b2f2a7cab7b4630fc9c096 (patch)
treeb00c7300391711347cae6b12cfd26cc9c2af0e9c /chip
parentaa471f87480cb0aa0e6a89df3180fdd15f5a6df5 (diff)
downloadchrome-ec-819239f00b0a4d1335b2f2a7cab7b4630fc9c096.tar.gz
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 <young-h.kim@samsung.com> Reviewed-on: https://chromium-review.googlesource.com/361670 Commit-Ready: Wonjoon Lee <woojoo.lee@samsung.com> Tested-by: Younghun Kim <young-h.kim@samsung.com> Reviewed-by: Shawn N <shawnn@chromium.org>
Diffstat (limited to 'chip')
-rw-r--r--chip/npcx/system.c4
1 files changed, 3 insertions, 1 deletions
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;
}