summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorPortisch <hugo.portisch@yahoo.de>2019-05-09 12:16:39 +0000
committerDongjin Kim <tobetter@hardkernel.com>2019-06-20 16:12:24 +0900
commitb7f2080d32330a95b75b543d89f91ba68912cf94 (patch)
tree4a1584973f919d5230b5c28c6601eac6676f7550 /arch
parent76db217d1926b0b7c5cf7c09fd53a1c9921bdb53 (diff)
downloadu-boot-odroid-c1-b7f2080d32330a95b75b543d89f91ba68912cf94.tar.gz
BACKPORT: CE: gpio_key: ignore gpio wakeup when gpio is not set
Change-Id: Ib49e26173923c86a2f87834e93162664da325158
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/cpu/armv8/g12b/firmware/scp_task/gpio_key.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/cpu/armv8/g12b/firmware/scp_task/gpio_key.c b/arch/arm/cpu/armv8/g12b/firmware/scp_task/gpio_key.c
index be28d0f8cf..8e3f00d5e4 100644
--- a/arch/arm/cpu/armv8/g12b/firmware/scp_task/gpio_key.c
+++ b/arch/arm/cpu/armv8/g12b/firmware/scp_task/gpio_key.c
@@ -176,6 +176,9 @@ int init_gpio_key(void)
unsigned int reg, bit;
struct meson_bank bank;
+ if (!gpio_wakeup_keyno)
+ return 0;
+
key_index = gpio_wakeup_keyno - KERNEL_GPIO_OFFSET;
if ((key_index >= (GPIOA_0 + EE_OFFSET))
&& (key_index < (GPIOA_15 + EE_OFFSET))) {